This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch TOMEE-4503 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 3e6ef5db4793022dfd63e6c0ff3feeb26fc5edcf Author: Richard Zowalla <r...@apache.org> AuthorDate: Mon Jul 7 15:23:36 2025 +0200 TOMEE-4503 - Migrate to libre-wsdl4j --- .../src/test/resources/arquillian.xml | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../openejb-standalone/src/main/resources/LICENSE | 2 +- boms/tomee-microprofile/pom.xml | 22 +++++++++++----------- boms/tomee-plume/pom.xml | 22 +++++++++++----------- boms/tomee-plus/pom.xml | 22 +++++++++++----------- boms/tomee-webprofile/pom.xml | 22 +++++++++++----------- container/openejb-core/pom.xml | 4 ++-- .../src/main/resources/default.exclusions | 1 + docs/advanced/shading/index.adoc | 1 + examples/LICENSE | 2 +- examples/NOTICE | 2 +- pom.xml | 10 +++++++--- server/openejb-cxf/pom.xml | 4 ++-- server/openejb-webservices/pom.xml | 10 ++++++++-- .../src/main/resources/META-INF/LICENSE | 2 +- .../main/resources/META-INF/microprofile/LICENSE | 2 +- .../src/main/resources/META-INF/plume/LICENSE | 2 +- .../src/main/resources/META-INF/plus/LICENSE | 2 +- .../src/main/resources/META-INF/webprofile/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- utils/openejb-provisionning/src/main/legal/LICENSE | 2 +- 22 files changed, 77 insertions(+), 65 deletions(-) diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml index 4b9a3bcae0..abe0ab844c 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml @@ -71,7 +71,7 @@ commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\ commons-math*.jar,commons-pool*.jar,\ jstl.jar,taglibs-standard-spec-*.jar,\ - geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ + geronimo-spec-jaxrpc*.jar,libre-wsdl4j*.jar,\ ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\ xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ diff --git a/assembly/openejb-lite/src/main/resources/META-INF/LICENSE b/assembly/openejb-lite/src/main/resources/META-INF/LICENSE index d8b81065b6..195b25931f 100644 --- a/assembly/openejb-lite/src/main/resources/META-INF/LICENSE +++ b/assembly/openejb-lite/src/main/resources/META-INF/LICENSE @@ -365,7 +365,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/LICENSE b/assembly/openejb-standalone/src/main/resources/LICENSE index 744e23f8f7..765daf6d26 100644 --- a/assembly/openejb-standalone/src/main/resources/LICENSE +++ b/assembly/openejb-standalone/src/main/resources/LICENSE @@ -841,7 +841,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index b628a6626c..12595e6db2 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -177,6 +177,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> + <version>1.11.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>io.github.rzo1.org.metatype.sxc</groupId> <artifactId>sxc-jaxb-core</artifactId> @@ -2509,17 +2520,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 5d8bc2c6c9..c764ef3689 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -177,6 +177,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> + <version>1.11.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>io.github.rzo1.org.metatype.sxc</groupId> <artifactId>sxc-jaxb-core</artifactId> @@ -2608,17 +2619,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index b5f5937618..4866d6fe63 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -177,6 +177,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> + <version>1.11.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>io.github.rzo1.org.metatype.sxc</groupId> <artifactId>sxc-jaxb-core</artifactId> @@ -2608,17 +2619,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml index b843f78c2e..77093ef82a 100644 --- a/boms/tomee-webprofile/pom.xml +++ b/boms/tomee-webprofile/pom.xml @@ -122,6 +122,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> + <version>1.11.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>io.github.rzo1.org.metatype.sxc</groupId> <artifactId>sxc-jaxb-core</artifactId> @@ -1552,17 +1563,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - <exclusions> - <exclusion> - <artifactId>*</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 02b414a8ac..03df6ca62e 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -606,8 +606,8 @@ </dependency> <!-- webservices --> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> <optional>true</optional> </dependency> <dependency> diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index 2ef3b6a15b..04572ccf78 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -289,6 +289,7 @@ webbeans-spi websocket-api woodstox- ws-commons-util- +libre-wsdl4j- wsdl4j- wss4j- wstx-asl- diff --git a/docs/advanced/shading/index.adoc b/docs/advanced/shading/index.adoc index 1eb13e7541..73202a4305 100644 --- a/docs/advanced/shading/index.adoc +++ b/docs/advanced/shading/index.adoc @@ -146,6 +146,7 @@ def excludedDependenciesGroups = [ 'org.jvnet.mimepull', 'org.opensaml', 'wsdl4j', + 'io.github.librewsdl4j', 'xml-resolver' ] diff --git a/examples/LICENSE b/examples/LICENSE index b71e72cae7..1cb711a334 100644 --- a/examples/LICENSE +++ b/examples/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/examples/NOTICE b/examples/NOTICE index 7f9cbe025e..6cab882e57 100644 --- a/examples/NOTICE +++ b/examples/NOTICE @@ -3,7 +3,7 @@ Copyright 1999-2025 The Apache OpenEJB development community This product includes/uses software, HSQLDB (http://hsqldb.org/) -This product includes/uses software, WSDL4J (http://sf.net/projects/wsdl4j) +This product includes/uses software, libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) This product includes/uses software, Serp (http://serp.sourceforge.net) diff --git a/pom.xml b/pom.xml index 894c53dae3..6cba49e052 100644 --- a/pom.xml +++ b/pom.xml @@ -1219,6 +1219,10 @@ <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> </exclusion> + <exclusion> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1524,9 +1528,9 @@ <version>${version.xmlsec}</version> </dependency> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> + <version>1.12.0</version> </dependency> <dependency> <groupId>xmlunit</groupId> diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 25c04cb268..5f33cc47e8 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -63,8 +63,8 @@ <artifactId>cxf-rt-ws-security</artifactId> </dependency> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> </dependency> <dependency> diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml index d32bc3b21f..b6f598c963 100644 --- a/server/openejb-webservices/pom.xml +++ b/server/openejb-webservices/pom.xml @@ -82,8 +82,8 @@ <artifactId>jakartaee-api</artifactId> </dependency> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> + <groupId>io.github.librewsdl4j</groupId> + <artifactId>libre-wsdl4j</artifactId> </dependency> <!-- Test only dependencies --> @@ -91,6 +91,12 @@ <groupId>org.apache.axis2</groupId> <artifactId>axis2-saaj</artifactId> <version>1.8.2</version> + <exclusions> + <exclusion> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + </exclusion> + </exclusions> <scope>test</scope> </dependency> </dependencies> diff --git a/tomee/apache-tomee/src/main/resources/META-INF/LICENSE b/tomee/apache-tomee/src/main/resources/META-INF/LICENSE index 2fc1b57d05..3159db2a47 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/LICENSE +++ b/tomee/apache-tomee/src/main/resources/META-INF/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/microprofile/LICENSE b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/LICENSE index d02a8ab101..c8eb54d247 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/microprofile/LICENSE +++ b/tomee/apache-tomee/src/main/resources/META-INF/microprofile/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plume/LICENSE b/tomee/apache-tomee/src/main/resources/META-INF/plume/LICENSE index 88b721706f..cc5e66f582 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plume/LICENSE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plume/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plus/LICENSE b/tomee/apache-tomee/src/main/resources/META-INF/plus/LICENSE index 1bb44c2a9b..db21e86941 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plus/LICENSE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/webprofile/LICENSE b/tomee/apache-tomee/src/main/resources/META-INF/webprofile/LICENSE index d02a8ab101..c8eb54d247 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/webprofile/LICENSE +++ b/tomee/apache-tomee/src/main/resources/META-INF/webprofile/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/tomee/tomee-config/src/main/resources/META-INF/LICENSE b/tomee/tomee-config/src/main/resources/META-INF/LICENSE index b4a8199d5a..e5b61a4d0a 100644 --- a/tomee/tomee-config/src/main/resources/META-INF/LICENSE +++ b/tomee/tomee-config/src/main/resources/META-INF/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) ------------------------------------------------------------------------- diff --git a/utils/openejb-provisionning/src/main/legal/LICENSE b/utils/openejb-provisionning/src/main/legal/LICENSE index b77986a23c..e3f4a0db37 100644 --- a/utils/openejb-provisionning/src/main/legal/LICENSE +++ b/utils/openejb-provisionning/src/main/legal/LICENSE @@ -356,7 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= - - WSDL4J (http://sf.net/projects/wsdl4j) wsdl4j:wsdl4j:jar:1.6.2 + - libre-wsdl4j (https://github.com/librewsdl4j/libre-wsdl4j) io.github.librewsdl4j:libre-wsdl4j:jar:1.11.0 License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) -------------------------------------------------------------------------