Forward compatibility with Guice 7

jenkinsci · Jan 23, 2024 · 93256da · 93256da
1 parent ed8ae04
commit 93256da
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 21 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+---
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml
@@ -0,0 +1,23 @@
+# Jenkins Security Scan
+# For more information, see: https://www.jenkins.io/doc/developer/security/scan/
+---
+name: Jenkins Security Scan
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
+jobs:
+  security-scan:
+    uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
+    with:
+      java-cache: 'maven'
+      java-version: 11
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.7</version>
   </extension>
 </extensions>
diff --git a/.travis.yml b/.travis.yml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,7 @@
 #!/usr/bin/env groovy
 
 // see https://github.com/jenkins-infra/pipeline-library
-buildPlugin(jdkVersions: [11])
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: 21],
+  [platform: 'windows', jdk: 17],
+])
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.51</version>
+        <version>4.77</version>
         <relativePath />
     </parent>
 
@@ -46,13 +46,13 @@
         <revision>3.1.4</revision>
         <changelist>-SNAPSHOT</changelist>
         <hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
-        <jenkins.version>2.346.3</jenkins.version>
+        <jenkins.version>2.414.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
 
         <!-- dependencies versions -->
         <assertj.version>3.15.0</assertj.version>
         <dtkit-api.version>3.0.2</dtkit-api.version>
-        <xmlunit.version>2.7.0</xmlunit.version>
+        <xmlunit.version>2.9.1</xmlunit.version>
     </properties>
 
     <repositories>
@@ -73,8 +73,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.346.x</artifactId>
-                <version>1763.v092b_8980a_f5e</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2718.v7e8a_d43b_3f0b_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -176,7 +176,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.1</version>
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>

diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitConversionService.java
@@ -29,7 +29,7 @@
 import java.io.Serializable;
 import java.util.UUID;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.commons.io.FileUtils;
 import org.jenkinsci.lib.dtkit.model.InputMetric;

diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitTransformerCallable.java
@@ -26,7 +26,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.commons.io.FileUtils;
 import org.jenkinsci.lib.dtkit.util.validator.ValidationError;

diff --git a/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java b/src/main/java/org/jenkinsci/plugins/xunit/service/XUnitValidationService.java
@@ -28,7 +28,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jenkinsci.lib.dtkit.model.InputMetric;
 import org.jenkinsci.lib.dtkit.util.validator.ValidationError;

diff --git a/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java b/src/test/java/org/jenkinsci/plugins/xunit/XUnitPublisherTest.java
@@ -24,7 +24,7 @@
 package org.jenkinsci.plugins.xunit;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.util.HashSet;