From a96ff528fa3433ab798cb9dc3c3fbfe1fb9eb146 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 22 Jan 2025 07:30:26 -0800 Subject: [PATCH] Migrate from EE 8 to EE 9 --- pom.xml | 6 ++++-- src/test/java/org/glassfish/jersey/JerseyResource.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 4062213..b2b1128 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.86 + 5.5 @@ -35,7 +35,9 @@ 2.45 999999-SNAPSHOT - 2.401.3 + + 2.479 + ${jenkins.baseline}.1 jenkinsci/${project.artifactId}-plugin false diff --git a/src/test/java/org/glassfish/jersey/JerseyResource.java b/src/test/java/org/glassfish/jersey/JerseyResource.java index cfcd665..5204d7a 100644 --- a/src/test/java/org/glassfish/jersey/JerseyResource.java +++ b/src/test/java/org/glassfish/jersey/JerseyResource.java @@ -1,13 +1,13 @@ package org.glassfish.jersey; import hudson.model.UnprotectedRootAction; +import jakarta.servlet.ServletException; import java.io.IOException; import java.net.URL; -import javax.servlet.ServletException; 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; public class JerseyResource implements UnprotectedRootAction { @@ -38,7 +38,7 @@ public HttpResponse doEmployee(@QueryParameter String q) { } return new HttpResponse() { @Override - public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) + public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException { rsp.setContentType(contentType + ";charset=UTF-8"); rsp.serveFile(req, url, 0);