From 00d23c4baacbee0eb15b3dbeca282610d6a907bc Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 29 Sep 2013 22:32:25 +0000
Subject: Update xalan version to 2.7.1 to avoid duplicated jars on
 distribution

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527417 13f79535-47bb-0310-9956-ffa450edef68
---
 .../branches/2.0/distribution/all/src/main/release/bin/LICENSE        | 3 ++-
 sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml    | 2 +-
 sca-java-2.x/branches/2.0/modules/implementation-bpel-runtime/pom.xml | 2 +-
 .../branches/2.0/samples/getting-started/helloworld-webapp/pom.xml    | 4 ++--
 sca-java-2.x/branches/2.0/testing/itest/properties/pom.xml            | 2 +-
 sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml           | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
index 91a57a642b..51a6ecff8f 100644
--- a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
@@ -296,6 +296,7 @@ The following components come under Apache Software License 2.0
  rampart-policy-1.5.1.jar 
  rampart-trust-1.5.1.jar 
  regexp-1.3.jar
+ serializer-2.7.1.jar
  spring-aop-3.0.5.RELEASE.jar
  spring-asm-3.0.5.RELEASE.jar
  spring-beans-3.0.5.RELEASE.jar
@@ -313,7 +314,7 @@ The following components come under Apache Software License 2.0
  wink-client-apache-httpclient-1.2.0-incubating.jar
  wink-server-1.2.0-incubating.jar 
  wss4j-1.5.11.jar
- xalan-2.7.0.jar
+ xalan-2.7.1.jar
  xercesImpl-2.8.1.jar
  xmlbeans-2.3.0.jar
  XmlSchema-1.4.3.jar
diff --git a/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
index d76483cac4..9677335c9a 100644
--- a/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
@@ -201,7 +201,7 @@
            <artifactId>wss4j</artifactId>
            <version>1.5.11</version>
         </dependency>
-
+                
         <!--  replace the Rampart xmlsec with the version Tuscany is using -->
         <dependency>
             <groupId>org.apache.santuario</groupId>
diff --git a/sca-java-2.x/branches/2.0/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/branches/2.0/modules/implementation-bpel-runtime/pom.xml
index 5f969e0e02..14798d5da6 100644
--- a/sca-java-2.x/branches/2.0/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/branches/2.0/modules/implementation-bpel-runtime/pom.xml
@@ -335,7 +335,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>xml-apis</groupId>
diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-webapp/pom.xml
index afdb64f449..2201113908 100644
--- a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-webapp/pom.xml
@@ -80,11 +80,11 @@
          </exclusions>        
       </dependency>
 
-      <!-- replace HTMLUnit dependency with verstion that Tuscany is using -->
+      <!-- replace xalan dependency with verstion that Tuscany is using -->
       <dependency>
           <groupId>xalan</groupId>
           <artifactId>xalan</artifactId>
-          <version>2.7.0</version>
+          <version>2.7.1</version>
           <scope>test</scope>
           <exclusions>
              <exclusion>
diff --git a/sca-java-2.x/branches/2.0/testing/itest/properties/pom.xml b/sca-java-2.x/branches/2.0/testing/itest/properties/pom.xml
index c792f7da4b..75527a5b85 100644
--- a/sca-java-2.x/branches/2.0/testing/itest/properties/pom.xml
+++ b/sca-java-2.x/branches/2.0/testing/itest/properties/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml b/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
index 5bc1adee00..e00bd4e3fc 100644
--- a/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
+++ b/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
         </dependency>       
     </dependencies>
 
-- 
cgit v1.2.3