diff --git a/pom.xml b/pom.xml index f56ce82fb3..ed1a43d440 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ import - org.eclipse.jetty.ee8 - jetty-ee8-bom + org.eclipse.jetty.ee9 + jetty-ee9-bom ${jetty.version} pom import @@ -170,13 +170,24 @@ plexus-utils 3.5.1 + + org.eclipse.jetty + jetty-maven + ${jetty.version} + + + org.codehaus.plexus + plexus-utils + + + org.eclipse.jetty jetty-server - org.eclipse.jetty.ee8 - jetty-ee8-maven-plugin + org.eclipse.jetty.ee9 + jetty-ee9-maven-plugin ${jetty.version} @@ -186,17 +197,17 @@ - org.eclipse.jetty.ee8 - jetty-ee8-servlet + org.eclipse.jetty.ee9 + jetty-ee9-servlet - org.eclipse.jetty.ee8 - jetty-ee8-webapp + org.eclipse.jetty.ee9 + jetty-ee9-webapp - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + org.jenkins-ci @@ -319,7 +330,7 @@ hpi java-annotations - org.eclipse.jetty.ee8:jetty-ee8-maven-plugin + org.eclipse.jetty.ee9:jetty-ee9-maven-plugin diff --git a/src/it/parent-4x/pom.xml b/src/it/parent-4x/pom.xml index eb1f5361fa..e413144a33 100644 --- a/src/it/parent-4x/pom.xml +++ b/src/it/parent-4x/pom.xml @@ -12,11 +12,23 @@ 1.0-SNAPSHOT hpi - 2.361.4 + 2.475 + + 2254.vcff7a_d4969e5 @project.version@ false false + + + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + + + org.jenkins-ci.plugins diff --git a/src/it/parent-4x/src/main/java/test/JustTesting.java b/src/it/parent-4x/src/main/java/test/JustTesting.java index 653bedd60a..a433b7d60c 100644 --- a/src/it/parent-4x/src/main/java/test/JustTesting.java +++ b/src/it/parent-4x/src/main/java/test/JustTesting.java @@ -5,6 +5,7 @@ import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; import jenkins.util.Timer; +import org.kohsuke.stapler.StaplerRequest2; public class JustTesting { @@ -18,7 +19,7 @@ public static void shutDown() { Timer.get() .schedule( () -> { - Jenkins.getInstance().doSafeExit(null); + Jenkins.getInstance().doSafeExit((StaplerRequest2) null); return null; }, 15, diff --git a/src/it/parent-4x/verify.groovy b/src/it/parent-4x/verify.groovy index f045d0b2c7..7201b83d06 100644 --- a/src/it/parent-4x/verify.groovy +++ b/src/it/parent-4x/verify.groovy @@ -25,7 +25,7 @@ checkArtifact(installed, 'parent-4x-1.0-SNAPSHOT.hpi', ['WEB-INF/lib/parent-4x.jar'], // TODO still some problems with unwanted transitive JAR dependencies creeping in, e.g. WEB-INF/lib/jboss-marshalling-1.4.9.Final.jar in workflow-multibranch.hpi, or all kinds of junk in parameterized-trigger.hpi ['test/SampleRootAction.class', 'WEB-INF/lib/symbol-annotation-1.5.jar'], - ['Short-Name': 'parent-4x', 'Group-Id': 'org.jenkins-ci.tools.hpi.its', 'Jenkins-Version': '2.361.4' /* Plugin-Version unpredictable for a snapshot */, 'Plugin-Dependencies': 'structs:324.va_f5d6774f3a_d']) + ['Short-Name': 'parent-4x', 'Group-Id': 'org.jenkins-ci.tools.hpi.its', 'Jenkins-Version': '2.475' /* Plugin-Version unpredictable for a snapshot */, 'Plugin-Dependencies': 'structs:324.va_f5d6774f3a_d']) checkArtifact(installed, 'parent-4x-1.0-SNAPSHOT.jar', ['META-INF/annotations/hudson.Extension', 'test/SampleRootAction.class', 'index.jelly'], diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java index dc7bd10819..c644e3596b 100644 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java @@ -80,11 +80,11 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.graph.DependencyFilter; import org.eclipse.aether.util.filter.ScopeDependencyFilter; -import org.eclipse.jetty.ee8.maven.plugin.JettyRunWarMojo; -import org.eclipse.jetty.ee8.maven.plugin.MavenWebAppContext; -import org.eclipse.jetty.ee8.webapp.WebAppClassLoader; -import org.eclipse.jetty.ee8.webapp.WebAppContext; -import org.eclipse.jetty.ee8.websocket.server.config.JettyWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee9.maven.plugin.JettyRunWarMojo; +import org.eclipse.jetty.ee9.maven.plugin.MavenWebAppContext; +import org.eclipse.jetty.ee9.webapp.WebAppClassLoader; +import org.eclipse.jetty.ee9.webapp.WebAppContext; +import org.eclipse.jetty.ee9.websocket.server.config.JettyWebSocketServletContainerInitializer; import org.eclipse.jetty.http.HttpCompliance; import org.eclipse.jetty.http.UriCompliance; import org.eclipse.jetty.maven.MavenServerConnector;