diff options
| author | Olivier Lamy <olamy@apache.org> | 2022-08-06 11:30:06 +1000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2022-08-06 11:30:06 +1000 |
| commit | 4e15d4fd6f458ac29b4dc928b538e2d23e2885f1 (patch) | |
| tree | dee4b6dbf72d6a04094baf1bf0a512cb6d6da643 /Jenkinsfile | |
| parent | 215b7719fd91469e28b7e45a22c671de28e350cc (diff) | |
| download | archiva-4e15d4fd6f458ac29b4dc928b538e2d23e2885f1.tar.gz archiva-4e15d4fd6f458ac29b4dc928b538e2d23e2885f1.zip | |
[MRM-2031] Switch to jdk 11
Signed-off-by: Olivier Lamy <olamy@apache.org>
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index f807c0014..34ce16e2f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,10 +28,8 @@ * Only the war and zip artifacts are archived in the jenkins build archive. */ LABEL = 'ubuntu && !H23' -buildJdk = 'jdk_1.8_latest' -buildJdk9 = 'jdk_1.9_latest' -buildJdk10 = 'jdk_10_latest' -buildJdk11 = 'jdk_11_latest' +buildJdk = 'jdk_11_latest' +buildJdk17 = 'jdk_17_latest' buildMvn = 'maven_3.8.5' //localRepository = ".repository" //localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}" @@ -131,15 +129,15 @@ pipeline { } } - stage('JDK11') { + stage('JDK17') { environment { - ARCHIVA_USER_CONFIG_FILE = '/tmp/archiva-master-jdk-11-${env.JOB_NAME}.xml' + ARCHIVA_USER_CONFIG_FILE = '/tmp/archiva-master-jdk-17-${env.JOB_NAME}.xml' } steps { ws("${env.JOB_NAME}-JDK11") { checkout scm timeout(120) { - withMaven(maven: buildMvn, jdk: buildJdk11, + withMaven(maven: buildMvn, jdk: buildJdk17, mavenLocalRepo: ".repository", publisherStrategy: 'EXPLICIT', mavenOpts: mavenOpts, @@ -155,7 +153,7 @@ pipeline { } post { always { - sh "rm -f /tmp/archiva-master-jdk-11-${env.JOB_NAME}.xml" + sh "rm -f /tmp/archiva-master-jdk-17-${env.JOB_NAME}.xml" } success { cleanWs() |