Migrate from EE 8 to EE 9 (#367)

jenkinsci · Jan 23, 2025 · f470e9a · f470e9a
1 parent e30b411
commit f470e9a
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.5</version>
     <relativePath />
   </parent>
 
@@ -47,8 +47,8 @@ THE SOFTWARE.
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.462</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <mavenInterceptorsVersion>1.14</mavenInterceptorsVersion>
     <!--
       Minimal supported version of Maven.

diff --git a/src/main/java/hudson/maven/ExecutedMojo.java b/src/main/java/hudson/maven/ExecutedMojo.java
@@ -188,7 +188,7 @@ public String getReadableExecutionId() {
     public String getPluginLink(Cache c) {
         MavenModule m = c.get(this);
         if(m!=null)
-            return Stapler.getCurrentRequest().getContextPath()+m.getUrl();
+            return Stapler.getCurrentRequest2().getContextPath()+m.getUrl();
         if(groupId.equals("org.apache.maven.plugins"))
             return "https://maven.apache.org/plugins/"+artifactId+'/';
         if (groupId.equals("org.codehaus.mojo"))

diff --git a/src/main/java/hudson/maven/MavenBuild.java b/src/main/java/hudson/maven/MavenBuild.java
@@ -75,7 +75,7 @@
 import org.jvnet.hudson.maven3.launcher.Maven3Launcher;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 import java.io.File;
@@ -142,7 +142,7 @@ public MavenBuild(MavenModule project, File buildDir) throws IOException {
 
     @Override
     public String getUpUrl() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if(req!=null) {
             List<Ancestor> ancs = req.getAncestors();
             for( int i=1; i<ancs.size(); i++) {
@@ -159,7 +159,7 @@ public String getUpUrl() {
 
     @Override
     public String getDisplayName() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if(req!=null) {
             List<Ancestor> ancs = req.getAncestors();
             for( int i=1; i<ancs.size(); i++) {

diff --git a/src/main/java/hudson/maven/MavenModule.java b/src/main/java/hudson/maven/MavenModule.java
@@ -51,11 +51,11 @@
 import jenkins.model.Jenkins;
 
 import org.apache.maven.project.MavenProject;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -740,7 +740,7 @@ public DescribableList<MavenReporter, Descriptor<MavenReporter>> getReporters()
     }
 
     @Override
-    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         super.submit(req, rsp);
 
         reporters.rebuild(req, req.getSubmittedForm(),MavenReporters.getConfigurableList());

diff --git a/src/main/java/hudson/maven/MavenModuleSet.java b/src/main/java/hudson/maven/MavenModuleSet.java
@@ -88,7 +88,7 @@
 import java.util.Stack;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.mvn.FilePathSettingsProvider;
 import jenkins.mvn.GlobalMavenConfig;
@@ -109,8 +109,8 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 
 import static hudson.model.ItemGroupMixIn.loadChildren;
@@ -519,7 +519,7 @@ protected void addTransientActionsFromBuild(MavenModuleSetBuild build, List<Acti
     }
 
     /**
-     * Called by {@link MavenModule#doDoDelete(StaplerRequest, StaplerResponse)}.
+     * Called by {@link MavenModule#doDoDelete(StaplerRequest2, StaplerResponse2)}.
      * Real deletion is done by the caller, and this method only adjusts the
      * data structure the parent maintains.
      */
@@ -750,7 +750,7 @@ public DescribableList<BuildWrapper, Descriptor<BuildWrapper>> getBuildWrappers(
         return buildWrappers;
     }
 
-    public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         if(ModuleName.isValid(token))
             return getModule(token);
         return super.getDynamic(token,req,rsp);
@@ -1205,7 +1205,7 @@ protected List<MavenModuleSetBuild> getEstimatedDurationCandidates() {
 //
 //
 
-    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         super.submit(req,rsp);
         JSONObject json = req.getSubmittedForm();
 
@@ -1284,7 +1284,7 @@ public FormValidation doCheckFileInWorkspace(@QueryParameter String value) throw
     }
 
     @Override
-    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ContextMenu menu = new ContextMenu();
         for (MavenModule mm : getModules()) {
             menu.add(mm);
@@ -1436,7 +1436,7 @@ public Map<String, Integer> getMavenValidationLevels() {
         }
 
         @Override
-        public boolean configure( StaplerRequest req, JSONObject o ) {
+        public boolean configure( StaplerRequest2 req, JSONObject o ) {
             globalMavenOpts = Util.fixEmptyAndTrim(o.getString("globalMavenOpts"));
             localRepository = req.bindJSON(LocalRepositoryLocator.class,o.getJSONObject("localRepository"));
             save();

diff --git a/src/main/java/hudson/maven/MavenModuleSetBuild.java b/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -104,8 +104,8 @@
 
 import org.jvnet.hudson.maven3.agent.Maven3Main;
 import org.jvnet.hudson.maven3.launcher.*;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.eclipse.aether.transfer.TransferCancelledException;
 import org.eclipse.aether.transfer.TransferEvent;
@@ -463,7 +463,7 @@ public synchronized void deleteArtifacts() throws IOException {
     }
 
     @Override
-    public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         // map corresponding module build under this object
         if(token.indexOf('$')>0) {
             MavenModule m = getProject().getModule(token);

diff --git a/src/main/java/hudson/maven/MavenProbeAction.java b/src/main/java/hudson/maven/MavenProbeAction.java
@@ -30,13 +30,13 @@
 import hudson.remoting.Channel;
 import hudson.util.RemotingDiagnostics;
 import hudson.util.RemotingDiagnostics.HeapDump;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 import com.google.common.collect.Maps;
 import hudson.AbortException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
@@ -123,7 +123,7 @@ public Map<String,String> getThreadDump() throws IOException, InterruptedExcepti
         return RemotingDiagnostics.getThreadDump(channel);
     }
 
-    public void doScript( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
+    public void doScript( StaplerRequest2 req, StaplerResponse2 rsp ) throws IOException, ServletException {
         if (owner == null) {
             throw new AbortException("Completed build");
         }

diff --git a/src/main/java/hudson/maven/MavenReporterDescriptor.java b/src/main/java/hudson/maven/MavenReporterDescriptor.java
@@ -30,7 +30,7 @@
 import jenkins.model.Jenkins;
 import org.apache.commons.jelly.JellyException;
 import org.kohsuke.stapler.MetaClass;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.jelly.JellyClassTearOff;
 
@@ -81,7 +81,7 @@ public MavenReporter newAutoInstance(MavenModule module) {
      * this method can safely return null, which is the default implementation.
      */
     @Deprecated
-    public MavenReporter newInstance(StaplerRequest req) throws FormException {
+    public MavenReporter newInstance(StaplerRequest2 req) throws FormException {
         return null;
     }
 

diff --git a/src/main/java/hudson/maven/MavenTestDataPublisher.java b/src/main/java/hudson/maven/MavenTestDataPublisher.java
@@ -46,7 +46,7 @@
 
 import net.sf.json.JSONObject;
 
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Augments {@link SurefireReport} by executing {@link TestDataPublisher}s.
@@ -117,7 +117,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
 		}
 
 		@Override
-		public Publisher newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+		public Publisher newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
 			DescribableList<TestDataPublisher, Descriptor<TestDataPublisher>> testDataPublishers
                     = new DescribableList<TestDataPublisher, Descriptor<TestDataPublisher>>(Saveable.NOOP);
             try {

diff --git a/src/main/java/hudson/maven/RedeployPublisher.java b/src/main/java/hudson/maven/RedeployPublisher.java
@@ -69,7 +69,7 @@
 import org.apache.maven.repository.Proxy;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link Publisher} for {@link MavenModuleSetBuild} to deploy artifacts
@@ -369,7 +369,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
             return jobType==MavenModuleSet.class;
         }
 
-        public RedeployPublisher newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public RedeployPublisher newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return req.bindJSON(RedeployPublisher.class,formData);
         }
 

diff --git a/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java b/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java
@@ -52,7 +52,7 @@
 import java.util.GregorianCalendar;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -62,8 +62,8 @@
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -148,7 +148,7 @@ public BallColor getIconColor() {
         }
 
         // TODO: Eventually provide a better UI
-        public void doIndex(StaplerResponse rsp) throws IOException {
+        public void doIndex(StaplerResponse2 rsp) throws IOException {
             rsp.setContentType("text/plain;charset=UTF-8");
             getLog().writeLogTo(0,rsp.getWriter());
         }
@@ -204,7 +204,7 @@ public HistoryWidgetImpl getHistoryWidget() {
     }
 
     @SuppressFBWarnings(value = "DM_BOXED_PRIMITIVE_FOR_PARSING", justification = "TODO needs triage")
-    public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         return records.get(Integer.valueOf(token));
     }
 

diff --git a/src/main/java/hudson/maven/reporters/MavenArtifact.java b/src/main/java/hudson/maven/reporters/MavenArtifact.java
@@ -40,6 +40,8 @@
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -305,8 +307,12 @@ public synchronized void close() throws IOException {
      * TODO: figure out how to make this URL more discoverable to the remote API.
      */
     public HttpResponse doFile(final @AncestorInPath MavenArtifactRecord parent) throws IOException {
-        return ( req, rsp, node ) ->
-                IOUtils.copy(parent.parent.getArtifactManager().root().child(artifactPath()).open(), rsp.getCompressedOutputStream(req));
+        return new HttpResponse() {
+            @Override
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException {
+                IOUtils.copy(parent.parent.getArtifactManager().root().child(artifactPath()).open(), rsp.getOutputStream());
+            }
+        };
     }
 
     private String artifactPath() {

diff --git a/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java b/src/test/java/hudson/maven/MavenArgumentInterceptorTest.java
@@ -43,7 +43,7 @@
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.ToolInstallations;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Dominik Bartholdi (imod)
@@ -159,7 +159,7 @@ public boolean isApplicable(AbstractProject<?, ?> project) {
 			}
 
 			@Override
-			public BuildWrapper newInstance(StaplerRequest req, JSONObject formData) {
+			public BuildWrapper newInstance(StaplerRequest2 req, JSONObject formData) {
 				throw new UnsupportedOperationException();
 			}
 

diff --git a/src/test/java/hudson/maven/MavenBuildTest.java b/src/test/java/hudson/maven/MavenBuildTest.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 
 import org.apache.maven.project.MavenProject;

diff --git a/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java b/src/test/java/hudson/maven/MavenEnvironmentContributingActionTest.java
@@ -28,7 +28,7 @@
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.ToolInstallations;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * This test case verifies that a maven build also takes EnvironmentContributingAction into account to resolve variables on the command line
@@ -130,7 +130,7 @@ public boolean isApplicable(AbstractProject<?, ?> project) {
             }
 
             @Override
-            public BuildWrapper newInstance(StaplerRequest req, JSONObject formData) {
+            public BuildWrapper newInstance(StaplerRequest2 req, JSONObject formData) {
                 throw new UnsupportedOperationException();
             }