Merge pull request #3257 from eclipse/lb_more_java21

Additional fixes/cleanup for Java 21
eclipse-xtext · Nov 26, 2024 · 024d13c · 024d13c
2 parents e3ec7fb + 32d6c61
commit 024d13c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 67 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,10 +16,12 @@ jobs:
         os: ['ubuntu-22.04', 'macos-14', 'windows-2022']
         java: [ 21 ]
         additional-maven-args: ['']
+        additional-label: ['']
         include:
         - os: ubuntu-22.04
           java: 21
           additional-maven-args: -Pstrict-jdk-21
+          additional-label: -strict
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -37,7 +39,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ matrix.java }}-${{ hashFiles('**/pom.xml', '**/*.target') }}
+          key: ${{ runner.os }}-m2-${{ matrix.java }}${{ matrix.additional-label }}-${{ hashFiles('**/pom.xml', '**/*.target') }}
 
       - name: Set Maven Home environment variable
         run: echo "MAVEN_WRAPPER_HOME=$(./mvnw --version | grep "Maven home:" | cut -c 13-)" >> "$GITHUB_ENV"
@@ -61,13 +63,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results-${{ runner.os }}-${{ matrix.java }}
+          name: test-results-${{ runner.os }}-${{ matrix.java }}${{ matrix.additional-label }}
           path: '**/*.tests/target/surefire-reports'
       - name: Archive Logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() || cancelled() }}
         with:
-          name: logs-${{ runner.os }}-${{ matrix.java }}
+          name: logs-${{ runner.os }}-${{ matrix.java }}${{ matrix.additional-label }}
           path: '**/*.tests/target/**/*.log'
 
   build-maven-artifacts:

diff --git a/full-build.sh b/full-build.sh
@@ -11,9 +11,9 @@ while [ "$1" != "" ]; do
   VALUE=`echo $1 | awk -F= '{print $2}'`
   case $PARAM in
     -h | --help)
-      echo "Perform Maven build for xtext-xtend"
+      echo "Perform Maven/Tycho build for Xtext"
       echo ""
-      echo "./1-maven-build.sh"
+      echo "./full-build.sh"
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"

diff --git a/full-deploy.sh b/full-deploy.sh
@@ -11,9 +11,9 @@ while [ "$1" != "" ]; do
   VALUE=`echo $1 | awk -F= '{print $2}'`
   case $PARAM in
     -h | --help)
-      echo "Perform Maven build for xtext-xtend"
+      echo "Perform Maven and p2 deployment for Xtext"
       echo ""
-      echo "./1-maven-build.sh"
+      echo "./full-deploy.sh"
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"

diff --git a/jenkins/milestone-deploy/Jenkinsfile b/jenkins/milestone-deploy/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {

diff --git a/jenkins/nightly-deploy/Jenkinsfile b/jenkins/nightly-deploy/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {

diff --git a/jenkins/release-deploy/Jenkinsfile b/jenkins/release-deploy/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {

diff --git a/maven-build.sh b/maven-build.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ pipeline { @@
       }
       tools {
-        jdk "temurin-jdk17-latest"
+        jdk "temurin-jdk21-latest"
       }
       stages {
@@ Expand Down @@