From d95a02095f103b03e2a623c32edfaf5c7da8d54d Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 24 Sep 2010 17:04:07 +0000 Subject: Move to wstx-as version 3.2.6 consistently. Having two versions in the distro is causing OSGi wiring conflicts git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1000968 13f79535-47bb-0310-9956-ffa450edef68 --- sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE | 7 +++---- sca-java-2.x/trunk/modules/assembly-xml/pom.xml | 2 +- sca-java-2.x/trunk/modules/common-xml/pom.xml | 2 +- sca-java-2.x/trunk/modules/contribution-osgi/pom.xml | 2 +- sca-java-2.x/trunk/modules/core-databinding/pom.xml | 2 +- sca-java-2.x/trunk/modules/core-spi/pom.xml | 6 +++--- sca-java-2.x/trunk/modules/core/pom.xml | 2 +- sca-java-2.x/trunk/modules/databinding-axiom/pom.xml | 2 +- sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index 941dc0474b..fe4b27d610 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -311,11 +311,11 @@ The following components come under Apache Software License 2.0 rampart-trust-1.4.jar regexp-1.3.jar rome-1.0.jar - spring-aop-3.0.2.RELEASE.jar - spring-asm-3.0.2.RELEASE.jar + spring-aop-3.0.2.RELEASE.jar + spring-asm-3.0.2.RELEASE.jar spring-beans-3.0.2.RELEASE.jar spring-context-3.0.2.RELEASE.jar - spring-core-3.0.2.RELEASE.jar + spring-core-3.0.2.RELEASE.jar spring-expression-3.0.2.RELEASE.jar stripes-1.5.2.jar tranql-connector-1.1.jar @@ -326,7 +326,6 @@ The following components come under Apache Software License 2.0 woden-api-1.0M8.jar woden-impl-dom-1.0M8.jar wss4j-1.5.4.jar - wstx-asl-3.2.4.jar wstx-asl-3.2.6.jar xalan-2.7.0.jar xercesImpl-2.8.1.jar diff --git a/sca-java-2.x/trunk/modules/assembly-xml/pom.xml b/sca-java-2.x/trunk/modules/assembly-xml/pom.xml index 5df6a570ab..93e0879c77 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/pom.xml +++ b/sca-java-2.x/trunk/modules/assembly-xml/pom.xml @@ -71,7 +71,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime diff --git a/sca-java-2.x/trunk/modules/common-xml/pom.xml b/sca-java-2.x/trunk/modules/common-xml/pom.xml index 663851dd03..2f6f41c3d7 100644 --- a/sca-java-2.x/trunk/modules/common-xml/pom.xml +++ b/sca-java-2.x/trunk/modules/common-xml/pom.xml @@ -61,7 +61,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime diff --git a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml index 9a914276aa..600d7ecb39 100644 --- a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml +++ b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml @@ -57,7 +57,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime diff --git a/sca-java-2.x/trunk/modules/core-databinding/pom.xml b/sca-java-2.x/trunk/modules/core-databinding/pom.xml index 53574b9a1e..35b5f41b06 100644 --- a/sca-java-2.x/trunk/modules/core-databinding/pom.xml +++ b/sca-java-2.x/trunk/modules/core-databinding/pom.xml @@ -77,7 +77,7 @@ org.codehaus.woodstox wstx-asl runtime - 3.2.4 + 3.2.6 stax diff --git a/sca-java-2.x/trunk/modules/core-spi/pom.xml b/sca-java-2.x/trunk/modules/core-spi/pom.xml index 08cb196fa6..578eb0715e 100644 --- a/sca-java-2.x/trunk/modules/core-spi/pom.xml +++ b/sca-java-2.x/trunk/modules/core-spi/pom.xml @@ -56,7 +56,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime @@ -69,7 +69,7 @@ - + diff --git a/sca-java-2.x/trunk/modules/core/pom.xml b/sca-java-2.x/trunk/modules/core/pom.xml index 422ddfa783..0fa5960d50 100644 --- a/sca-java-2.x/trunk/modules/core/pom.xml +++ b/sca-java-2.x/trunk/modules/core/pom.xml @@ -62,7 +62,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml index f46bd41d7d..3df7204dae 100644 --- a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml @@ -97,7 +97,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml index b3fe706a7a..8d4371da35 100644 --- a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml @@ -109,7 +109,7 @@ org.codehaus.woodstox wstx-asl - 3.2.4 + 3.2.6 runtime -- cgit v1.2.3