Merge branch 'main' into 2.2.x

Author: atextor

core/esmf-aspect-model-resolver/src/main/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolver.java

@@ -303,8 +303,7 @@ private Try<Model> getModelForUrn( final String urn, final ResolutionStrategy re
       }
 
       try {
-//         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );
-         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( urn );
+         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );
          if ( aspectModelUrn.getElementType() != ElementType.NONE ) {
             return Try.success( EMPTY_MODEL );
          }

pom.xml

@@ -73,7 +73,7 @@
       <!-- Versions of third party dependencies -->
       <aspect-meta-model-version>2.0.0</aspect-meta-model-version>
       <assertj-vavr-version>0.4.2</assertj-vavr-version>
-      <batik-version>1.14</batik-version>
+      <batik-version>1.16</batik-version>
       <classgraph-version>4.8.146</classgraph-version>
       <commons-text-version>1.10.0</commons-text-version>
       <easy-random-version>5.0.0</easy-random-version>