diff -Nru glassfish-jaxws-2.2.10/boms/bom/pom.xml glassfish-jaxws-2.2.10.resolver/boms/bom/pom.xml --- glassfish-jaxws-2.2.10/boms/bom/pom.xml 2014-08-03 17:00:07.000000000 +0200 +++ glassfish-jaxws-2.2.10.resolver/boms/bom/pom.xml 2015-02-03 13:20:39.286876368 +0100 @@ -108,7 +108,7 @@ <management-api.version>3.2.1-b001</management-api.version> <mimepull.version>1.9.4</mimepull.version> <policy.version>2.4</policy.version> - <resolver.version>20050927</resolver.version> + <resolver.version>1.2</resolver.version> <saaj-api.version>1.3.7</saaj-api.version> <saaj-impl.version>1.3.25</saaj-impl.version> <streambuffer.version>1.5.3</streambuffer.version> @@ -291,8 +291,8 @@ </dependency> <dependency> - <groupId>com.sun.org.apache.xml.internal</groupId> - <artifactId>resolver</artifactId> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> <version>${resolver.version}</version> </dependency> diff -Nru glassfish-jaxws-2.2.10/bundles/jaxws-rt/pom.xml glassfish-jaxws-2.2.10.resolver/bundles/jaxws-rt/pom.xml --- glassfish-jaxws-2.2.10/bundles/jaxws-rt/pom.xml 2014-08-03 17:00:07.000000000 +0200 +++ glassfish-jaxws-2.2.10.resolver/bundles/jaxws-rt/pom.xml 2015-02-03 13:19:19.236674210 +0100 @@ -137,8 +137,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.sun.org.apache.xml.internal</groupId> - <artifactId>resolver</artifactId> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> </dependency> <!-- Test dependencies --> diff -Nru glassfish-jaxws-2.2.10/rt/pom.xml glassfish-jaxws-2.2.10.resolver/rt/pom.xml --- glassfish-jaxws-2.2.10/rt/pom.xml 2014-08-03 17:00:07.000000000 +0200 +++ glassfish-jaxws-2.2.10.resolver/rt/pom.xml 2015-02-03 13:18:45.203713989 +0100 @@ -100,8 +100,8 @@ <artifactId>stax2-api</artifactId> </dependency> <dependency> - <groupId>com.sun.org.apache.xml.internal</groupId> - <artifactId>resolver</artifactId> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> </dependency> <dependency> <groupId>junit</groupId> diff -Nru glassfish-jaxws-2.2.10/rt/src/main/java/com/sun/xml/ws/util/xml/XmlUtil.java glassfish-jaxws-2.2.10.resolver/rt/src/main/java/com/sun/xml/ws/util/xml/XmlUtil.java --- glassfish-jaxws-2.2.10/rt/src/main/java/com/sun/xml/ws/util/xml/XmlUtil.java 2014-08-03 17:00:07.000000000 +0200 +++ glassfish-jaxws-2.2.10.resolver/rt/src/main/java/com/sun/xml/ws/util/xml/XmlUtil.java 2015-02-03 13:16:21.233342913 +0100 @@ -41,9 +41,9 @@ package com.sun.xml.ws.util.xml; import com.sun.istack.Nullable; -import com.sun.org.apache.xml.internal.resolver.Catalog; -import com.sun.org.apache.xml.internal.resolver.CatalogManager; -import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; +import org.apache.xml.resolver.Catalog; +import org.apache.xml.resolver.CatalogManager; +import org.apache.xml.resolver.tools.CatalogResolver; import com.sun.xml.ws.server.ServerRtException; import com.sun.xml.ws.util.ByteArrayBuffer; import org.w3c.dom.Attr;