Skip to content

Commit 0a52c1e

Browse files
committed
Upgrade to Jetty 12.1.2
Closes gh-1717
1 parent 14a412e commit 0a52c1e

9 files changed

+15
-15
lines changed

spring-ws-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
testImplementation("org.aspectj:aspectjweaver")
6464
testImplementation("org.easymock:easymock")
6565
testImplementation("org.eclipse.jetty:jetty-server")
66-
testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet")
66+
testImplementation("org.eclipse.jetty.ee11:jetty-ee11-servlet")
6767
testImplementation("org.junit.jupiter:junit-jupiter")
6868
testImplementation("org.mockito:mockito-core")
6969
testImplementation("org.slf4j:slf4j-api")

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import jakarta.xml.soap.SOAPMessage;
4444
import org.apache.logging.log4j.LogManager;
4545
import org.apache.logging.log4j.Logger;
46-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
47-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
46+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
47+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
4848
import org.eclipse.jetty.server.Connector;
4949
import org.eclipse.jetty.server.Server;
5050
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import jakarta.xml.soap.SOAPConstants;
4444
import jakarta.xml.soap.SOAPException;
4545
import jakarta.xml.soap.SOAPMessage;
46-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
47-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
46+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
47+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
4848
import org.eclipse.jetty.server.Connector;
4949
import org.eclipse.jetty.server.Server;
5050
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import jakarta.servlet.http.HttpServlet;
3131
import jakarta.servlet.http.HttpServletRequest;
3232
import jakarta.servlet.http.HttpServletResponse;
33-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
34-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
33+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
34+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
3535
import org.eclipse.jetty.server.Connector;
3636
import org.eclipse.jetty.server.Server;
3737
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import jakarta.xml.soap.SOAPConstants;
3737
import jakarta.xml.soap.SOAPException;
3838
import jakarta.xml.soap.SOAPMessage;
39-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
40-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
39+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
40+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
4141
import org.eclipse.jetty.server.Connector;
4242
import org.eclipse.jetty.server.Server;
4343
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
3030
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
3131
import org.apache.hc.core5.http.HttpHost;
32-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
32+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
3333
import org.eclipse.jetty.server.Connector;
3434
import org.eclipse.jetty.server.Server;
3535
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.http.conn.routing.HttpRoute;
3131
import org.apache.http.impl.conn.PoolingClientConnectionManager;
3232
import org.assertj.core.api.Condition;
33-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
33+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
3434
import org.eclipse.jetty.server.Connector;
3535
import org.eclipse.jetty.server.Server;
3636
import org.eclipse.jetty.server.ServerConnector;

spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import jakarta.xml.soap.SOAPElement;
2727
import jakarta.xml.soap.SOAPException;
2828
import jakarta.xml.soap.SOAPMessage;
29-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
30-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
29+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
30+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
3131
import org.eclipse.jetty.server.Connector;
3232
import org.eclipse.jetty.server.Server;
3333
import org.eclipse.jetty.server.ServerConnector;

spring-ws-platform/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ javaPlatform {
2525
dependencies {
2626
api(platform("org.apache.logging.log4j:log4j-bom:2.25.2"))
2727
api(platform("org.apache.activemq:activemq-bom:6.1.7"))
28-
api(platform("org.eclipse.jetty:jetty-bom:12.0.23"))
29-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.23"))
28+
api(platform("org.eclipse.jetty:jetty-bom:12.1.2"))
29+
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2"))
3030
api(platform("org.junit:junit-bom:6.0.0"))
3131
api(platform("org.slf4j:slf4j-bom:2.0.17"))
3232
api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))

0 commit comments

Comments
 (0)