Skip to content

Migrate from EE 8 to EE 9 #105

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

Merged
basil merged 1 commit into from
Feb 19, 2025
Merged

Migrate from EE 8 to EE 9 #105

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.74</version>
<version>5.7</version>
<relativePath />
</parent>

Expand All @@ -25,7 +25,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.414</jenkins.baseline>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>2278.v47b_4508e256a</version>
<version>3850.vb_c5319efa_e29</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -81,7 +81,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>job-dsl</artifactId>
<version>1.82</version>
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cloudbees/jenkins/plugins/BitBucketMultibranchTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.util.logging.Logger;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/cloudbees/jenkins/plugins/BitbucketCrumbExclusion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import hudson.Extension;
import hudson.security.csrf.CrumbExclusion;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

@Extension
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/cloudbees/jenkins/plugins/BitbucketHookReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import net.sf.json.JSONObject;

import org.apache.commons.io.IOUtils;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
Expand Down Expand Up @@ -39,7 +39,7 @@ public String getUrlName() {
* as form-urlencoded <pre>payload=JSON</pre>
* @throws IOException
*/
public void doIndex(StaplerRequest req) throws IOException {
public void doIndex(StaplerRequest2 req) throws IOException {
String body = IOUtils.toString(req.getInputStream());
if (!body.isEmpty() && req.getRequestURI().contains("/" + BITBUCKET_HOOK_URL + "/")) {
String contentType = req.getContentType();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import jenkins.scm.api.SCMSourceOwner;
import jenkins.triggers.SCMTriggerItem;

import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
Expand All @@ -42,7 +42,7 @@

public void triggerMatchingJobs(String user, String url, String scm, String payload, String branchName) {
if ("git".equals(scm) || "hg".equals(scm)) {
SecurityContext old = Jenkins.getInstance().getACL().impersonate(ACL.SYSTEM);
SecurityContext old = Jenkins.getInstance().getACL().impersonate2(ACL.SYSTEM2);

Check warning on line 45 in src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 45 is not covered by tests
try {
URIish remote = new URIish(url);
for (Job<?, ?> job : Jenkins.getInstance().getAllItems(Job.class)) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

import net.sf.json.JSONArray;
import net.sf.json.JSONException;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.io.IOException;
import java.io.InputStream;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
Expand Down
Loading