Skip to content

Commit

Permalink
[JENKINS-73122] Upgrade Stapler from Jetty 10.x to 12.x (EE 8)
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Jul 15, 2024
1 parent 7fc9afb commit 261c8da
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ updates:
# it would be good to update it at some point, but requires significant testing
- dependency-name: "org.codehaus.groovy:groovy-all"
versions: [">=2.5.0"]
# Must remain within Jetty 10.x until the Jakarta migration is complete; ignore Jetty 11.x updates
- dependency-name: "org.eclipse.jetty:*"
versions: [">=11.0.0"]
# Provided by the Web container, so aligned with Jetty.
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
# Contains incompatible API changes and needs compatibility work.
- dependency-name: "jakarta.servlet.jsp:jakarta.servlet.jsp-api"
versions: [">=3.0.0"]
10 changes: 5 additions & 5 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
import java.nio.charset.Charset;
import javax.servlet.ServletContext;
import junit.framework.TestCase;
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
import org.eclipse.jetty.ee8.servlet.ServletHolder;
import org.eclipse.jetty.ee8.webapp.WebAppContext;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
import org.htmlunit.WebClient;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.WebApp;
Expand Down
10 changes: 5 additions & 5 deletions jelly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
9 changes: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<scmTag>HEAD</scmTag>
<jetty.version>10.0.22</jetty.version>
<jetty.version>12.0.11</jetty.version>
<gitHubRepo>jenkinsci/stapler</gitHubRepo>
<spotless.check.skip>false</spotless.check.skip>
</properties>
Expand All @@ -56,6 +56,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-bom</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down

0 comments on commit 261c8da

Please sign in to comment.