Merge pull request #386 from basil/jakarta-inject

Forward compatibility with Guice 7
KostyaSha · Jan 18, 2024 · fbb6442 · fbb6442
2 parents 8680417 + bc41357
commit fbb6442
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/github-pullrequest-plugin/pom.xml b/github-pullrequest-plugin/pom.xml
@@ -64,8 +64,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.361.x</artifactId>
-                <version>2081.v85885a_d2e5c5</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2718.v7e8a_d43b_3f0b_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -77,7 +77,6 @@
         <dependency>
             <groupId>com.coravy.hudson.plugins.github</groupId>
             <artifactId>github</artifactId>
-            <version>1.34.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -102,7 +101,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>job-dsl</artifactId>
-            <version>1.81</version>
+            <version>1.87</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/...src/test/java/com/github/kostyasha/github/integration/branch/GitHubBranchTriggerTest.java b/...src/test/java/com/github/kostyasha/github/integration/branch/GitHubBranchTriggerTest.java
@@ -38,7 +38,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...lugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRTriggerMockTest.java b/...lugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRTriggerMockTest.java
@@ -28,7 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.75</version>
+        <version>4.77</version>
         <relativePath />
     </parent>
 
@@ -34,7 +34,7 @@
     <properties>
         <revision>0.6.2</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.361.4</jenkins.version>
+        <jenkins.version>2.414.3</jenkins.version>
     </properties>
 
     <scm>