Xmlsec 4.0.0 (#421)

- webservices-extra-xmlsec is not required any more - slf4j is not mandatory any more Signed-off-by: David Matějček <[email protected]>
eclipse-ee4j · Oct 20, 2023 · 00c08fd · 00c08fd
1 parent 1efe7d1
commit 00c08fd
Show file tree

Hide file tree

Showing 19 changed files with 503 additions and 693 deletions.
diff --git a/wsit/boms/bom-ext/pom.xml b/wsit/boms/bom-ext/pom.xml
@@ -36,15 +36,9 @@
         <cdi-api.version>4.0.1</cdi-api.version>
         <inject-api.version>2.0.1</inject-api.version>
         <el-api.version>5.0.1</el-api.version>
-
-        <!-- CQ: #24092 -->
-        <santuario.version>3.0.2</santuario.version>
-        <!-- CQ: #22187 -->
-        <slf4j-api.version>1.7.36</slf4j-api.version>
-        <!-- CQ: #22186 -->
+        <santuario.version>4.0.0</santuario.version>
         <commons-codec.version>1.16.0</commons-codec.version>
 
-        <!-- CQ: #18393 -->
         <stax-utils.version>20070216</stax-utils.version>
 
         <hk2.version>3.0.5</hk2.version>
@@ -120,24 +114,12 @@
                 <groupId>org.apache.santuario</groupId>
                 <artifactId>xmlsec</artifactId>
                 <version>${santuario.version}</version>
-                <exclusions>
-                    <!-- depends on jaxb2 which we are repackaging with other deps -->
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
                 <version>${commons-codec.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j-api.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.glassfish.grizzly</groupId>

diff --git a/wsit/boms/bom-gf/pom.xml b/wsit/boms/bom-gf/pom.xml
@@ -44,11 +44,6 @@
                 <artifactId>webservices-extra</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>webservices-extra-xmlsec</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webservices-rt</artifactId>

diff --git a/wsit/bundles/metro-standalone/pom.xml b/wsit/bundles/metro-standalone/pom.xml
@@ -157,11 +157,6 @@
             <artifactId>webservices-extra</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>webservices-rt</artifactId>

diff --git a/wsit/bundles/pom.xml b/wsit/bundles/pom.xml
@@ -35,7 +35,6 @@
         <module>webservices-rt</module>
         <module>webservices-tools</module>
         <module>webservices-extra</module>
-        <module>webservices-extra-xmlsec</module>
         <module>webservices-api-osgi</module>
         <module>webservices-osgi</module>
         <module>webservices-extra-jdk-packages</module>

diff --git a/wsit/bundles/webservices-extra-xmlsec/pom.xml b/wsit/bundles/webservices-extra-xmlsec/pom.xml
diff --git a/wsit/bundles/webservices-extra/pom.xml b/wsit/bundles/webservices-extra/pom.xml
@@ -26,7 +26,7 @@
     <name>Metro Web Services Extra Runtime non-OSGi Bundle</name>
     <description>
         This module contains the compilation of all additional classes required
-        for running Metro outside JavaEE container
+        for running Metro outside Jakarta EE container
     </description>
 
     <build>

diff --git a/wsit/bundles/webservices-osgi/pom.xml b/wsit/bundles/webservices-osgi/pom.xml
@@ -189,7 +189,6 @@
                                     org.glassfish.pfl.tf.timer.spi;resolution:=optional,
                                     org.glassfish.webservice;resolution:=optional,
                                     org.glassfish.webservice.monitoring;resolution:=optional,
-                                    org.slf4j.impl;resolution:=optional,
                                     sun.misc;resolution:=optional,
                                     sun.security.util;resolution:=optional,
                                     sun.security.x509;resolution:=optional,
@@ -367,12 +366,6 @@
             <artifactId>xmlsec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.ha</groupId>
             <artifactId>ha-api</artifactId>

diff --git a/wsit/bundles/webservices-rt/pom.xml b/wsit/bundles/webservices-rt/pom.xml
@@ -177,11 +177,6 @@
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>

diff --git a/wsit/bundles/wsit-impl/pom.xml b/wsit/bundles/wsit-impl/pom.xml
@@ -266,13 +266,6 @@
             <artifactId>xmlsec</artifactId>
         </dependency>
 
-        <!-- santuario requires old "javax" jaxb runtime -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-framework</artifactId>

diff --git a/wsit/pom.xml b/wsit/pom.xml
@@ -670,7 +670,6 @@
                                         <exclude>org/ietf/**</exclude>
                                         <exclude>org/jcp/**</exclude>
                                         <exclude>org/kohsuke/**</exclude>
-                                        <exclude>org/slf4j/**</exclude>
                                         <exclude>com/sun/xml/ws/test/**</exclude>
                                         <!-- -tests -->
                                         <exclude>wspolicy/**</exclude>

diff --git a/wsit/ws-sx/wssx-api/pom.xml b/wsit/ws-sx/wssx-api/pom.xml
@@ -68,11 +68,6 @@
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/wsit/ws-sx/wssx-impl/pom.xml b/wsit/ws-sx/wssx-impl/pom.xml
@@ -164,13 +164,6 @@
             <artifactId>xmlsec</artifactId>
         </dependency>
 
-        <!-- santuario requires old "javax" jaxb runtime -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- Test scope -->
         <dependency>
             <groupId>junit</groupId>