Repository: cxf Updated Branches: refs/heads/master 58b379bdf -> 996d07454
[CXF-7169] Update to latest woodstox Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/996d0745 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/996d0745 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/996d0745 Branch: refs/heads/master Commit: 996d0745469b044cc8a29168add803f22706c443 Parents: 58b379b Author: Daniel Kulp <[email protected]> Authored: Wed Dec 7 13:59:31 2016 -0500 Committer: Daniel Kulp <[email protected]> Committed: Wed Dec 7 13:59:31 2016 -0500 ---------------------------------------------------------------------- core/pom.xml | 4 ++-- distribution/javadoc/pom.xml | 4 ++-- .../features/src/main/resources/features.xml | 8 ++++---- parent/pom.xml | 18 +++++++++++++++--- rt/ws/security/pom.xml | 4 ++-- 5 files changed, 25 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/996d0745/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index cda420d..29bf3a5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -138,8 +138,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/996d0745/distribution/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index 3430354..2955170 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -128,8 +128,8 @@ <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </dependency> <dependency> <groupId>xml-resolver</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/996d0745/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index d19161b..82622bc 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -7,8 +7,8 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -31,7 +31,7 @@ <bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m1/${cxf.servicemix.specs.version}</bundle> <bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle> <bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle> - <bundle start-level="20">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle> + <bundle start-level="20">mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}</bundle> <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle> <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle> </feature> @@ -508,7 +508,7 @@ <!-- stax --> <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${cxf.servicemix.specs.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle> - <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle> + <bundle start-level="30" dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cxf.servicemix.cglib.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${cxf.servicemix.aspectj.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/cxf/blob/996d0745/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3acb850..45f9f37 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -153,7 +153,7 @@ <cxf.swagger.version>1.3.13</cxf.swagger.version> <cxf.swagger2.version>1.5.10</cxf.swagger2.version> <cxf.velocity.version>1.7</cxf.velocity.version> - <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version> + <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> <cxf.wss4j.version>2.2.0-SNAPSHOT</cxf.wss4j.version> @@ -1661,6 +1661,10 @@ <version>${cxf.abdera.version}</version> <exclusions> <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.0.2_spec</artifactId> </exclusion> @@ -1707,6 +1711,10 @@ <version>${cxf.abdera.version}</version> <exclusions> <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> @@ -1758,6 +1766,10 @@ <version>${cxf.axiom.version}</version> <exclusions> <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + </exclusion> + <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> @@ -1856,8 +1868,8 @@ </dependency> <!-- if we use the new woodstox artifact, we're using the new version --> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> <version>${cxf.woodstox.core.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/cxf/blob/996d0745/rt/ws/security/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index 3029bff..8b2d220 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -79,8 +79,8 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> <optional>true</optional> </dependency> <dependency>
