updated code

eclipse-tractusx · Feb 14, 2024 · a56e6e2 · a56e6e2
1 parent d1a0c4d
commit a56e6e2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 0.3.0
 ### Added
-- Upgrade dependency to ESMF SDK 2.5.1
+
 ### Fixed
 Validation removed while upload of model in semantic hub via API.
 

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -1,7 +1,6 @@
 maven/mavencentral/ch.qos.logback/logback-classic/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3435
 maven/mavencentral/ch.qos.logback/logback-core/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3373
 maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.1, Apache-2.0, approved, #8912
-maven/mavencentral/com.ethlo.time/itu/1.7.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.3, Apache-2.0, approved, #7947
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.3, MIT AND Apache-2.0, approved, #7932
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.0, Apache-2.0, approved, #4105
@@ -17,7 +16,7 @@ maven/mavencentral/com.github.andrewoma.dexx/collection/0.7, MIT, approved, CQ22
 maven/mavencentral/com.github.curious-odd-man/rgxgen/1.4, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.jsonld-java/jsonld-java/0.13.4, BSD-3-Clause, approved, CQ22136
 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
-maven/mavencentral/com.github.virtuald/curvesapi/1.08, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/com.github.virtuald/curvesapi/1.06, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
 maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined
@@ -27,9 +26,9 @@ maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-confl
 maven/mavencentral/com.google.j2objc/j2objc-annotations/2.8, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.protobuf/protobuf-java/3.21.10, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/com.ibm.icu/icu4j/72.1, ICU, approved, #4354
-maven/mavencentral/com.networknt/json-schema-validator/1.0.87, Apache-2.0, approved, CQ22638
+maven/mavencentral/com.networknt/json-schema-validator/1.0.56, Apache-2.0, approved, CQ22638
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.24.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.zaxxer/SparseBitSet/1.3, Apache-2.0, approved, #10726
+maven/mavencentral/com.zaxxer/SparseBitSet/1.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/commons-cli/commons-cli/1.5.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
 maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
@@ -95,13 +94,13 @@ maven/mavencentral/org.apache.jena/jena-tdb/4.7.0, Apache-2.0, approved, #8148
 maven/mavencentral/org.apache.jena/jena-tdb2/4.7.0, Apache-2.0, approved, #8160
 maven/mavencentral/org.apache.logging.log4j/log4j-api/2.20.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.20.0, Apache-2.0, approved, #8799
-maven/mavencentral/org.apache.poi/poi-ooxml-lite/5.2.4, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0 AND W3C-19980720, approved, #5247
-maven/mavencentral/org.apache.poi/poi-ooxml/5.2.4, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #5243
-maven/mavencentral/org.apache.poi/poi/5.2.4, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause AND MIT) AND (Apache-2.0 AND MIT), approved, #5252
+maven/mavencentral/org.apache.poi/poi-ooxml-schemas/4.1.2, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND MIT, approved, #2132
+maven/mavencentral/org.apache.poi/poi-ooxml/4.1.2, Apache-2.0 AND MIT AND BSD-3-Clause AND EPL-1.0, approved, CQ22906
+maven/mavencentral/org.apache.poi/poi/4.1.2, Apache-2.0 AND MIT AND BSD-3-Clause AND EPL-1.0, approved, CQ22907
 maven/mavencentral/org.apache.thrift/libthrift/0.17.0, Apache-2.0, approved, #6543
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.16, Apache-2.0, approved, #6997
 maven/mavencentral/org.apache.velocity/velocity-engine-core/2.3, Apache-2.0, approved, #2478
-maven/mavencentral/org.apache.xmlbeans/xmlbeans/5.1.1, Apache-2.0, approved, #8429
+maven/mavencentral/org.apache.xmlbeans/xmlbeans/3.1.0, Apache-2.0 AND Apache-1.1, approved, #12095
 maven/mavencentral/org.apache.xmlgraphics/batik-anim/1.17, Apache-2.0, approved, #10144
 maven/mavencentral/org.apache.xmlgraphics/batik-awt-util/1.17, Apache-2.0, approved, #10149
 maven/mavencentral/org.apache.xmlgraphics/batik-bridge/1.17, Apache-2.0, approved, #10152
@@ -125,28 +124,28 @@ maven/mavencentral/org.apache.xmlgraphics/batik-xml/1.17, Apache-2.0, approved,
 maven/mavencentral/org.apache.xmlgraphics/xmlgraphics-commons/2.9, Apache-2.0, approved, #10159
 maven/mavencentral/org.checkerframework/checker-qual/3.33.0, MIT, approved, clearlydefined
 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.1, BSD-2-Clause, approved, #2670
-maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-aasx/1.0.0-milestone-04, Apache-2.0, approved, dt.aas4j
-maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-core/1.0.0-milestone-04, Apache-2.0, approved, dt.aas4j
-maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-json/1.0.0-milestone-04, Apache-2.0, approved, dt.aas4j
-maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-xml/1.0.0-milestone-04, Apache-2.0, approved, dt.aas4j
-maven/mavencentral/org.eclipse.digitaltwin.aas4j/model/1.0.0-milestone-04, Apache-2.0, approved, dt.aas4j
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-interface/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-java/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-resolver/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-types/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-version-migrator/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-aas-generator/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-document-generators/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-generator/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-jackson/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-java-core/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-java-generator/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-resolver/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-serializer/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-starter/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-urn/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-validator/2.5.1, MPL-2.0, approved, dt.esmf
-maven/mavencentral/org.eclipse.esmf/esmf-aspect-static-meta-model-java/2.5.1, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-aasx/1.0.0-milestone-03.1, Apache-2.0, approved, dt.aas4j
+maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-core/1.0.0-milestone-03.1, Apache-2.0, approved, dt.aas4j
+maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-json/1.0.0-milestone-03.1, Apache-2.0, approved, dt.aas4j
+maven/mavencentral/org.eclipse.digitaltwin.aas4j/dataformat-xml/1.0.0-milestone-03.1, Apache-2.0, approved, dt.aas4j
+maven/mavencentral/org.eclipse.digitaltwin.aas4j/model/1.0.0-milestone-03.1, Apache-2.0, approved, dt.aas4j
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-interface/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-java/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-resolver/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-types/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-meta-model-version-migrator/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-aas-generator/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-document-generators/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-generator/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-jackson/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-java-core/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-java-generator/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-resolver/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-serializer/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-starter/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-urn/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-model-validator/2.4.2, MPL-2.0, approved, dt.esmf
+maven/mavencentral/org.eclipse.esmf/esmf-aspect-static-meta-model-java/2.4.2, MPL-2.0, approved, dt.esmf
 maven/mavencentral/org.eclipse.esmf/esmf-semantic-aspect-meta-model/2.1.0, MPL-2.0, approved, dt.esmf
 maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.18, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.18, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -178,7 +177,7 @@ maven/mavencentral/org.graalvm.js/js/23.0.1, UPL-1.0 AND (LicenseRef-Permission-
 maven/mavencentral/org.graalvm.regex/regex/23.0.1, UPL-1.0, approved, #11529
 maven/mavencentral/org.graalvm.sdk/graal-sdk/23.0.1, UPL-1.0, approved, #9850
 maven/mavencentral/org.graalvm.truffle/truffle-api/23.0.1, UPL-1.0 AND (MIT AND UPL-1.0), approved, #11527
-maven/mavencentral/org.graphper/graph-support/1.2.3, Apache-2.0, approved, #13169
+maven/mavencentral/org.graphper/graph-support/1.1.5, Apache-2.0, approved, #11523
 maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jboss.forge.roaster/roaster-api/2.29.0.Final, EPL-1.0, approved, #11526
 maven/mavencentral/org.jboss.forge.roaster/roaster-jdt/2.29.0.Final, , approved, #11525
@@ -230,4 +229,4 @@ maven/mavencentral/org.webjars/swagger-ui/4.15.5, Apache-2.0 AND MIT, approved,
 maven/mavencentral/org.webjars/webjars-locator-core/0.52, MIT, approved, clearlydefined
 maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275
 maven/mavencentral/xml-apis/xml-apis-ext/1.3.04, Apache-2.0, approved, CQ1448
-maven/mavencentral/xml-apis/xml-apis/1.4.01, Apache-2.0 OR LicenseRef-Public-Domain OR W3C, approved, CQ9621
+maven/mavencentral/xml-apis/xml-apis/1.4.01, Apache-2.0 OR LicenseRef-Public-Domain OR W3C, approved, CQ9621
diff --git a/backend/src/main/java/org/eclipse/tractusx/semantics/hub/samm/SDKAccessHelperSAMM.java b/backend/src/main/java/org/eclipse/tractusx/semantics/hub/samm/SDKAccessHelperSAMM.java
@@ -31,7 +31,6 @@
 import java.util.Optional;
 
 import org.apache.jena.rdf.model.Model;
-import org.eclipse.esmf.aspectmodel.aas.AasFileFormat;
 import org.eclipse.esmf.aspectmodel.aas.AspectModelAASGenerator;
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator.Format;
@@ -150,25 +149,25 @@ public Try getAasSubmodelTemplate( String urn, AasFormat aasFormat ) {
       try {
          switch ( aasFormat ) {
          case FILE:
-            aasGenerator.generate( AasFileFormat.AASX, aspect, ( String s ) -> {
+            aasGenerator.generateAASXFile( aspect, ( String s ) -> {
                return stream;
             } );
             return Try.of( stream::toByteArray );
          case XML:
-            aasGenerator.generate( AasFileFormat.XML, aspect, ( String s ) -> {
+            aasGenerator.generateAasXmlFile( aspect, ( String s ) -> {
                return stream;
             } );
             return Try.of( stream::toString );
          case JSON:
-            aasGenerator.generate( AasFileFormat.JSON, aspect, ( String s ) -> {
+            aasGenerator.generateAasJsonFile( aspect, ( String s ) -> {
                return stream;
             } );
             return Try.of( stream::toString );
          default:
             return Try.failure( new Exception( String.format( "Wrong AAS output format %s", aasFormat.toString() ) ) );
 
          }
-      } catch ( Exception e ) {
+      } catch ( IOException e ) {
          return Try.failure( e );
       }
    }

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2021,2023,2024 Contributors to the Eclipse Foundation
+ Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
 
  See the NOTICE file(s) distributed with this work for additional
  information regarding copyright ownership.
@@ -98,7 +98,7 @@
 		<jaxb-api.version>2.3.1</jaxb-api.version>
 
 		<!-- semantics -->
-      <samm.sdk.version>2.5.1</samm.sdk.version>
+      <samm.sdk.version>2.4.2</samm.sdk.version>
 		<jena.version>4.7.0</jena.version>
 		<shacl.version>1.3.1</shacl.version>