From e3d6bc7dbd39ab7855c102eeeca7da1fef265a8c Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sun, 26 Jan 2025 06:53:13 -0800 Subject: [PATCH] Migrate from EE 8 to EE 9 (#320) --- pom.xml | 8 ++++---- src/main/java/htmlpublisher/HtmlPublisherTarget.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f5ff2b8..1089155 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.86 + 5.5 @@ -12,8 +12,8 @@ 1.38 -SNAPSHOT jenkinsci/htmlpublisher-plugin - 2.452 - ${jenkins.baseline}.3 + 2.479 + ${jenkins.baseline}.1 @@ -122,7 +122,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 3435.v238d66a_043fb_ + 3850.vb_c5319efa_e29 import pom diff --git a/src/main/java/htmlpublisher/HtmlPublisherTarget.java b/src/main/java/htmlpublisher/HtmlPublisherTarget.java index 10cc53f..0e23f90 100644 --- a/src/main/java/htmlpublisher/HtmlPublisherTarget.java +++ b/src/main/java/htmlpublisher/HtmlPublisherTarget.java @@ -23,11 +23,11 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.StaplerRequest2; +import org.kohsuke.stapler.StaplerResponse2; import org.owasp.encoder.Encode; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -284,7 +284,7 @@ public boolean shouldLinkToLastBuild() { /** * Serves HTML reports. */ - public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { DirectoryBrowserSupport dbs = new DirectoryBrowserSupport(this, new FilePath(this.dir()), this.getTitle(), "symbol-document-text", false); if (req.getRestOfPath().isEmpty()) { throw HttpResponses.forwardToView(this, "index.jelly");