Merge branch 'main' into bugfix/302-code-generation-optional-with-constraint

# Conflicts:
#	core/esmf-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithOptionalPropertyAndConstraint.ttl
#	core/sds-aspect-model-java-generator/src/main/java/io/openmanufacturing/sds/aspectmodel/java/AspectModelJavaUtil.java
#	core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/AspectModelJavaGeneratorTest.java
#	core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/GenerationResult.java
#	core/sds-test-aspect-models/src/main/java/io/openmanufacturing/sds/test/TestAspect.java

Author: RaMisess

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

@@ -38,7 +38,7 @@ jobs:
         # This seems to be caused by running out of memory; increasing page file
         # size suggested here:
         # https://github.com/actions/virtual-environments/issues/3420#issuecomment-861342418
-        uses: al-cheb/configure-pagefile-action@v1.2
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 16GB
           maximum-size: 16GB
@@ -54,8 +54,8 @@ jobs:
         run: |
           java --version
           export MAVEN_OPTS="-Xmx4096m"
-          mvn -B -pl '!io.openmanufacturing:bamm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
-          cd tools/bamm-cli
+          mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
+          cd tools/samm-cli
           mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
         shell: bash
@@ -65,23 +65,23 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v3
         with:
-          name: bamm-cli-jar
-          path: tools/bamm-cli/target/bamm-cli-*.jar
+          name: samm-cli-jar
+          path: tools/samm-cli/target/samm-cli-*.jar
 
       - name: Upload binary (Windows)
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v3
         with:
-          name: bamm-cli-binary-${{ matrix.os }}
+          name: samm-cli-binary-${{ matrix.os }}
           path: |
-            tools/bamm-cli/target/bamm.exe
-            tools/bamm-cli/target/*.dll
-            tools/bamm-cli/target/lib/
+            tools/samm-cli/target/samm.exe
+            tools/samm-cli/target/*.dll
+            tools/samm-cli/target/lib/
 
       - name: Upload binary (Linux/Mac)
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v3
         with:
-          name: bamm-cli-binary-${{ matrix.os }}
+          name: samm-cli-binary-${{ matrix.os }}
           path: |
-            tools/bamm-cli/target/bamm
+            tools/samm-cli/target/samm

.github/workflows/release-workflow.yml

@@ -15,7 +15,7 @@ jobs:
 
       # Required for Maven
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -42,7 +42,7 @@ jobs:
 
   # The Linux build will upload the local Nexus deployment repository
   # (i.e., what will be deployed to OSSRH/Maven Central)
-  # and the Linux-specific bamm-cli binary to the build artifacts
+  # and the Linux-specific samm-cli binary to the build artifacts
   build-linux:
     name: Linux build
     needs: [check-preconditions]
@@ -51,6 +51,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      # Even though the build itself is done using the GraalVM JDK
+      # (see below), we use the setup-java action to have GPG configured
+      # so that it can be used from the maven-gpg-plugin.
+      - name: Configure GPG
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          gpg-private-key: ${{ secrets.PGP_KEY }}
+          gpg-passphrase: PGP_KEY_PASSWORD
+          overwrite-settings: false
+
       - name: Setup JDK
         uses: graalvm/setup-graalvm@v1
         with:
@@ -84,27 +96,33 @@ jobs:
           mvn versions:commit
 
           # Actual build of core SDK
-          mvn -B -pl '!io.openmanufacturing:bamm-cli' clean deploy -Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -DaltDeploymentRepository=local::default::file://nexus-staging -Psign
+          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
-          cd tools/bamm-cli
+          pushd tools/samm-cli
           mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
-
-          # Create zip of bamm-cli
-          cd tools/bamm-cli/target
-          chmod a+x bamm
-          tar cfvz bamm-cli-linux.tar.gz bamm
+          popd
+
+          # Create .tar.gz of samm-cli
+          pushd tools/samm-cli/target
+          chmod a+x samm
+          tar cfvz samm-cli-linux.tar.gz samm
+          popd
+          mv tools/samm-cli/target/samm-cli-linux.tar.gz .
+          mv tools/samm-cli/target/samm-cli-*.jar .
+        env:
+          PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Upload staging directory and Linux binary
         uses: actions/upload-artifact@v3
         with:
           name: linux-artifacts
           path: |
             nexus-staging/
-            tools/bamm-cli/target/bamm-cli-linux.tar.gz
-            tools/bamm-cli/target/bamm-cli-*.jar
+            samm-cli-linux.tar.gz
+            samm-cli-*.jar
 
-  # The Windows build will build the Windows-specific bamm-cli
+  # The Windows build will build the Windows-specific samm-cli
   # and upload the binary to the build artifacts
   build-windows:
     name: Windows build
@@ -136,7 +154,7 @@ jobs:
         # This seems to be caused by running out of memory; increasing page file
         # size suggested here:
         # https://github.com/actions/virtual-environments/issues/3420#issuecomment-861342418
-        uses: al-cheb/configure-pagefile-action@v1.2
+        uses: al-cheb/configure-pagefile-action@v1.3
         with:
           minimum-size: 16GB
           maximum-size: 16GB
@@ -151,9 +169,9 @@ jobs:
           mvn versions:commit
 
           # Actual build of core SDK
-          mvn -B -pl '!io.openmanufacturing:bamm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
+          mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           # Build of CLI
-          cd tools/bamm-cli
+          cd tools/samm-cli
           mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
         shell: bash
@@ -163,11 +181,12 @@ jobs:
         with:
           name: windows-artifacts
           path: |
-            tools/bamm-cli/target/bamm.exe
-            tools/bamm-cli/target/*.dll
-            tools/bamm-cli/target/lib/
+            tools/samm-cli/target/samm.exe
+            tools/samm-cli/target/*.dll
+            tools/samm-cli/target/lib/
 
   release:
+    name: Release
     needs: [build-linux, build-windows]
     runs-on: ubuntu-latest
     steps:
@@ -176,18 +195,28 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      # Required to have Maven settings.xml set up correctly
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '17'
           server-id: ossrh
           server-username: OSSRH_USERNAME
           server-password: OSSRH_TOKEN
-          gpg-private-key: ${{ secrets.PGP_KEY }}
-          gpg-passphrase: PGP_KEY_PASSWORD
           overwrite-settings: false
 
+      # Required to run the mvn:versions, since enforcer plugin
+      # will check for GraalVM JDK
+      - name: Setup JDK
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: '22.3.1'
+          java-version: '17'
+          components: 'native-image,js'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'false'
+
       - name: Fetch Linux Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -201,59 +230,69 @@ jobs:
       - name: Prepare release
         run: |
           # Create Windows CLI zip
-          zip -9 -r bamm-cli-windows.zip bamm.exe *.dll lib/
+          zip -9 -r samm-cli-windows.zip samm.exe *.dll lib/
 
       # Full release: Maven Central
+      # The (apparently) only way to retrieve the staging profile id
+      # is the undocumented rc-list-profiles command of the
+      # nexus-staging-maven-plugin:
+      # mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13:rc-list-profiles -DnexusUrl=https://oss.sonatype.org/ -DserverId=ossrh
       - name: Release to OSSRH/Maven Central
         if: ${{ !contains( github.event.inputs.release_version, '-M' ) }}
         run: |
-          mvn nexus-staging:deploy-staged-repository -DrepositoryDirectory=nexus-staging -Prelease-build
+          mkdir deploy
+          mv nexus-staging deploy
+          cd deploy
+          mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13:deploy-staged-repository \
+            -DnexusUrl=https://oss.sonatype.org/ \
+            -DserverId=ossrh \
+            -DrepositoryDirectory=nexus-staging \
+            -DstagingProfileId=7e73217781f2e
         env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           # Workaround for https://issues.sonatype.org/browse/OSSRH-66257
           # as described in https://stackoverflow.com/a/70157413
           MAVEN_OPTS: --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
 
-      - name: Create release commit
+      - name: Set versions
         continue-on-error: true
         run: |
-          git config user.name github-actions
-          git config user.email [email protected]
-
           release_version=${{ github.event.inputs.release_version }}
           release_branch_name=${release_version%.*}.x
           echo "release_branch_name=$release_branch_name" >> $GITHUB_ENV
 
-          git fetch
-          git checkout -b $release_branch_name --track origin/$release_branch_name || true
-          git checkout -b $release_branch_name
-
           # Set version in pom.xml files
-          mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-          mvn versions:set -DnewVersion=${{ github.event.inputs.release_version }}
-          mvn versions:commit
+          mvn -B clean install -DskipTests -Dmaven.javadoc.skip=true
+          mvn -B versions:set -DnewVersion=${{ github.event.inputs.release_version }}
+          mvn -B versions:commit
           # Set version in Antora module
           yq eval -i '.version = "${{ github.event.inputs.release_version }}"' documentation/developer-guide/antora.yml
-          # Push changes
-          git add .
-          if git commit -m "Add version ${{ github.event.inputs.release_version}}"; then
-            git push origin ${{ env.release_branch_name }}
-          fi
+
+      - name: Commit version changes and push to upstream repository
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+           branch: ${{ env.release_branch_name }}
+           commit_user_name: github-actions
+           commit_user_email: [email protected]
+           commit_author: Author <[email protected]>
+           file_pattern: 'documentation/developer-guide/antora.yml pom.xml */*/pom.xml'
 
       # Full release: Github
       - name: "Create Github release (full)"
         if: ${{ !contains( github.event.inputs.release_version, '-M' ) }}
         uses: softprops/action-gh-release@v1
-        id: sds_sdk_release
+        id: esmf_sdk_release
         with:
           body: "Release version ${{ github.event.inputs.release_version }}."
           tag_name: v${{ github.event.inputs.release_version }}
           target_commitish: ${{ env.release_branch_name }}
           draft: false
           prerelease: false
           files: |
-            bamm-cli-windows.zip
-            bamm-cli-linux.tar.gz
-            bamm-cli-*.jar
+            samm-cli-windows.zip
+            samm-cli-linux.tar.gz
+            samm-cli-*.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
@@ -291,7 +330,7 @@ jobs:
       # Milestone release: Maven deploy to Github
       - name: Publish to Github
         if: contains( github.event.inputs.release_version, '-M' )
-        run: mvn -s ./settings.xml -B clean -pl '!sds-sdk-test-report,!documentation,!tools/bamm-cli' deploy -DskipTests -Pmilestone-build,sign
+        run: mvn -s ./settings.xml -B clean -pl '!esmf-sdk-test-report,!documentation,!tools/samm-cli' deploy -DskipTests -Pmilestone-build,sign
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
@@ -308,8 +347,8 @@ jobs:
           draft: false
           prerelease: true
           files: |
-            bamm-cli-windows.zip
-            bamm-cli-linux.tar.gz
-            bamm-cli-*.jar
+            samm-cli-windows.zip
+            samm-cli-linux.tar.gz
+            samm-cli-*.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}

.gitignore

@@ -145,8 +145,8 @@ build
 /core/sds-aspect-meta-model-legacy*/target
 
 # Directories where classes are generated during unit tests
-core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/test
-core/sds-aspect-model-jackson/src/main/java/io/openmanufacturing/test
+core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/test
+core/esmf-aspect-model-jackson/src/main/java/org/eclipse/esmf/test
 
 # jqwik
 .jqwik-database
@@ -155,4 +155,6 @@ core/sds-aspect-model-jackson/src/main/java/io/openmanufacturing/test
 .attach_pid*
 
 # MacOS
-.DS_Store
+.DS_Store
+
+/deploy