bugfix: Fix vulnerabilities in batik library

Changes:
- fix tests;
- migrate from javax to jakarta;

Fixes eclipse-esmf#427

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AbstractTestEntity.java

@@ -16,13 +16,13 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
+import jakarta.validation.constraints.NotNull;
+
 @JsonTypeInfo( use = JsonTypeInfo.Id.NAME )
 @JsonSubTypes( {
       @JsonSubTypes.Type( value = ExtendingTestEntity.class, name = "ExtendingTestEntity" )

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractEntity.java

@@ -15,11 +15,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithAbstractEntity {
 
    @NotNull

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithAbstractSingleEntity.java

@@ -15,11 +15,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithAbstractSingleEntity {
 
    @NotNull

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithCollectionWithAbstractEntity.java

@@ -16,13 +16,13 @@
 import java.util.Collection;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.eclipse.esmf.aspectmodel.java.CollectionAspect;
 
+import jakarta.validation.constraints.NotNull;
+
 public class AspectWithCollectionWithAbstractEntity implements CollectionAspect<Collection<AbstractTestEntity>, AbstractTestEntity> {
 
    @NotNull

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithComplexSet.java

@@ -3,12 +3,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
 /**
  * Generated class for Test Aspect. This is a test description
  */

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstrainedSet.java

@@ -3,12 +3,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
 /**
  * Generated class for Test Aspect. This is a test description
  */

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithConstraints.java

@@ -17,14 +17,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.eclipse.esmf.aspectmodel.java.customconstraint.DoubleMax;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.DoubleMin;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.FloatMax;
@@ -33,6 +25,14 @@
 import org.eclipse.esmf.aspectmodel.java.customconstraint.IntegerMin;
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 /** Generated class for AspectWithConstraints. */
 public class AspectWithConstraints {
 

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGTypeForRangeConstraints.java

@@ -14,16 +14,17 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.eclipse.esmf.aspectmodel.java.customconstraint.GregorianCalendarMax;
 import org.eclipse.esmf.aspectmodel.java.customconstraint.GregorianCalendarMin;
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotNull;
+
 /** Generated class for AspectWithGTypeForRangeConstraints. */
 public class AspectWithGTypeForRangeConstraints {
 

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithGenericNumericProperty.java

@@ -14,11 +14,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Class for testing aspects with variously typed and constrained numeric properties.
  */

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithMultilanguageExampleValue.java

@@ -2,13 +2,13 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import org.eclipse.esmf.metamodel.datatypes.LangString;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Generated class for AspectWithMultilanguageExampleValue.
  *

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithRangeConstraintWithoutMinMaxIntegerValue.java

@@ -15,11 +15,11 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /** Generated class for Test Aspect. */
 public class AspectWithRangeConstraintWithoutMinMaxIntegerValue {
 

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/AspectWithRecursivePropertyWithOptional.java

@@ -14,11 +14,11 @@
 
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /** Generated class for AspectWithRecursivePropertyWithOptional. */
 public class AspectWithRecursivePropertyWithOptional {
 

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/ExtendingTestEntity.java

@@ -16,11 +16,11 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 public class ExtendingTestEntity extends AbstractTestEntity {
 
    @NotNull

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/testclasses/Id.java

@@ -3,11 +3,11 @@
 import java.net.URI;
 import java.util.Objects;
 
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * Generated class for Unique Identifier.
  *

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGeneratorTest.java

@@ -839,8 +839,8 @@ public void testEnumComplexMapping( final KnownVersion metaModelVersion ) {
             + "['properties']['description']['enum'][0]" ) ).isEqualTo( "Result succeeded" );
       assertThat( context.<String> read( "$['components']['schemas']['ResultGood']['properties']['details']"
             + "['properties']['message']['enum'][0]" ) ).isEqualTo( "Evaluation succeeded." );
-      assertThat( context.<Double> read( "$['components']['schemas']['ResultGood']['properties']['details']"
-            + "['properties']['numericCode']['enum'][0]" ) ).isCloseTo( 10.0d, Percentage.withPercentage( 1.0d ) );
+      assertThat( context.<Integer> read( "$['components']['schemas']['ResultGood']['properties']['details']"
+              + "['properties']['numericCode']['enum'][0]" ) ).isEqualTo( 10 );
    }
 
    @ParameterizedTest

core/esmf-aspect-model-java-generator/pom.xml

@@ -41,8 +41,8 @@
          <artifactId>esmf-aspect-model-generator</artifactId>
       </dependency>
       <dependency>
-         <groupId>javax.validation</groupId>
-         <artifactId>validation-api</artifactId>
+         <groupId>jakarta.validation</groupId>
+         <artifactId>jakarta.validation-api</artifactId>
       </dependency>
       <dependency>
          <groupId>org.eclipse.esmf</groupId>

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/ConstraintAnnotationBuilder.java

@@ -16,10 +16,6 @@
 import java.math.BigInteger;
 import java.util.Optional;
 
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import org.apache.commons.text.StringEscapeUtils;
 
 import org.eclipse.esmf.aspectmodel.java.rangeconstraint.AnnotationExpression;
@@ -33,8 +29,12 @@
 import org.eclipse.esmf.metamodel.ScalarValue;
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 /**
- * Provides functionality to create javax.validation.constraints that are displayed in the generated java class
+ * Provides functionality to create jakarta.validation.constraints that are displayed in the generated java class
  */
 public class ConstraintAnnotationBuilder {
 

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMax.java

@@ -20,11 +20,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
 @Target( { FIELD, TYPE_USE } )
 @Retention( RUNTIME )
 @Constraint( validatedBy = { DoubleMaxValidator.class } )

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMaxValidator.java

@@ -13,11 +13,11 @@
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
 /**
  * Validates assigned values of type {@link Double}, which must be below or equal to this limit depending on the
  * provided {@link BoundDefinition}.

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMin.java

@@ -20,11 +20,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
 @Target( { FIELD, TYPE_USE } )
 @Retention( RUNTIME )
 @Constraint( validatedBy = DoubleMinValidator.class )

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DoubleMinValidator.java

@@ -12,12 +12,11 @@
  */
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
 /**
  * Validates assigned values of type {@link Double}, which must be above or equal to this limit depending on the
  * provided {@link BoundDefinition}.

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DurationMax.java

@@ -20,11 +20,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
 @Target( { FIELD, TYPE_USE } )
 @Retention( RUNTIME )
 @Constraint( validatedBy = { DurationMaxValidator.class } )

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DurationMaxValidator.java

@@ -12,17 +12,16 @@
  */
 
 package org.eclipse.esmf.aspectmodel.java.customconstraint;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 
+import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.eclipse.esmf.metamodel.impl.BoundDefinition;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 /**
  * Validates assigned values of type {@link Duration}, which must be below or equal to this limit depending on the

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/customconstraint/DurationMin.java

@@ -20,11 +20,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
 import org.eclipse.esmf.metamodel.impl.BoundDefinition;
 
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
 @Target( { FIELD, TYPE_USE } )
 @Retention( RUNTIME )
 @Constraint( validatedBy = DurationMinValidator.class )