This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new c26ac6c79 Upgrade the Jetty version used by the MTOM tests
c26ac6c79 is described below
commit c26ac6c79da6fc16b2665f35d639b57e613ce739
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Mar 23 11:31:33 2025 +0000
Upgrade the Jetty version used by the MTOM tests
---
jakarta-bom/pom.xml | 11 +++++++++++
javax-bom/pom.xml | 11 +++++++++++
pom.xml | 11 -----------
systests/jaxws-tests/pom.xml | 4 ++--
systests/jaxws-tests/src/test/java/MTOMTest.java | 15 ++++++++-------
5 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/jakarta-bom/pom.xml b/jakarta-bom/pom.xml
index 4a18b597f..e67e06af1 100644
--- a/jakarta-bom/pom.xml
+++ b/jakarta-bom/pom.xml
@@ -33,6 +33,7 @@
<properties>
<jaxbri.version>4.0.4</jaxbri.version>
+ <jetty.version>12.0.8</jetty.version>
</properties>
<dependencyManagement>
@@ -67,6 +68,16 @@
<artifactId>jaxb-osgi</artifactId>
<version>${jaxbri.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/javax-bom/pom.xml b/javax-bom/pom.xml
index 6560e1be4..8aac7904d 100644
--- a/javax-bom/pom.xml
+++ b/javax-bom/pom.xml
@@ -33,6 +33,7 @@
<properties>
<jaxbri.version>2.3.9</jaxbri.version>
+ <jetty.version>10.0.25</jetty.version>
</properties>
<dependencyManagement>
@@ -67,6 +68,16 @@
<artifactId>jaxb-osgi</artifactId>
<version>${jaxbri.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/pom.xml b/pom.xml
index ad88f60bf..60f8fae4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,7 +286,6 @@
<springws.version>3.1.3</springws.version>
<exam.version>4.14.0</exam.version>
<slf4j.version>1.7.36</slf4j.version>
- <jetty.version>10.0.25</jetty.version>
<log4j.version>2.24.3</log4j.version>
<groovy.version>4.0.26</groovy.version>
<auto-service.version>1.1.1</auto-service.version>
@@ -520,16 +519,6 @@
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
diff --git a/systests/jaxws-tests/pom.xml b/systests/jaxws-tests/pom.xml
index 8bdcb76fc..2cbc5d145 100644
--- a/systests/jaxws-tests/pom.xml
+++ b/systests/jaxws-tests/pom.xml
@@ -73,8 +73,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/systests/jaxws-tests/src/test/java/MTOMTest.java
b/systests/jaxws-tests/src/test/java/MTOMTest.java
index 4d5f08c6a..e4867b4e8 100644
--- a/systests/jaxws-tests/src/test/java/MTOMTest.java
+++ b/systests/jaxws-tests/src/test/java/MTOMTest.java
@@ -20,10 +20,10 @@ import static com.google.common.truth.Truth.assertThat;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.stream.XMLStreamException;
import org.apache.axiom.mime.MultipartBody;
@@ -32,11 +32,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.server.Connector;
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.example.ImageService;
import org.example.ImageServicePort;
import org.junit.Test;
@@ -56,7 +56,7 @@ public class MTOMTest {
ServerConnector connector = new ServerConnector(server);
connector.setPort(0);
server.setConnectors(new Connector[] { connector });
- ServletContextHandler handler = new ServletContextHandler(server, "/");
+ ServletContextHandler handler = new ServletContextHandler("/");
HttpServlet servlet = new HttpServlet() {
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response)
@@ -84,6 +84,7 @@ public class MTOMTest {
servletHolder.setName("test");
servletHolder.setInitOrder(1);
handler.addServlet(servletHolder, "/");
+ server.setHandler(handler);
server.start();
try {
ImageServicePort imageService = new
ImageService().getImageServicePort(new MTOMFeature());
