Fix pom dependencies in launchers, clients and services (TUSCANY-3506)

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

36 files changed, 14 insertions, 429 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
index 4e665bb6a4..1414ee706b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
@@ -27,15 +27,6 @@
     </parent><version>1.0-SNAPSHOT</version>

     <artifactId>scatours-client-currency-converter-corba</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter CORBA Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

     

     <build>

         <finalName>${artifactId}</finalName>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
index d936040939..55b499e314 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
@@ -74,13 +74,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
index 46f01ebcd9..69a0527d4b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
@@ -27,15 +27,6 @@
     </parent><version>1.0-SNAPSHOT</version>

     <artifactId>scatours-client-currency-converter-rmi</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter RMI Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

     

     <build>

        <finalName>${artifactId}</finalName>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
index e2ffe7a09d..8513023a92 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
@@ -41,13 +41,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <pluginRepositories>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
index 6324f538bd..5f36065a5b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
@@ -54,6 +54,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-tomcat</artifactId>

             <version>${tuscany.version}</version>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

@@ -76,13 +77,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
index 30650908b9..3f48c97f2a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
index d30733bf01..db54525784 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
@@ -68,13 +68,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-jms-asf</artifactId>

             <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
index b12cfa44ad..14e4a77e3d 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
@@ -77,13 +77,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
index 5ff8984dbf..bddb75987a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
@@ -71,13 +71,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
index af29324117..20cbc7dbff 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
@@ -56,13 +56,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
index b8067e75f2..fb5a788652 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
@@ -55,6 +55,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-tomcat</artifactId>

             <version>${tuscany.version}</version>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

@@ -77,13 +78,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
index 95d2077d0e..fabd131c91 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
@@ -34,62 +34,6 @@
             <artifactId>tuscany-node-launcher</artifactId>

             <version>${tuscany.version}</version>

         </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-currency</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-coordination</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-java</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-ui</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

     </dependencies>

 

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
index 34d2007daa..28f5e93074 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
@@ -32,54 +32,16 @@
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
             <version>${tuscany.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -122,6 +84,13 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -171,15 +140,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-<!-- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
--->
         
         <dependency>
             <groupId>org.apache.derby</groupId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
index 24b4624912..70bef29299 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
@@ -40,24 +40,6 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
             <version>${tuscany.version}</version>
         </dependency>
@@ -68,13 +50,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
index dcad902807..b26030fb77 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
index 878f27844c..10e8e3f460 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
@@ -55,20 +55,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
index c428b4b87f..ebe578d22a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
@@ -34,27 +34,6 @@
             <artifactId>tuscany-node-launcher</artifactId>

             <version>${tuscany.version}</version>

         </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-tours</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-client</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

     </dependencies>

 

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
index ec5957081f..077e5e724f 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
index e5c3d549a9..1dd95cf3e5 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
index dd0a198622..3b20798e40 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
@@ -61,13 +61,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-jms-asf</artifactId>

             <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

@@ -80,46 +74,7 @@
                     <artifactId>activemq-web-demo</artifactId>

                 </exclusion>

             </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <version>1.2.7</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xerces</groupId>

-                    <artifactId>xercesImpl</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xml-apis</groupId>

-                    <artifactId>xml-apis</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.7</version>

             <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

         </dependency>

     </dependencies>

     

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
index f6fea913fe..69590fa45e 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
index 4625a6e85c..c5dd336d6b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
@@ -70,13 +70,6 @@
             <version>${tuscany.version}</version>

             <scope>runtime</scope>

         </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
index 498ee1eb53..811bb6a9ed 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
@@ -97,6 +97,7 @@
                     <artifactId>avalon-framework</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>runtime</scope>
         </dependency>
         
         <dependency>
@@ -112,13 +113,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
index 3631ee365a..b46c58001c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
@@ -95,13 +95,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
index 0e12b5608b..d4ea82f62c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
@@ -88,13 +88,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
index 3f6fbe1439..4d6823400c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
@@ -88,13 +88,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
index 9a6c4b20b0..6046fcab91 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
@@ -88,13 +88,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
index f9d5255938..2a2bb63532 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
@@ -88,13 +88,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
index c1742b08b0..97ba34d3ab 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
@@ -95,13 +95,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
index a03f2d0d51..c44f53ad1a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
@@ -102,13 +102,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
index c57b5e2e24..013c7e1482 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
@@ -102,13 +102,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
index 8cb43fad80..dc72d0c3c0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
@@ -84,13 +84,6 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
index 340f043ca5..261c22d5e1 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
@@ -28,15 +28,6 @@
     <artifactId>scatours-service-smsgateway-corba</artifactId>

     <name>Apache Tuscany SCA Tours SMS Gateway CORBA Service</name>

 

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

     <build>

         <finalName>${artifactId}</finalName>

         <plugins>

@@ -82,4 +73,4 @@
             </plugin>

         </plugins>

     </build>

-</project>

+</project>
\ No newline at end of file
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
index a833c03b9e..06c497db00 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
@@ -40,13 +40,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
index 9f1de49e6d..9b0bee5a6f 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
@@ -73,13 +73,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

     

     <build>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
index 3f91e23315..1922ec271b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
@@ -27,15 +27,6 @@
     </parent><version>1.0-SNAPSHOT</version>

     <artifactId>scatours-service-smsgateway-rmi</artifactId>

     <name>Apache Tuscany SCA Tours SMS Gateway RMI Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

     

     <build>

         <finalName>${artifactId}</finalName>