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 cfa38a4c7 Update Spring-WS
cfa38a4c7 is described below
commit cfa38a4c7e60aa0fc29b938a0912560df7ef15f5
Author: Andreas Veithen <[email protected]>
AuthorDate: Sat Sep 27 14:16:47 2025 +0000
Update Spring-WS
---
.github/dependabot.yml | 8 --------
axiom-jakarta-jaxb/pom.xml | 1 -
javax-bom/pom.xml | 11 -----------
pom.xml | 9 +++++++--
systests/spring-ws-tests/pom.xml | 2 +-
.../java/org/apache/axiom/systest/springws/SpringWSTest.java | 5 +++++
testing/spring-ws-testsuite/pom.xml | 7 +++----
.../apache/axiom/ts/springws/scenario/ScenarioTestCase.java | 7 ++++---
.../org/apache/axiom/ts/springws/scenario/broker/Order.java | 6 +++---
.../apache/axiom/ts/springws/scenario/broker/OrderStatus.java | 6 +++---
.../axiom/ts/springws/scenario/broker/RetrieveNextOrder.java | 4 ++--
.../axiom/ts/springws/scenario/jaxb2/GetQuoteRequest.java | 4 ++--
.../axiom/ts/springws/scenario/jaxb2/GetQuoteResponse.java | 4 ++--
13 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 29fda181e..a7035346c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -28,18 +28,10 @@ updates:
- dependency-name: "com.sun.xml.bind:jaxb-osgi"
- dependency-name: "org.eclipse.jetty:*"
- dependency-name: "org.eclipse.jetty.ee10:*"
- # Same here; need two different versions.
- - dependency-name: "com.github.veithen.maven:xjc-maven-plugin"
# There is a bug in Saxon 10 related to how xmlns="" declarations are
processed.
- dependency-name: "net.sf.saxon:Saxon-HE"
versions:
- ">= 10.0"
- - dependency-name: "org.springframework:*"
- versions:
- - ">= 6.0.0"
- - dependency-name: "org.springframework.ws:*"
- versions:
- - ">= 3.1.4"
- dependency-name: "org.apache.maven.plugins:maven-source-plugin"
versions:
# MSOURCES-137
diff --git a/axiom-jakarta-jaxb/pom.xml b/axiom-jakarta-jaxb/pom.xml
index 9cf1e8e1c..d1d284832 100644
--- a/axiom-jakarta-jaxb/pom.xml
+++ b/axiom-jakarta-jaxb/pom.xml
@@ -104,7 +104,6 @@
<plugin>
<groupId>com.github.veithen.maven</groupId>
<artifactId>xjc-maven-plugin</artifactId>
- <version>0.2.0</version>
<executions>
<execution>
<goals>
diff --git a/javax-bom/pom.xml b/javax-bom/pom.xml
index 8aac7904d..6560e1be4 100644
--- a/javax-bom/pom.xml
+++ b/javax-bom/pom.xml
@@ -33,7 +33,6 @@
<properties>
<jaxbri.version>2.3.9</jaxbri.version>
- <jetty.version>10.0.25</jetty.version>
</properties>
<dependencyManagement>
@@ -68,16 +67,6 @@
<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 e6ef14315..9f18335c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,8 +282,8 @@
<failIfNoTests>false</failIfNoTests>
<shade.plugin.version>3.6.1</shade.plugin.version>
- <spring.version>5.3.39</spring.version>
- <springws.version>3.1.3</springws.version>
+ <spring.version>6.2.11</spring.version>
+ <springws.version>4.1.1</springws.version>
<exam.version>4.14.0</exam.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.25.2</log4j.version>
@@ -885,6 +885,11 @@
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
+ <version>0.2.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/systests/spring-ws-tests/pom.xml b/systests/spring-ws-tests/pom.xml
index 4dab1eb08..c3f0a28f9 100644
--- a/systests/spring-ws-tests/pom.xml
+++ b/systests/spring-ws-tests/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-compat</artifactId>
+ <artifactId>axiom-legacy-attachments</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
index adb8425d1..c6d409325 100644
---
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
+++
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
@@ -23,12 +23,17 @@ import junit.framework.TestSuite;
import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
import org.apache.axiom.ts.springws.SpringWSTestSuiteBuilder;
+import
org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMessageFromInputStreamVersionMismatch;
public class SpringWSTest extends TestCase {
public static TestSuite suite() {
SpringWSTestSuiteBuilder builder = new SpringWSTestSuiteBuilder(
new AxiomMessageFactoryConfigurator(),
MessageFactoryConfigurator.SAAJ);
+
+ // Since Spring-WS 3.1.4, the behavior differs between the Axiom and
SAAJ implementations.
+
builder.exclude(TestCreateWebServiceMessageFromInputStreamVersionMismatch.class);
+
return builder.build();
}
}
diff --git a/testing/spring-ws-testsuite/pom.xml
b/testing/spring-ws-testsuite/pom.xml
index 62c166c01..213d450dc 100644
--- a/testing/spring-ws-testsuite/pom.xml
+++ b/testing/spring-ws-testsuite/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>javax-bom</artifactId>
+ <artifactId>jakarta-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
@@ -70,8 +70,8 @@
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -129,7 +129,6 @@
<plugin>
<groupId>com.github.veithen.maven</groupId>
<artifactId>xjc-maven-plugin</artifactId>
- <version>0.1.1</version>
<executions>
<execution>
<goals>
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
index addbdab81..b9fda54f3 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
@@ -20,11 +20,11 @@ package org.apache.axiom.ts.springws.scenario;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.springws.SpringWSTestCase;
+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.eclipse.jetty.util.thread.QueuedThreadPool;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
@@ -57,7 +57,7 @@ public abstract class ScenarioTestCase extends
SpringWSTestCase {
ServerConnector connector = new ServerConnector(server);
connector.setPort(0);
server.setConnectors(new Connector[] {connector});
- ServletContextHandler handler = new ServletContextHandler(server, "/");
+ ServletContextHandler handler = new ServletContextHandler("/");
MessageDispatcherServlet servlet = new MessageDispatcherServlet();
servlet.setContextClass(GenericWebApplicationContext.class);
servlet.setContextInitializers(
@@ -75,6 +75,7 @@ public abstract class ScenarioTestCase extends
SpringWSTestCase {
servletHolder.setName("spring-ws");
servletHolder.setInitOrder(1);
handler.addServlet(servletHolder, "/*");
+ server.setHandler(handler);
server.start();
context = new GenericXmlApplicationContext();
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/Order.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/Order.java
index 643904eb6..3713ec9d3 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/Order.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/Order.java
@@ -18,9 +18,9 @@
*/
package org.apache.axiom.ts.springws.scenario.broker;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(namespace = "urn:broker", name = "Order")
@XmlType(propOrder = {"customer", "items"})
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/OrderStatus.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/OrderStatus.java
index b3eb386fb..437264d8b 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/OrderStatus.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/OrderStatus.java
@@ -20,9 +20,9 @@ package org.apache.axiom.ts.springws.scenario.broker;
import java.util.Date;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(namespace = "urn:broker", name = "OrderStatus")
@XmlType
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/RetrieveNextOrder.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/RetrieveNextOrder.java
index b0a97dc3f..299ca9f8f 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/RetrieveNextOrder.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/RetrieveNextOrder.java
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.broker;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(namespace = "urn:broker", name = "RetrieveNextOrder")
@XmlType
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteRequest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteRequest.java
index 8f501ca04..5ab4474fd 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteRequest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteRequest.java
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.jaxb2;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(namespace = "urn:stockquote", name = "GetQuote")
@XmlType
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteResponse.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteResponse.java
index e1b912b51..cb2f3878b 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteResponse.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/GetQuoteResponse.java
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.jaxb2;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(namespace = "urn:stockquote", name = "GetQuoteResponse")
@XmlType
