From e82e1f53de2c148577a5f8881e81bb77a6d8854c Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich.opensource@gmail.com>
Date: Wed, 18 Dec 2024 08:30:11 +0100
Subject: [PATCH] attempt to run nightly with j21

---
 Jenkinsfile | 81 ++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5bf71942..5a5af9d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,11 +13,6 @@ pipeline {
     skipDefaultCheckout false
   }
 
-  tools {
-    maven 'apache-maven-latest'
-    jdk 'temurin-jdk17-latest'
-  }
-
   environment {
     PUBLISH_LOCATION = 'updates'
     BUILD_TIMESTAMP = sh(returnStdout: true, script: 'date +%Y%m%d%H%M').trim()
@@ -82,58 +77,62 @@ BRANCH_NAME=${env.BRANCH_NAME}
     stage('Test With Latest') {
       steps {
         wrap([$class: 'Xvnc', useXauthority: true]) {
-          dir('.') {
-            sh '''
-              mvn \
-                --fail-at-end \
-                --no-transfer-progress \
-                --update-snapshots \
-                -P!promote \
-                -Dmaven.repo.local=xpect-local-maven-repository \
-                -Dmaven.artifact.threads=16 \
-                -Declipsesign=false \
-                -Dtycho-version=${TYCHO_VERSION} \
-                -Dtarget-platform=${TARGET_PLATFORM_LATEST} \
-                clean \
-                integration-test
-              '''
-          }
-        }
-      }
-    }
-
-    stage('Build With Primary') {
-      steps {
-        sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-          wrap([$class: 'Xvnc', useXauthority: true]) {
+          withMaven(jdk: 'temurin-jdk21-latest', maven: 'apache-maven-3.9.9', options: [junitPublisher(disabled: false), openTasksPublisher(disabled: false)]) {
             dir('.') {
               sh '''
-                if [[ $PROMOTE != true ]]; then
-                  promotion_argument='-P!promote'
-                fi
                 mvn \
                   --fail-at-end \
                   --no-transfer-progress \
                   --update-snapshots \
-                  $promotion_argument \
+                  -P!promote \
                   -Dmaven.repo.local=xpect-local-maven-repository \
                   -Dmaven.artifact.threads=16 \
-                  -Declipsesign=${ECLIPSE_SIGN} \
+                  -Declipsesign=false \
                   -Dtycho-version=${TYCHO_VERSION} \
-                  -Dtarget-platform=${TARGET_PLATFORM_PRIMARY} \
-                  -Dbuild.id=${BUILD_TIMESTAMP} \
-                  -Dgit.commit=$GIT_COMMIT \
-                  -Dbuild.type=$BUILD_TYPE \
-                  -Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
-                  -Dorg.eclipse.justj.p2.manager.relative=$PUBLISH_LOCATION \
+                  -Dtarget-platform=${TARGET_PLATFORM_LATEST} \
                   clean \
-                  verify
+                  integration-test
                 '''
             }
           }
         }
       }
     }
+
+    stage('Build With Primary') {
+      steps {
+        sshagent(['projects-storage.eclipse.org-bot-ssh']) {
+          wrap([$class: 'Xvnc', useXauthority: true]) {
+            withMaven(jdk: 'temurin-jdk17-latest', maven: 'apache-maven-3.9.9', options: [junitPublisher(disabled: false), openTasksPublisher(disabled: false)]) {
+              dir('.') {
+                sh '''
+                  if [[ $PROMOTE != true ]]; then
+                    promotion_argument='-P!promote'
+                  fi
+                  mvn \
+                    --fail-at-end \
+                    --no-transfer-progress \
+                    --update-snapshots \
+                    $promotion_argument \
+                    -Dmaven.repo.local=xpect-local-maven-repository \
+                    -Dmaven.artifact.threads=16 \
+                    -Declipsesign=${ECLIPSE_SIGN} \
+                    -Dtycho-version=${TYCHO_VERSION} \
+                    -Dtarget-platform=${TARGET_PLATFORM_PRIMARY} \
+                    -Dbuild.id=${BUILD_TIMESTAMP} \
+                    -Dgit.commit=$GIT_COMMIT \
+                    -Dbuild.type=$BUILD_TYPE \
+                    -Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
+                    -Dorg.eclipse.justj.p2.manager.relative=$PUBLISH_LOCATION \
+                    clean \
+                    verify
+                  '''
+              }
+            }
+          }
+        }
+      }
+    }
   }
 
   post {