Update jacoco from 3.3.4 to 3.3.5 and remove Java 21 workaround

jenkinsci · Oct 4, 2023 · 3f74795 · 3f74795
1 parent 6407824
commit 3f74795
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -91,9 +91,6 @@ if (BRANCH_NAME == 'master' || fullTestMarkerFile || env.CHANGE_ID && pullReques
           if (repository == 'google-compute-engine-plugin') {
             // TODO JENKINS-71921
             jdk = 17
-          } else if (repository == 'jacoco-plugin') {
-            // TODO JENKINS-71806
-            jdk = 17
           }
         }
         mavenEnv(jdk: jdk, nodePool: true) {

diff --git a/bom-2.387.x/pom.xml b/bom-2.387.x/pom.xml
@@ -11,6 +11,7 @@
   <properties>
     <blueocean-plugin.version>1.27.5.1</blueocean-plugin.version>
     <configuration-as-code-plugin.version>1670.v564dc8b_982d0</configuration-as-code-plugin.version>
+    <jacoco-plugin.version>3.3.4</jacoco-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -137,6 +138,11 @@
         <artifactId>kubernetes</artifactId>
         <version>4007.v633279962016</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>jacoco</artifactId>
+        <version>3.3.4</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>kubernetes-client-api</artifactId>

diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
@@ -636,7 +636,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>jacoco</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>