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

Migrate from EE 8 to EE 9 #307

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −13
Open

Migrate from EE 8 to EE 9 #307

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
14 changes: 8 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>5.4</version>
<version>5.7</version>
</parent>

<artifactId>s3</artifactId>
<packaging>hpi</packaging>
<version>${changelist}</version>
<name>Jenkins S3 publisher plugin</name>
<url>https://github.com/jenkinsci/s3-plugin</url>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>

<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/s3-plugin</gitHubRepo>
<jenkins.version>2.479.1</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
</properties>

<developers>
Expand Down Expand Up @@ -100,8 +102,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.479.x</artifactId>
<version>3875.v1df09947cde6</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3893.v213a_42768d35</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/hudson/plugins/s3/S3ArtifactsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
import java.util.Date;
import java.util.List;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;

import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
import com.amazonaws.services.s3.model.ResponseHeaderOverrides;
import hudson.Functions;
import jenkins.model.RunAction2;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import hudson.model.Run;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;

import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;

@ExportedBean
public class S3ArtifactsAction implements RunAction2 {
Expand Down Expand Up @@ -75,7 +75,7 @@ public List<FingerprintRecord> getArtifacts() {
return artifacts;
}

public void doDownload(final StaplerRequest request, final StaplerResponse response) throws IOException, ServletException {
public void doDownload(final StaplerRequest2 request, final StaplerResponse2 response) throws IOException, ServletException {
if (Functions.isArtifactsPermissionEnabled()) {
build.getParent().checkPermission(Run.ARTIFACTS);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/s3/S3BucketPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.interceptor.RequirePOST;

import java.io.IOException;
Expand Down Expand Up @@ -483,7 +483,7 @@ public String getHelpFile() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject json) {
public boolean configure(StaplerRequest2 req, JSONObject json) {
final JSONArray array = json.optJSONArray("profile");
if (array != null) {
profiles.replaceBy(req.bindJSONToList(S3Profile.class, array));
Expand Down