Skip to content

Commit fbb6442

Browse files
authored
Merge pull request #386 from basil/jakarta-inject
Forward compatibility with Guice 7
2 parents 8680417 + bc41357 commit fbb6442

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

github-pullrequest-plugin/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<dependencies>
6565
<dependency>
6666
<groupId>io.jenkins.tools.bom</groupId>
67-
<artifactId>bom-2.361.x</artifactId>
68-
<version>2081.v85885a_d2e5c5</version>
67+
<artifactId>bom-2.414.x</artifactId>
68+
<version>2718.v7e8a_d43b_3f0b_</version>
6969
<scope>import</scope>
7070
<type>pom</type>
7171
</dependency>
@@ -77,7 +77,6 @@
7777
<dependency>
7878
<groupId>com.coravy.hudson.plugins.github</groupId>
7979
<artifactId>github</artifactId>
80-
<version>1.34.5</version>
8180
<exclusions>
8281
<exclusion>
8382
<groupId>org.slf4j</groupId>
@@ -102,7 +101,7 @@
102101
<dependency>
103102
<groupId>org.jenkins-ci.plugins</groupId>
104103
<artifactId>job-dsl</artifactId>
105-
<version>1.81</version>
104+
<version>1.87</version>
106105
<optional>true</optional>
107106
</dependency>
108107

github-pullrequest-plugin/src/test/java/com/github/kostyasha/github/integration/branch/GitHubBranchTriggerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
4040

41-
import javax.inject.Inject;
41+
import jakarta.inject.Inject;
4242
import java.util.ArrayList;
4343
import java.util.Arrays;
4444
import java.util.Collections;

github-pullrequest-plugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRTriggerMockTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

31-
import javax.inject.Inject;
31+
import jakarta.inject.Inject;
3232
import java.io.IOException;
3333
import java.util.Arrays;
3434
import java.util.Map;

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.75</version>
8+
<version>4.77</version>
99
<relativePath />
1010
</parent>
1111

@@ -34,7 +34,7 @@
3434
<properties>
3535
<revision>0.6.2</revision>
3636
<changelist>-SNAPSHOT</changelist>
37-
<jenkins.version>2.361.4</jenkins.version>
37+
<jenkins.version>2.414.3</jenkins.version>
3838
</properties>
3939

4040
<scm>

0 commit comments

Comments
 (0)