This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 65df8d8f1 SM-5703: fix javax.xml and related imports in spring 6
bundles
65df8d8f1 is described below
commit 65df8d8f1a062056ad0bfccb343f9e53d8232fcf
Author: JB Onofré <[email protected]>
AuthorDate: Tue May 7 18:22:37 2024 +0200
SM-5703: fix javax.xml and related imports in spring 6 bundles
---
pom.xml | 19 +++++++++++++++++++
spring-beans-6.0.18/pom.xml | 2 +-
spring-beans-6.1.5/pom.xml | 2 +-
spring-context-6.0.18/pom.xml | 2 +-
spring-context-6.1.5/pom.xml | 2 +-
spring-core-6.0.18/pom.xml | 11 +++--------
spring-core-6.1.5/pom.xml | 11 +++--------
spring-jdbc-6.0.18/pom.xml | 3 +--
spring-jdbc-6.1.5/pom.xml | 3 +--
spring-jms-6.0.18/pom.xml | 3 +--
spring-jms-6.1.5/pom.xml | 3 +--
spring-messaging-6.0.18/pom.xml | 3 +--
spring-messaging-6.1.5/pom.xml | 3 +--
spring-orm-6.0.18/pom.xml | 2 +-
spring-orm-6.1.5/pom.xml | 2 +-
spring-oxm-6.0.18/pom.xml | 16 ++++++----------
spring-oxm-6.1.5/pom.xml | 16 ++++++----------
spring-test-6.0.18/pom.xml | 10 ++++------
spring-test-6.1.5/pom.xml | 10 ++++------
spring-web-6.0.18/pom.xml | 1 -
spring-web-6.1.5/pom.xml | 1 -
spring-webmvc-6.0.18/pom.xml | 1 -
spring-webmvc-6.1.5/pom.xml | 1 -
23 files changed, 57 insertions(+), 70 deletions(-)
diff --git a/pom.xml b/pom.xml
index d96319d78..387e45f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,25 @@
<module>spring-webflux-6.1.5</module>
<module>spring-webmvc-6.1.5</module>
<module>spring-websocket-6.1.5</module>
+ <module>spring-aop-6.0.18</module>
+ <module>spring-aspects-6.0.18</module>
+ <module>spring-beans-6.0.18</module>
+ <module>spring-context-6.0.18</module>
+ <module>spring-context-support-6.0.18</module>
+ <module>spring-core-6.0.18</module>
+ <module>spring-expression-6.0.18</module>
+ <module>spring-instrument-6.0.18</module>
+ <module>spring-jdbc-6.0.18</module>
+ <module>spring-jms-6.0.18</module>
+ <module>spring-messaging-6.0.18</module>
+ <module>spring-orm-6.0.18</module>
+ <module>spring-oxm-6.0.18</module>
+ <module>spring-test-6.0.18</module>
+ <module>spring-tx-6.0.18</module>
+ <module>spring-web-6.0.18</module>
+ <module>spring-webflux-6.0.18</module>
+ <module>spring-webmvc-6.0.18</module>
+ <module>spring-websocket-6.0.18</module>
</modules>
</project>
diff --git a/spring-beans-6.0.18/pom.xml b/spring-beans-6.0.18/pom.xml
index 5bb6405bd..e988a5067 100644
--- a/spring-beans-6.0.18/pom.xml
+++ b/spring-beans-6.0.18/pom.xml
@@ -52,7 +52,7 @@
<servicemix.osgi.import.pkg>
jakarta.el;version="[1,3)";resolution:=optional,
jakarta.inject;version="[1,2)";resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
groovy.lang;resolution:=optional,
groovy.xml;resolution:=optional,
org.codehaus.groovy.reflection;resolution:=optional,
diff --git a/spring-beans-6.1.5/pom.xml b/spring-beans-6.1.5/pom.xml
index 605d903a9..1f2fd1f17 100644
--- a/spring-beans-6.1.5/pom.xml
+++ b/spring-beans-6.1.5/pom.xml
@@ -52,7 +52,7 @@
<servicemix.osgi.import.pkg>
jakarta.el;version="[1,3)";resolution:=optional,
jakarta.inject;version="[1,2)";resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
groovy.lang;resolution:=optional,
groovy.xml;resolution:=optional,
org.codehaus.groovy.reflection;resolution:=optional,
diff --git a/spring-context-6.0.18/pom.xml b/spring-context-6.0.18/pom.xml
index aa741fe07..de7577b9a 100644
--- a/spring-context-6.0.18/pom.xml
+++ b/spring-context-6.0.18/pom.xml
@@ -80,7 +80,7 @@
jakarta.validation.groups;resolution:=optional,
jakarta.validation.metadata;resolution:=optional,
jakarta.validation.spi;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
jakarta.xml.ws;resolution:=optional,
org.aopalliance.aop;version="[1,2)";resolution:=optional,
org.aopalliance.intercept;version="[1,2)";resolution:=optional,
diff --git a/spring-context-6.1.5/pom.xml b/spring-context-6.1.5/pom.xml
index 07e1499f3..384025fef 100644
--- a/spring-context-6.1.5/pom.xml
+++ b/spring-context-6.1.5/pom.xml
@@ -80,7 +80,7 @@
jakarta.validation.groups;resolution:=optional,
jakarta.validation.metadata;resolution:=optional,
jakarta.validation.spi;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
jakarta.xml.ws;resolution:=optional,
org.aopalliance.aop;version="[1,2)";resolution:=optional,
org.aopalliance.intercept;version="[1,2)";resolution:=optional,
diff --git a/spring-core-6.0.18/pom.xml b/spring-core-6.0.18/pom.xml
index 5c32422b3..1cdb3d50f 100644
--- a/spring-core-6.0.18/pom.xml
+++ b/spring-core-6.0.18/pom.xml
@@ -52,15 +52,10 @@
<servicemix.osgi.import.pkg>
io.netty.buffer;resolution:=optional,
javax.net;resolution:=optional,
- jakarta.xml;resolution:=optional,
jakarta.xml.bind;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
- jakarta.xml.stream;resolution:=optional,
- jakarta.xml.stream.events;resolution:=optional,
- jakarta.xml.stream.util;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.sax;resolution:=optional,
- jakarta.xml.transform.stax;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
+ javax.xml.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
joptsimple;version="[4,5)";resolution:=optional,
net.sf.cglib.beans;version="[3,4)";resolution:=optional,
sun.misc;resolution:=optional,
diff --git a/spring-core-6.1.5/pom.xml b/spring-core-6.1.5/pom.xml
index 3c3b1c4dd..3322cabd9 100644
--- a/spring-core-6.1.5/pom.xml
+++ b/spring-core-6.1.5/pom.xml
@@ -52,15 +52,10 @@
<servicemix.osgi.import.pkg>
io.netty.buffer;resolution:=optional,
javax.net;resolution:=optional,
- jakarta.xml;resolution:=optional,
jakarta.xml.bind;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
- jakarta.xml.stream;resolution:=optional,
- jakarta.xml.stream.events;resolution:=optional,
- jakarta.xml.stream.util;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.sax;resolution:=optional,
- jakarta.xml.transform.stax;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
+ javax.xml.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
joptsimple;version="[4,5)";resolution:=optional,
net.sf.cglib.beans;version="[3,4)";resolution:=optional,
sun.misc;resolution:=optional,
diff --git a/spring-jdbc-6.0.18/pom.xml b/spring-jdbc-6.0.18/pom.xml
index d70fe6c0d..a440e5fa8 100644
--- a/spring-jdbc-6.0.18/pom.xml
+++ b/spring-jdbc-6.0.18/pom.xml
@@ -58,8 +58,7 @@
javax.sql,
javax.sql.rowset,
javax.transaction;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.dom;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
oracle.jdbc;resolution:=optional,
oracle.sql;resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
diff --git a/spring-jdbc-6.1.5/pom.xml b/spring-jdbc-6.1.5/pom.xml
index 758e36b11..5b4ca468c 100644
--- a/spring-jdbc-6.1.5/pom.xml
+++ b/spring-jdbc-6.1.5/pom.xml
@@ -58,8 +58,7 @@
javax.sql,
javax.sql.rowset,
javax.transaction;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.dom;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
oracle.jdbc;resolution:=optional,
oracle.sql;resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
diff --git a/spring-jms-6.0.18/pom.xml b/spring-jms-6.0.18/pom.xml
index 827a9dc0b..ce8e83bf4 100644
--- a/spring-jms-6.0.18/pom.xml
+++ b/spring-jms-6.0.18/pom.xml
@@ -62,8 +62,7 @@
javax.resource;resolution:=optional,
javax.resource.spi;resolution:=optional,
javax.resource.spi.endpoint;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
org.aopalliance.intercept;version="[1,2)";resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.codehaus.jackson.map;version="[2,3)";resolution:=optional,
diff --git a/spring-jms-6.1.5/pom.xml b/spring-jms-6.1.5/pom.xml
index da865c01e..6c8718e0e 100644
--- a/spring-jms-6.1.5/pom.xml
+++ b/spring-jms-6.1.5/pom.xml
@@ -62,8 +62,7 @@
javax.resource;resolution:=optional,
javax.resource.spi;resolution:=optional,
javax.resource.spi.endpoint;resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
org.aopalliance.intercept;version="[1,2)";resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.codehaus.jackson.map;version="[2,3)";resolution:=optional,
diff --git a/spring-messaging-6.0.18/pom.xml b/spring-messaging-6.0.18/pom.xml
index 2f99cd061..bed566f1f 100644
--- a/spring-messaging-6.0.18/pom.xml
+++ b/spring-messaging-6.0.18/pom.xml
@@ -56,8 +56,7 @@
io.netty.channel;version="[4,5)";resolution:=optional,
io.netty.channel.nio;version="[4,5)";resolution:=optional,
io.netty.util.concurrent;version="[4,5)";resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.reactivestreams;resolution:=optional,
org.springframework.beans;version="[${pkgVersion},6.1)";resolution:=optional,
diff --git a/spring-messaging-6.1.5/pom.xml b/spring-messaging-6.1.5/pom.xml
index 0b980a1d3..517c5f7ee 100644
--- a/spring-messaging-6.1.5/pom.xml
+++ b/spring-messaging-6.1.5/pom.xml
@@ -56,8 +56,7 @@
io.netty.channel;version="[4,5)";resolution:=optional,
io.netty.channel.nio;version="[4,5)";resolution:=optional,
io.netty.util.concurrent;version="[4,5)";resolution:=optional,
- jakarta.xml.transform;resolution:=optional,
- jakarta.xml.transform.stream;resolution:=optional,
+ javax.xml.transform;resolution:=optional,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.reactivestreams;resolution:=optional,
org.springframework.beans;version="[${pkgVersion},6.2)";resolution:=optional,
diff --git a/spring-orm-6.0.18/pom.xml b/spring-orm-6.0.18/pom.xml
index 2e5e71784..1138aad41 100644
--- a/spring-orm-6.0.18/pom.xml
+++ b/spring-orm-6.0.18/pom.xml
@@ -68,7 +68,7 @@
jakarta.servlet.http;resolution:=optional,
javax.sql;resolution:=optional,
jakarta.transaction;resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
oracle.toplink.essentials.ejb.cmp3;resolution:=optional,
oracle.toplink.essentials.expressions;resolution:=optional,
oracle.toplink.essentials.internal.databaseaccess;resolution:=optional,
diff --git a/spring-orm-6.1.5/pom.xml b/spring-orm-6.1.5/pom.xml
index da0b749df..f4e2892d4 100644
--- a/spring-orm-6.1.5/pom.xml
+++ b/spring-orm-6.1.5/pom.xml
@@ -68,7 +68,7 @@
jakarta.servlet.http;resolution:=optional,
javax.sql;resolution:=optional,
jakarta.transaction;resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
oracle.toplink.essentials.ejb.cmp3;resolution:=optional,
oracle.toplink.essentials.expressions;resolution:=optional,
oracle.toplink.essentials.internal.databaseaccess;resolution:=optional,
diff --git a/spring-oxm-6.0.18/pom.xml b/spring-oxm-6.0.18/pom.xml
index b3d8079f0..c0bad258c 100644
--- a/spring-oxm-6.0.18/pom.xml
+++ b/spring-oxm-6.0.18/pom.xml
@@ -61,20 +61,16 @@
com.thoughtworks.xstream.mapper;version="[1.4,2)";resolution:=optional,
com.thoughtworks.xstream.security;version="[1.4,2)";resolution:=optional,
jakarta.activation;resolution:=optional,
- jakarta.xml;resolution:=optional,
jakarta.xml.bind;resolution:=optional,
jakarta.xml.bind.annotation;resolution:=optional,
jakarta.xml.bind.annotation.adapters;resolution:=optional,
jakarta.xml.bind.attachment;resolution:=optional,
- jakarta.xml.datatype,
- jakarta.xml.namespace,
- jakarta.xml.parsers,
- jakarta.xml.stream,
- jakarta.xml.transform,
- jakarta.xml.transform.dom,
- jakarta.xml.transform.sax,
- jakarta.xml.transform.stream,
- jakarta.xml.validation,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.validation,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.apache.xmlbeans;version="[2.6,3)";resolution:=optional,
org.exolab.castor.mapping;version="[1.3,2)";resolution:=optional,
diff --git a/spring-oxm-6.1.5/pom.xml b/spring-oxm-6.1.5/pom.xml
index fc3d5d766..8899d56ad 100644
--- a/spring-oxm-6.1.5/pom.xml
+++ b/spring-oxm-6.1.5/pom.xml
@@ -61,20 +61,16 @@
com.thoughtworks.xstream.mapper;version="[1.4,2)";resolution:=optional,
com.thoughtworks.xstream.security;version="[1.4,2)";resolution:=optional,
jakarta.activation;resolution:=optional,
- jakarta.xml;resolution:=optional,
jakarta.xml.bind;resolution:=optional,
jakarta.xml.bind.annotation;resolution:=optional,
jakarta.xml.bind.annotation.adapters;resolution:=optional,
jakarta.xml.bind.attachment;resolution:=optional,
- jakarta.xml.datatype,
- jakarta.xml.namespace,
- jakarta.xml.parsers,
- jakarta.xml.stream,
- jakarta.xml.transform,
- jakarta.xml.transform.dom,
- jakarta.xml.transform.sax,
- jakarta.xml.transform.stream,
- jakarta.xml.validation,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.validation,
org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
org.apache.xmlbeans;version="[2.6,3)";resolution:=optional,
org.exolab.castor.mapping;version="[1.3,2)";resolution:=optional,
diff --git a/spring-test-6.0.18/pom.xml b/spring-test-6.0.18/pom.xml
index edc150d0c..ffdcd82ea 100644
--- a/spring-test-6.0.18/pom.xml
+++ b/spring-test-6.0.18/pom.xml
@@ -66,12 +66,10 @@
jakarta.servlet.jsp.el;resolution:=optional,
jakarta.servlet.jsp.tagext;resolution:=optional,
javax.sql;resolution:=optional,
- jakarta.xml;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
- jakarta.xml.transform,
- jakarta.xml.transform.dom,
- jakarta.xml.xpath;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ javax.xml.transform,
+ javax.xml.xpath;resolution:=optional,
jakarta.websocket;resolution:=optional,
jakarta.websocket.server;resolution:=optional,
junit.framework;version="[4,5)";resolution:=optional,
diff --git a/spring-test-6.1.5/pom.xml b/spring-test-6.1.5/pom.xml
index 0e0a07dba..601ce6d12 100644
--- a/spring-test-6.1.5/pom.xml
+++ b/spring-test-6.1.5/pom.xml
@@ -66,12 +66,10 @@
jakarta.servlet.jsp.el;resolution:=optional,
jakarta.servlet.jsp.tagext;resolution:=optional,
javax.sql;resolution:=optional,
- jakarta.xml;resolution:=optional,
- jakarta.xml.namespace;resolution:=optional,
- jakarta.xml.parsers;resolution:=optional,
- jakarta.xml.transform,
- jakarta.xml.transform.dom,
- jakarta.xml.xpath;resolution:=optional,
+ javax.xml.namespace;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ javax.xml.transform,
+ javax.xml.xpath;resolution:=optional,
jakarta.websocket;resolution:=optional,
jakarta.websocket.server;resolution:=optional,
junit.framework;version="[4,5)";resolution:=optional,
diff --git a/spring-web-6.0.18/pom.xml b/spring-web-6.0.18/pom.xml
index c1dd2b848..5dea1b2a1 100644
--- a/spring-web-6.0.18/pom.xml
+++ b/spring-web-6.0.18/pom.xml
@@ -87,7 +87,6 @@
jakarta.servlet.annotation;resolution:=optional,
jakarta.servlet.jsp.*;resolution:=optional,
jakarta.validation;resolution:=optional,
- jakarta.xml.*;resolution:=optional,
okhttp3;resolution:=optional,
org.aopalliance.*;version="[1,2)",
org.apache.commons.fileupload.*;version="[1.3,2)";resolution:=optional,
diff --git a/spring-web-6.1.5/pom.xml b/spring-web-6.1.5/pom.xml
index 1197f455f..8be42eb27 100644
--- a/spring-web-6.1.5/pom.xml
+++ b/spring-web-6.1.5/pom.xml
@@ -87,7 +87,6 @@
jakarta.servlet.annotation;resolution:=optional,
jakarta.servlet.jsp.*;resolution:=optional,
jakarta.validation;resolution:=optional,
- jakarta.xml.*;resolution:=optional,
okhttp3;resolution:=optional,
org.aopalliance.*;version="[1,2)",
org.apache.commons.fileupload.*;version="[1.3,2)";resolution:=optional,
diff --git a/spring-webmvc-6.0.18/pom.xml b/spring-webmvc-6.0.18/pom.xml
index 07a91fb10..0716d9483 100644
--- a/spring-webmvc-6.0.18/pom.xml
+++ b/spring-webmvc-6.0.18/pom.xml
@@ -66,7 +66,6 @@
jakarta.servlet,
jakarta.servlet.http,
jakarta.servlet.jsp.*;resolution:=optional,
- jakarta.xml.*;resolution:=optional,
jxl.*;version="[2.6,3)";resolution:=optional,
net.sf.jasperreports.*;version="[5,7)";resolution:=optional,
org.aopalliance.aop;resolution:=optional,
diff --git a/spring-webmvc-6.1.5/pom.xml b/spring-webmvc-6.1.5/pom.xml
index bb26774e7..d59959ca0 100644
--- a/spring-webmvc-6.1.5/pom.xml
+++ b/spring-webmvc-6.1.5/pom.xml
@@ -66,7 +66,6 @@
jakarta.servlet,
jakarta.servlet.http,
jakarta.servlet.jsp.*;resolution:=optional,
- jakarta.xml.*;resolution:=optional,
jxl.*;version="[2.6,3)";resolution:=optional,
net.sf.jasperreports.*;version="[5,7)";resolution:=optional,
org.aopalliance.aop;resolution:=optional,
