Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forward compatibility with Guice 7 #148

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Forward compatibility with Guice 7 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -64,15 +64,15 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.387.3</jenkins.version>
<jenkins.version>2.414.3</jenkins.version>
<no-test-jar>false</no-test-jar>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2465.va_e76ed7b_3061</version>
<artifactId>bom-2.414.x</artifactId>
<version>2705.vf5c48c31285b_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/steps/AbstractStepDescriptorImpl.java
View file
Open in desktop
@@ -1,6 +1,6 @@
package org.jenkinsci.plugins.workflow.steps;

import javax.inject.Inject;
import jakarta.inject.Inject;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/steps/AbstractStepImpl.java
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
import jenkins.model.Jenkins;

import edu.umd.cs.findbugs.annotations.Nullable;
import javax.inject.Inject;
import jakarta.inject.Inject;

/**
* Partial convenient step implementation.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/steps/StepExecution.java
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
import java.util.logging.Logger;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.inject.Inject;
import jakarta.inject.Inject;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this context the Guice version is perhaps more appropriate, but I do not think it really matters.

import jenkins.model.queue.AsynchronousExecution;
import jenkins.util.Timer;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jenkinsci/plugins/workflow/steps/AbstractStepImplTest.java
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

import javax.inject.Inject;
import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Map;

Expand Down