Merge pull request #715 from bci-oss/713-update-to-java-21

Update to Java 21

Author: atextor

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

@@ -12,15 +12,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [windows-latest, ubuntu-20.04, macos-13]
+        os: [windows-latest, ubuntu-latest, macos-13]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Check code style
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
         uses: dbelyaev/action-checkstyle@e89baf0f8b488b946345b7de8e975be1e3606387 # v1.5.6
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,9 +30,9 @@ jobs:
           fail_on_error: true
 
       - name: Setup JDK
-        uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
         with:
-          java-version: '17.0.10'
+          java-version: '21.0.6'
           distribution: 'graalvm'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -59,7 +59,7 @@ jobs:
           disk-root: "C:"
 
       - name: Set Swap Space (Linux)
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
         uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # master
         with:
           swap-size-gb: 12
@@ -86,9 +86,9 @@ jobs:
           mvn -B -pl tools/samm-cli clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
           bundle="samm-bundle-DEV-SNAPSHOT-$(date +%s)"
           mkdir ${bundle}
-          curl -Lo jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz
+          curl -Lo jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz
           tar -xvf jre.tar.gz 
-          cp -r ./jdk-21.0.3+9-jre/Contents/Home ./${bundle}/jre
+          cp -r ./jdk-21.0.6+7-jre/Contents/Home ./${bundle}/jre
           cp tools/samm-cli/target/samm-cli-DEV-SNAPSHOT.jar ./${bundle}/
           
           cat <<EOF > ./${bundle}/run.sh
@@ -116,18 +116,18 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
 
       - name: Test executable jar on Temurin
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           cd tools/samm-cli
           mvn -B -Denforcer.skip -Dskip.maven.surefire failsafe:integration-test -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
 
       - name: Upload executable jar
         # We only need one OS job to upload the jar
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
           name: samm-cli-jar
@@ -145,7 +145,7 @@ jobs:
             tools/samm-cli/target/lib/
 
       - name: Upload binary (Linux)
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
           name: samm-cli-binary-${{ matrix.os }}

.github/workflows/release-workflow.yml

@@ -8,19 +8,19 @@ on:
 jobs:
   check-preconditions:
     name: Check preconditions
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
       # Required for Maven
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
 
       - name: Setup Git
@@ -48,7 +48,7 @@ jobs:
   build-linux:
     name: Linux build
     needs: [check-preconditions]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -62,15 +62,15 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           gpg-private-key: ${{ secrets.PGP_KEY }}
           gpg-passphrase: PGP_KEY_PASSWORD
           overwrite-settings: false
 
       - name: Setup JDK
-        uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
         with:
-          java-version: '17.0.10'
+          java-version: '21.0.6'
           distribution: 'graalvm'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -122,7 +122,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           overwrite-settings: false
 
       - name: Test executable jar on Temurin
@@ -153,9 +153,9 @@ jobs:
           submodules: recursive
 
       - name: Setup JDK
-        uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
         with:
-          java-version: '17.0.10'
+          java-version: '21.0.6'
           distribution: 'graalvm'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -187,9 +187,9 @@ jobs:
         run: |
           bundle="samm-bundle-$(date +%s)"
           mkdir ${bundle}
-          curl -Lo jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz
+          curl -Lo jre.tar.gz https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz
           tar -xvf jre.tar.gz 
-          cp -r ./jdk-21.0.3+9-jre/Contents/Home ./${bundle}/jre
+          cp -r ./jdk-21.0.6+7-jre/Contents/Home ./${bundle}/jre
           cp tools/samm-cli/target/samm-cli-${{ github.event.inputs.release_version }}.jar ./${bundle}/
           
           cat <<EOF > ./${bundle}/run.sh
@@ -228,9 +228,9 @@ jobs:
           submodules: recursive
 
       - name: Setup JDK
-        uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
         with:
-          java-version: '17.0.10'
+          java-version: '21.0.6'
           distribution: 'graalvm'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -291,11 +291,11 @@ jobs:
         uses: actions/checkout@v4
 
       # Required to have Maven settings.xml set up correctly
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           server-id: ossrh
           server-username: OSSRH_USERNAME
           server-password: OSSRH_TOKEN
@@ -304,9 +304,9 @@ jobs:
       # Required to run the mvn:versions, since enforcer plugin
       # will check for GraalVM JDK
       - name: Setup JDK
-        uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+        uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3
         with:
-          java-version: '17.0.10'
+          java-version: '21.0.6'
           distribution: 'graalvm'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -54,9 +54,7 @@ Are you having trouble with ESMF SDK? We want to help!
 ## Build and contribute
 
 The top level elements of the SDK structure are all carried out as Maven multimodule projects.
-Building the SDK requires a Java 17-compatible [GraalVM JDK](https://www.graalvm.org/) with the 'js'
-component installed. If you want to build the samm-cli (see below), you will also have to have the
-'native-image' GraalVM component installed.
+Building the SDK requires a Java 21-compatible [GraalVM JDK](https://www.graalvm.org/).
 
 To build the SDK core components, run the following command:
 ```bash

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/aspectmodel/MissingMetaModelVersionException.java

@@ -28,19 +28,6 @@ public interface Namespace extends ModelElementGroup, HasDescription {
     */
    String ANONYMOUS = "urn:samm:anonymous.elements:0.0.0#";
 
-   /**
-    * The package part of the model namespace is an identifier given in
-    * <a href="https://en.wikipedia.org/wiki/Reverse_domain_name_notation">reverse domain name notation</a>, e.g.,
-    * {@code com.example.myapp}.
-    *
-    * @return the package part of the namespace
-    * @deprecated use {@link #namespaceMainPart()} instead
-    */
-   @Deprecated( forRemoval = true )
-   default String packagePart() {
-      return namespaceMainPart();
-   }
-
    /**
     * The package part of the model namespace is an identifier given in
     * <a href="https://en.wikipedia.org/wiki/Reverse_domain_name_notation">reverse domain name notation</a>, e.g.,

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/aspectmodel/MultipleMetaModelVersionsException.java

@@ -29,14 +29,6 @@ public interface Collection extends Characteristic {
     */
    boolean isOrdered();
 
-   /**
-    * @deprecated Use {@link #allowsDuplicates()} instead
-    */
-   @Deprecated( forRemoval = true )
-   default boolean isAllowDuplicates() {
-      return allowsDuplicates();
-   }
-
    /**
     * @return a {@link boolean} which determines whether the collection may contain duplicate values.
     */

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/Namespace.java

@@ -95,6 +95,30 @@
                      </sources>
                   </configuration>
                </execution>
+               <execution>
+                  <id>add-source</id>
+                  <phase>initialize</phase>
+                  <goals>
+                     <goal>add-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>${generated-sources}/main/java</source>
+                     </sources>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>add-src-buildtime-source</id>
+                  <phase>initialize</phase>
+                  <goals>
+                     <goal>add-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>${build-time-sources}/main/java</source>
+                     </sources>
+                  </configuration>
+               </execution>
             </executions>
          </plugin>
 
@@ -151,36 +175,6 @@
             </configuration>
          </plugin>
 
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>add-source</id>
-                  <phase>initialize</phase>
-                  <goals>
-                     <goal>add-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>${generated-sources}/main/java</source>
-                     </sources>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>add-src-buildtime-source</id>
-                  <phase>initialize</phase>
-                  <goals>
-                     <goal>add-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>${build-time-sources}/main/java</source>
-                     </sources>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/characteristic/Collection.java

@@ -77,7 +77,6 @@
  */
 public class AspectModelLoader implements ModelSource, ResolutionStrategySupport {
    private static final Logger LOG = LoggerFactory.getLogger( AspectModelLoader.class );
-   private static final String ASPECT_MODELS_FOLDER = "aspect-models";
 
    public static final Supplier<ResolutionStrategy> DEFAULT_STRATEGY = () -> {
       final Path currentDirectory = Path.of( System.getProperty( "user.dir" ) );