Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JBWS-4377]:Remove xerces dependency and use JDK's JAXP impl instead #286

Merged
merged 2 commits into from
Aug 14, 2023
Merged

[JBWS-4377]:Remove xerces dependency and use JDK's JAXP impl instead #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5457c5c
[JBWS-4377]:Remove xerces dependency and use JDK's JAXP impl instead
jimma Aug 9, 2023
583b8e8
[JBWS-4378]:Replace javax.ee modules with jakarta ee modules
jimma Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions modules/addons/transports/udp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<!-- END - this should be JDK9 only dependency -->
<dependency>
<groupId>junit</groupId>
Expand Down
3 changes: 1 addition & 2 deletions ...e-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
</resources>

<dependencies>
<!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
<module name="javax.xml.bind.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.apache.commons.logging"/>
<module name="org.apache.commons.beanutils"/>
Expand Down
4 changes: 2 additions & 2 deletions ...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
</resources>

<dependencies>
<module name="javax.xml.soap.api"/>
<module name="javax.xml.ws.api"/>
<module name="jakarta.xml.soap.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.ws.jaxws-client" services="import"/>
Expand Down
13 changes: 4 additions & 9 deletions ...re-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,14 @@
<dependencies>
<module name="java.management"/>
<module name="java.naming"/>
<module name="javax.annotation.api"/>
<module name="javax.xml.stream.api"/>
<module name="javax.jws.api"/>
<module name="javax.servlet.api"/>
<module name="java.xml"/>
<module name="jakarta.annotation.api"/>
<module name="jakarta.servlet.api"/>
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
<module name="org.apache.xerces" services="import"/>
<module name="org.jboss.jaxbintros"/>
<!-- Not supported and the API is not provided in an EE 9 server -->
<module name="javax.xml.rpc.api" optional="true"/>
<module name="java.xml"/>
</dependencies>
</module>
19 changes: 9 additions & 10 deletions .../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,23 @@

<dependencies>
<!-- JAXB API + REF IMPL -->
<module name="javax.xml.bind.api" export="true"/>
<module name="jakarta.xml.bind.api" export="true"/>
<module name="org.glassfish.jaxb" export="true" services="export"/>
<module name="javax.xml.ws.api" export="true"/>
<module name="javax.jws.api" export="true"/>
<module name="jakarta.xml.ws.api" export="true"/>
<!-- WSDL4J API -->
<module name="javax.wsdl4j.api" export="true"/>
<!-- JBossWS API -->
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.api" export="true" />
<!-- JBossWS JAXWS client -->
<module name="org.jboss.ws.jaxws-client" export="true" services="export"/>
<module name="org.jboss.ws.jaxws-client" export="true" services="export" />
<!-- JBossWS configuration of Apache CXF -->
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
<!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export"/>
<module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
<module name="javax.security.auth.message.api" export="true"/>
<module name="jakarta.security.auth.message.api" export="true"/>
<module name="org.apache.ws.security" export="true"/>
<module name="org.eclipse.angus.activation" export="true" services="export"/>
<!-- Tools support on JDK 9 and later -->
Expand Down
36 changes: 17 additions & 19 deletions .../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@
<dependencies>
<module name="java.logging"/>
<module name="java.management"/>
<module name="javax.security.auth.message.api"/>
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
<module name="java.xml"/>
<module name="jakarta.security.auth.message.api"/>
<module name="jakarta.servlet.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.bind.api" />
<module name="javax.xml.stream.api" />
<module name="javax.xml.ws.api" />
<module name="jakarta.xml.bind.api" />
<module name="jakarta.xml.ws.api" />
<module name="org.apache.commons.codec" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
Expand All @@ -50,26 +49,25 @@
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<!-- do not import services from cxf, those need to come from jbossws -->
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.wildfly.security.elytron" />
<module name="java.xml"/>
</dependencies>
</module>
12 changes: 6 additions & 6 deletions ...es/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@

<dependencies>
<module name="java.logging"/>
<module name="javax.annotation.api"/>
<module name="jakarta.annotation.api"/>
<module name="org.jboss.logging"/>
<module name="javax.xml.ws.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
</dependencies>
</module>
12 changes: 6 additions & 6 deletions ...dules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.ws.common"/>
<module name="org.jboss.logging"/>
<module name="javax.annotation.api"/>
<module name="javax.xml.ws.api"/>
<module name="jakarta.annotation.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.jboss.ws.jaxws-undertow-httpspi"/>
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="io.undertow.core"/>
</dependencies>
Expand Down
34 changes: 17 additions & 17 deletions ...k/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,36 @@
<module name="java.compiler"/>
<module name="java.management"/>
<module name="java.naming"/>
<module name="javax.servlet.api" />
<module name="javax.xml.bind.api" />
<module name="javax.security.auth.message.api"/>
<module name="jakarta.servlet.api" />
<module name="jakarta.xml.bind.api" />
<module name="jakarta.security.auth.message.api"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="javax.xml.ws.api" />
<module name="jakarta.xml.ws.api" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<!-- do not import services from cxf, those need to come from jbossws -->
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
</imports>
</module>
<module name="org.apache.neethi" />
<module name="org.apache.ws.security"/>
<module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
<module name="org.apache.commons.beanutils"/>
<module name="javax.wsdl4j.api" />
Expand Down
2 changes: 1 addition & 1 deletion .../resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</resources>

<dependencies>
<module name="javax.xml.ws.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="io.undertow.core"/>
</dependencies>
</module>
7 changes: 3 additions & 4 deletions ...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,11 @@

<dependencies>
<module name="java.management"/>
<module name="javax.servlet.api"/>
<module name="javax.xml.stream.api"/>
<module name="javax.xml.ws.api"/>
<module name="java.xml"/>
<module name="jakarta.servlet.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.ws.api"/>
<module name="org.jboss.as.webservices"/>
<module name="java.xml"/>
</dependencies>
</module>
6 changes: 0 additions & 6 deletions modules/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,6 @@
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>

<!-- jboss provided -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>

<!-- transitive dependencies -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
5 changes: 0 additions & 5 deletions modules/testsuite/cxf-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@
<artifactId>woodstox-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
<saaj.api.version>1.0.0.Final</saaj.api.version>
<saaj.impl.version>3.0.0</saaj.impl.version>
<velocity.version>2.3</velocity.version>
<xerces.version>2.12.0.SP05</xerces.version>
<xmlsec.version>3.0.1</xmlsec.version>
<wss4j.version>3.0.0</wss4j.version>
<wstx.version>6.4.0</wstx.version>
Expand Down Expand Up @@ -719,15 +718,6 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>

<!-- jboss provided -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<scope>provided</scope>
</dependency>

<!-- transitive dependencies -->
<dependency>
<groupId>jakarta.activation</groupId>
Expand Down