From 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Oct 2009 23:44:59 +0000
Subject: Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.x/modules/endpoint/pom.xml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'branches/sca-java-1.x/modules/endpoint/pom.xml')

diff --git a/branches/sca-java-1.x/modules/endpoint/pom.xml b/branches/sca-java-1.x/modules/endpoint/pom.xml
index a77f1fee9a..ddcf178a76 100644
--- a/branches/sca-java-1.x/modules/endpoint/pom.xml
+++ b/branches/sca-java-1.x/modules/endpoint/pom.xml
@@ -50,27 +50,22 @@
             <version>1.6-SNAPSHOT</version>
         </dependency> 
         
-        <dependency>
+         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
+            <artifactId>tuscany-core</artifactId>
             <version>1.6-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>         
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
+            <artifactId>tuscany-binding-sca</artifactId>
             <version>1.6-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency> 
         
-        <dependency>
+         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
+            <artifactId>tuscany-workspace-impl</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
@@ -94,14 +89,7 @@
             <artifactId>tuscany-monitor</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>  
+        </dependency>           
                
         <dependency>
             <groupId>org.easymock</groupId>
-- 
cgit v1.2.3