Skip to content

Commit 7690a6b

Browse files
authored
Merge pull request #530 from bci-oss/529-update-to-aas4j-1.0
Update to AAS4J 1.0.0
2 parents 04d45ac + d80120e commit 7690a6b

File tree

41 files changed

+568
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+568
-695
lines changed

.github/workflows/pull-request-check.yml

+2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ jobs:
6666
run: |
6767
java --version
6868
export MAVEN_OPTS="-Xmx4096m"
69+
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
6970
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
7071
cd tools/samm-cli
72+
unset JAVA_TOOL_OPTIONS
7173
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
7274
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
7375
shell: bash

.github/workflows/release-workflow.yml

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
- name: Build and run tests
9191
run: |
9292
export MAVEN_OPTS="-Xmx4096m"
93+
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
9394
# Required for reactor dependencies
9495
mvn clean install -DskipTests -Dmaven.javadoc.skip=true
9596
mvn versions:set -DnewVersion=${{ github.event.inputs.release_version }}
@@ -101,6 +102,7 @@ jobs:
101102
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean deploy -Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -DaltDeploymentRepository=local::default::file://nexus-staging -Psign
102103
# Build of CLI
103104
pushd tools/samm-cli
105+
unset JAVA_TOOL_OPTIONS
104106
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
105107
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
106108
popd

core/esmf-aspect-meta-model-java/buildSrc/main/groovy/unit2java.groovy

-314
This file was deleted.

0 commit comments

Comments
 (0)