Merge pull request eclipse-esmf#530 from bci-oss/529-update-to-aas4j-1.0

Update to AAS4J 1.0.0
bci-oss · Feb 23, 2024 · 7690a6b · 7690a6b
2 parents 04d45ac + d80120e
commit 7690a6b
Show file tree

Hide file tree

Showing 41 changed files with 568 additions and 695 deletions.
diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
@@ -66,8 +66,10 @@ jobs:
         run: |
           java --version
           export MAVEN_OPTS="-Xmx4096m"
+          export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
           mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           cd tools/samm-cli
+          unset JAVA_TOOL_OPTIONS
           mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
         shell: bash

diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -90,6 +90,7 @@ jobs:
       - name: Build and run tests
         run: |
           export MAVEN_OPTS="-Xmx4096m"
+          export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
           # Required for reactor dependencies
           mvn clean install -DskipTests -Dmaven.javadoc.skip=true
           mvn versions:set -DnewVersion=${{ github.event.inputs.release_version }}
@@ -101,6 +102,7 @@ jobs:
           mvn -B -pl '!org.eclipse.esmf:samm-cli' clean deploy -Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -DaltDeploymentRepository=local::default::file://nexus-staging -Psign
           # Build of CLI
           pushd tools/samm-cli
+          unset JAVA_TOOL_OPTIONS
           mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           popd

diff --git a/core/esmf-aspect-meta-model-java/buildSrc/main/groovy/unit2java.groovy b/core/esmf-aspect-meta-model-java/buildSrc/main/groovy/unit2java.groovy