diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f2d7cc0..e5831377 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,21 @@ jobs: java-version: '17' check-latest: true cache: 'maven' + # https://github.com/jenkins-infra/github-reusable-workflows/issues/36 + - name: Set up Maven + run: | + wget --no-verbose https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz + echo $CHECKSUM apache-maven-$MAVEN_VERSION-bin.tar.gz | sha512sum --check + tar xzf apache-maven-$MAVEN_VERSION-bin.tar.gz + rm apache-maven-$MAVEN_VERSION-bin.tar.gz + sudo mv apache-maven-$MAVEN_VERSION /opt/maven + sudo rm -f /usr/bin/mvn + sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn + mvn --version + env: + MAVEN_VERSION: 3.9.9 + # https://downloads.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz.sha512 + CHECKSUM: a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b - name: Generate coverage with JaCoCo run: mvn --batch-mode clean verify jacoco:prepare-agent test integration-test jacoco:report diff --git a/Jenkinsfile b/Jenkinsfile index ebe4cbaa..bc891518 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,5 @@ buildPlugin(useContainerAgent: true, artifactCachingProxyEnabled: true, configurations: [ [platform: 'linux', jdk: 21], - [platform: 'linux', jdk: 11], [platform: 'windows', jdk: 17], ]) diff --git a/pom.xml b/pom.xml index f1a43305..b94b6b32 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.87 + 5.3 @@ -45,8 +45,8 @@ 4 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - - 2.426.3 + 2.479 + ${jenkins.baseline}.1 false Max 1836.vccda_4a_122a_a_e @@ -59,8 +59,8 @@ io.jenkins.tools.bom - bom-2.426.x - 3208.vb_21177d4b_cd9 + bom-${jenkins.baseline}.x + 3850.vb_c5319efa_e29 pom import @@ -136,6 +136,7 @@ jackson-databind + com.google.guava guava @@ -154,6 +155,7 @@ test + com.google.guava guava