Skip to content

Commit 0e341fa

Browse files
authored
Merge pull request #102 from basil/jakarta-inject
Forward compatibility with Guice 7
2 parents b3a2dfb + 4a9a21f commit 0e341fa

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
</pluginRepositories>
6464
<properties>
6565
<changelist>999999-SNAPSHOT</changelist>
66-
<jenkins.version>2.361.4</jenkins.version>
66+
<jenkins.version>2.414.3</jenkins.version>
6767
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
6868
</properties>
6969
<dependencyManagement>
7070
<dependencies>
7171
<dependency>
7272
<groupId>io.jenkins.tools.bom</groupId>
73-
<artifactId>bom-2.361.x</artifactId>
74-
<version>2102.v854b_fec19c92</version>
73+
<artifactId>bom-2.414.x</artifactId>
74+
<version>2705.vf5c48c31285b_</version>
7575
<scope>import</scope>
7676
<type>pom</type>
7777
</dependency>

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import edu.umd.cs.findbugs.annotations.CheckForNull;
6161
import edu.umd.cs.findbugs.annotations.NonNull;
6262
import groovy.lang.MissingPropertyException;
63-
import javax.inject.Inject;
63+
import jakarta.inject.Inject;
6464
import jenkins.model.Jenkins;
6565
import jenkins.scm.impl.SingleSCMSource;
6666
import org.codehaus.groovy.control.MultipleCompilationErrorsException;

src/main/java/org/jenkinsci/plugins/workflow/libs/ResourceStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import hudson.Util;
3030
import java.util.Map;
3131
import edu.umd.cs.findbugs.annotations.CheckForNull;
32-
import javax.inject.Inject;
32+
import jakarta.inject.Inject;
3333
import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
3434
import org.jenkinsci.plugins.workflow.flow.FlowExecution;
3535
import org.jenkinsci.plugins.workflow.steps.AbstractStepDescriptorImpl;

0 commit comments

Comments
 (0)