From 189a0146d82f779ec0ad481fd894f2e951e0ecaf Mon Sep 17 00:00:00 2001 From: robinsoc Date: Fri, 23 Dec 2022 17:50:32 +0100 Subject: [PATCH] Use Java 17 to build the plugin. (#294) * Use Java 17 to build the plugin. Part of [request #30006](https://tuleap.net/plugins/tracker/?aid=30006) Build Tuleap Authentication with Java 17 No functional change expected * CI tools should build the plugin with java 17 too * bump to java 17 the Archive Plugin Artifact plugin * revert back properties files Co-authored-by: Clarck Robinson Co-authored-by: Martin Goyot --- .github/workflows/Archive_Plugin_Artifact.yml | 2 +- .github/workflows/CI.yml | 2 +- Jenkinsfile | 7 ++++++- pom.xml | 9 ++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Archive_Plugin_Artifact.yml b/.github/workflows/Archive_Plugin_Artifact.yml index bc892c88..7b8ae77d 100644 --- a/.github/workflows/Archive_Plugin_Artifact.yml +++ b/.github/workflows/Archive_Plugin_Artifact.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3.8.0 with: distribution: 'temurin' - java-version: '8' + java-version: '17' - name: Build run: mvn -Dmaven.test.skip=true -Dspotbugs.skip=true --batch-mode --show-version clean install - name: Archive diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bd00372d..1e6edb0a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-java@v3.8.0 with: distribution: 'temurin' - java-version: '8' + java-version: '17' - name: Build run: mvn -Pjacoco clean verify --batch-mode --show-version - name: Upload coverage to Codecov diff --git a/Jenkinsfile b/Jenkinsfile index a229fa51..49248608 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,6 @@ -buildPlugin() +buildPlugin( + useContainerAgent: true, + configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 17], +]) diff --git a/pom.xml b/pom.xml index 6385683f..3849a574 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.40 + 4.53 io.jenkins.plugins @@ -15,8 +15,7 @@ 1.1.19 -SNAPSHOT jenkinsci/tuleap-oauth-plugin - 2.289.3 - 8 + 2.361.4 1.0.0 @@ -69,8 +68,8 @@ io.jenkins.tools.bom - bom-2.289.x - 1500.ve4d05cd32975 + bom-2.361.x + 1742.vb_70478c1b_25f import pom