Adjust some dependency versions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@697159 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 54 insertions, 56 deletions

diff --git a/sandbox/travelsample/calendar-contribution/pom.xml b/sandbox/travelsample/calendar-contribution/pom.xml
index 2610706329..09d68e01ae 100644
--- a/sandbox/travelsample/calendar-contribution/pom.xml
+++ b/sandbox/travelsample/calendar-contribution/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/car-contribution/pom.xml b/sandbox/travelsample/car-contribution/pom.xml
index 8ef9abf6e3..fb91046c89 100644
--- a/sandbox/travelsample/car-contribution/pom.xml
+++ b/sandbox/travelsample/car-contribution/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/common-contribution/pom.xml b/sandbox/travelsample/common-contribution/pom.xml
index a170b3d80b..fc611f9d32 100644
--- a/sandbox/travelsample/common-contribution/pom.xml
+++ b/sandbox/travelsample/common-contribution/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/currency-contribution/pom.xml b/sandbox/travelsample/currency-contribution/pom.xml
index bf0f7adbc6..6c1a79358e 100644
--- a/sandbox/travelsample/currency-contribution/pom.xml
+++ b/sandbox/travelsample/currency-contribution/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/domain/pom.xml b/sandbox/travelsample/domain/pom.xml
index 33f8075c36..ee086c6b2c 100644
--- a/sandbox/travelsample/domain/pom.xml
+++ b/sandbox/travelsample/domain/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/flight-contribution/pom.xml b/sandbox/travelsample/flight-contribution/pom.xml
index 4076deb5c2..e25ba0b1c1 100644
--- a/sandbox/travelsample/flight-contribution/pom.xml
+++ b/sandbox/travelsample/flight-contribution/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/gettingstarted/pom.xml b/sandbox/travelsample/gettingstarted/pom.xml
index c038d823ea..dec1c4ecc2 100644
--- a/sandbox/travelsample/gettingstarted/pom.xml
+++ b/sandbox/travelsample/gettingstarted/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/hotel-contribution/pom.xml b/sandbox/travelsample/hotel-contribution/pom.xml
index 7746f91c26..ff7eeba831 100644
--- a/sandbox/travelsample/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/hotel-contribution/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/node/build.xml b/sandbox/travelsample/node/build.xml
index a8e3af938c..e2fc7ebba1 100644
--- a/sandbox/travelsample/node/build.xml
+++ b/sandbox/travelsample/node/build.xml
@@ -73,6 +73,7 @@
         <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
@@ -120,11 +121,8 @@
         <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-ws-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
         <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
@@ -135,7 +133,7 @@
         <include name="tuscany-xsd-xml-1.4-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.3.2.jar"/>
+        <include name="XmlSchema-1.4.2.jar"/>
         <include name="abdera-client-0.4.0-incubating.jar"/>
         <include name="abdera-core-0.4.0-incubating.jar"/>
         <include name="abdera-extensions-html-0.4.0-incubating.jar"/>
@@ -147,17 +145,17 @@
         <include name="activation-1.1.jar"/>
         <include name="annogen-0.1.0.jar"/>
         <include name="asm-all-3.1.jar"/>
-        <include name="axiom-api-1.2.5.jar"/>
-        <include name="axiom-dom-1.2.5.jar"/>
-        <include name="axiom-impl-1.2.5.jar"/>
-        <include name="axis2-adb-1.3.jar"/>
-        <include name="axis2-adb-codegen-1.3.jar"/>
-        <include name="axis2-codegen-1.3.jar"/>
-        <include name="axis2-java2wsdl-1.3.jar"/>
-        <include name="axis2-kernel-1.3.jar"/>
-        <include name="axis2-mtompolicy-1.3.jar"/>
-        <include name="backport-util-concurrent-3.0.jar"/>
-        <include name="bcprov-jdk15-132.jar"/>
+        <include name="axiom-api-1.2.7.jar"/>
+        <include name="axiom-dom-1.2.7.jar"/>
+        <include name="axiom-impl-1.2.7.jar"/>
+        <include name="axis-ant-1.4.jar"/>
+        <include name="axis2-adb-1.4.1.jar"/>
+        <include name="axis2-codegen-1.4.1.jar"/>
+        <include name="axis2-java2wsdl-1.4.1.jar"/>
+        <include name="axis2-kernel-1.4.1.jar"/>
+        <include name="axis2-mtompolicy-1.4.1.jar"/>
+        <include name="backport-util-concurrent-3.1.jar"/>
+        <include name="bcprov-jdk13-132.jar"/>
         <include name="cglib-nodep-2.1_3.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
@@ -165,18 +163,17 @@
         <include name="commons-fileupload-1.1.1.jar"/>
         <include name="commons-httpclient-3.0.1.jar"/>
         <include name="commons-io-1.1.jar"/>
-        <include name="commons-logging-1.1.jar"/>
+        <include name="commons-logging-1.1.1.jar"/>
         <include name="derby-10.3.1.4.jar"/>
-        <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
         <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
         <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
-        <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
         <include name="geronimo-jms_1.1_spec-1.1.jar"/>
         <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
         <include name="htmlparser-1.0.5.jar"/>
-        <include name="httpcore-4.0-alpha5.jar"/>
-        <include name="httpcore-nio-4.0-alpha5.jar"/>
-        <include name="httpcore-niossl-4.0-alpha5.jar"/>
+        <include name="httpcore-4.0-beta1.jar"/>
+        <include name="httpcore-nio-4.0-beta1.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxen-1.1.1.jar"/>
@@ -188,25 +185,26 @@
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
         <include name="junit-3.8.1.jar"/>
-        <include name="log4j-1.2.12.jar"/>
-        <include name="logkit-1.0.1.jar"/>
+        <include name="log4j-1.2.15.jar"/>
         <include name="mail-1.4.jar"/>
-        <include name="neethi-2.0.2.jar"/>
+        <include name="mex-1.41-impl.jar"/>
+        <include name="neethi-2.0.4.jar"/>
         <include name="opensaml-1.1.jar"/>
-        <include name="rampart-core-1.3.jar"/>
-        <include name="rampart-policy-1.3.jar"/>
-        <include name="rampart-trust-1.3.jar"/>
+        <include name="rampart-core-1.4.jar"/>
+        <include name="rampart-policy-1.4.jar"/>
+        <include name="rampart-trust-1.4.jar"/>
         <include name="servlet-api-2.5.jar"/>
         <include name="stax-api-1.0-2.jar"/>
-        <include name="stax-api-1.0.1.jar"/>
-        <include name="woden-1.0-incubating-M7b.jar"/>
+        <include name="woden-api-1.0M8.jar"/>
+        <include name="woden-impl-dom-1.0M8.jar"/>
         <include name="wsdl4j-1.6.2.jar"/>
-        <include name="wss4j-1.5.3.jar"/>
-        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="wss4j-1.5.4.jar"/>
+        <include name="wstx-asl-3.2.4.jar"/>
         <include name="xalan-2.7.0.jar"/>
         <include name="xercesImpl-2.8.1.jar"/>
         <include name="xml-apis-1.3.03.jar"/>
-        <include name="xmlsec-1.4.0.jar"/>
+        <include name="xmlParserAPIs-2.6.0.jar"/>
+        <include name="xmlsec-1.4.2.jar"/>
     </fileset>
 
 </project>
diff --git a/sandbox/travelsample/node/pom.xml b/sandbox/travelsample/node/pom.xml
index 8674b0c060..18deb000d0 100644
--- a/sandbox/travelsample/node/pom.xml
+++ b/sandbox/travelsample/node/pom.xml
@@ -31,13 +31,13 @@
     <dependencies>
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
+            <artifactId>tuscany-node-launcher</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/node/src/scatours/LaunchNode.java b/sandbox/travelsample/node/src/scatours/LaunchNode.java
index ae73a2d021..65483a10c9 100644
--- a/sandbox/travelsample/node/src/scatours/LaunchNode.java
+++ b/sandbox/travelsample/node/src/scatours/LaunchNode.java
@@ -22,8 +22,8 @@ package scatours;
 import java.io.IOException;
 
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 
 public class LaunchNode {
@@ -33,10 +33,10 @@ public class LaunchNode {
 
     // OK for development but you must launch the node from this module 
     public static void launchFromFileSystemJar(){
-        SCANode2 node = null; 
+        SCANode node = null; 
         
         try {
-            node = SCANode2Factory.newInstance().createSCANode("scatours.composite", 
+            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
                                                                new SCAContribution("common", "../common-contribution/target/scatours-common-contribution.jar"),
                                                                new SCAContribution("currency", "../currency-contribution/target/scatours-currency-contribution.jar"),
                                                                new SCAContribution("hotel", "../hotel-contribution/target/scatours-hotel-contribution.jar"),
@@ -62,10 +62,10 @@ public class LaunchNode {
     
     // OK for development but you must launch the node from this module 
     public static void launchFromFileSystemDir(){
-        SCANode2 node = null; 
+        SCANode node = null; 
         
         try {
-            node = SCANode2Factory.newInstance().createSCANode("scatours.composite", 
+            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
                                                                new SCAContribution("common", "../common-contribution/target/classes"),
                                                                new SCAContribution("currency", "../currency-contribution/target/classes"),
                                                                new SCAContribution("hotel", "../hotel-contribution/target/classes"),
@@ -90,10 +90,10 @@ public class LaunchNode {
     
     // OK for samples but you can only load one contribution 
     public static void launchFromClasspath(){
-        SCANode2 node = null; 
+        SCANode node = null; 
         
         try {
-            node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("scatours.composite", null);
+            node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("scatours.composite", null);
             node.start();
             
             System.out.println("Node started - Press enter to shutdown.");
diff --git a/sandbox/travelsample/payment-contribution/pom.xml b/sandbox/travelsample/payment-contribution/pom.xml
index 00f5507709..2e22120c38 100644
--- a/sandbox/travelsample/payment-contribution/pom.xml
+++ b/sandbox/travelsample/payment-contribution/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/travel-contribution/pom.xml b/sandbox/travelsample/travel-contribution/pom.xml
index 4ae7890544..f7331045f2 100644
--- a/sandbox/travelsample/travel-contribution/pom.xml
+++ b/sandbox/travelsample/travel-contribution/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/trip-contribution/pom.xml b/sandbox/travelsample/trip-contribution/pom.xml
index c56964f3a1..b3cc2a5b5f 100644
--- a/sandbox/travelsample/trip-contribution/pom.xml
+++ b/sandbox/travelsample/trip-contribution/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/ui-contribution/build.xml b/sandbox/travelsample/ui-contribution/build.xml
index bb56d1bd60..78f39b4176 100644
--- a/sandbox/travelsample/ui-contribution/build.xml
+++ b/sandbox/travelsample/ui-contribution/build.xml
@@ -91,7 +91,7 @@
         <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.3.2.jar"/>
+        <include name="XmlSchema-1.4.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
         <include name="cglib-nodep-2.1_3.jar"/>
@@ -102,7 +102,7 @@
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
         <include name="stax-api-1.0-2.jar"/>
-        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="wstx-asl-3.2.4.jar"/>
     </fileset>
 
 </project>
diff --git a/sandbox/travelsample/ui-contribution/pom.xml b/sandbox/travelsample/ui-contribution/pom.xml
index dc8b6176d4..8e9c91b240 100644
--- a/sandbox/travelsample/ui-contribution/pom.xml
+++ b/sandbox/travelsample/ui-contribution/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>