From 771665a452efba6eab1fc8ab0b5d4ac26c24870a Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 27 Jan 2025 10:02:21 -0800 Subject: [PATCH] Migrate from EE 8 to EE 9 --- plugin/pom.xml | 2 +- .../plugins/analysis/core/model/IssuesDetail.java | 6 +++--- .../plugins/analysis/core/model/JobAction.java | 6 +++--- .../plugins/analysis/core/model/JobActionTest.java | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 0558d64d4e..971c619fe0 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -5,7 +5,7 @@ org.jvnet.hudson.plugins analysis-pom - 9.0.0 + 10.2.0 diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java index 6a80a38220..101f39ae83 100644 --- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java +++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java @@ -21,8 +21,8 @@ import edu.hm.hafner.echarts.ChartModelConfiguration; import edu.hm.hafner.echarts.JacksonFacade; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.StaplerRequest2; +import org.kohsuke.stapler.StaplerResponse2; import org.kohsuke.stapler.bind.JavaScriptMethod; import hudson.model.Api; import hudson.model.ModelObject; @@ -576,7 +576,7 @@ public String getDisplayName() { * @return the new subpage */ @SuppressWarnings("unused") // Called by jelly view - public Object getDynamic(final String link, final StaplerRequest request, final StaplerResponse response) { + public Object getDynamic(final String link, final StaplerRequest2 request, final StaplerResponse2 response) { try { return new DetailFactory().createTrendDetails(link, owner, result, report, newIssues, outstandingIssues, fixedIssues, diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java index 22d1d16b5c..099c2db8de 100644 --- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java +++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java @@ -8,8 +8,8 @@ import edu.hm.hafner.echarts.JacksonFacade; import edu.umd.cs.findbugs.annotations.CheckForNull; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.StaplerRequest2; +import org.kohsuke.stapler.StaplerResponse2; import org.kohsuke.stapler.bind.JavaScriptMethod; import hudson.model.Action; import hudson.model.Job; @@ -151,7 +151,7 @@ public String getUrlName() { * in case of an error */ @SuppressWarnings("unused") // Called by jelly view - public void doIndex(final StaplerRequest request, final StaplerResponse response) throws IOException { + public void doIndex(final StaplerRequest2 request, final StaplerResponse2 response) throws IOException { Optional action = getLatestAction(); if (action.isPresent()) { response.sendRedirect2(String.format("../%d/%s", action.get().getOwner().getNumber(), diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/JobActionTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/JobActionTest.java index aa8a2a2a7e..e4ec07b012 100644 --- a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/JobActionTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/JobActionTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.StaplerRequest2; +import org.kohsuke.stapler.StaplerResponse2; import hudson.model.Job; import hudson.model.Run; @@ -69,8 +69,8 @@ void shouldShowIconIfThereIsABuildResultAvailable() throws IOException { assertThat(action.isTrendEmpty()).isFalse(); assertThat(action.isTrendVisible()).isTrue(); - StaplerResponse response = mock(StaplerResponse.class); - action.doIndex(mock(StaplerRequest.class), response); + StaplerResponse2 response = mock(StaplerResponse2.class); + action.doIndex(mock(StaplerRequest2.class), response); verify(response).sendRedirect2("../0/" + ANALYSIS_ID); @@ -84,8 +84,8 @@ void shouldRedirect() throws IOException { Job job = mock(Job.class); JobAction action = new JobAction(job, labelProvider, 1); - StaplerRequest request = mock(StaplerRequest.class); - action.doIndex(request, mock(StaplerResponse.class)); + StaplerRequest2 request = mock(StaplerRequest2.class); + action.doIndex(request, mock(StaplerResponse2.class)); verifyNoInteractions(request); }