Upgrade to equinox 3.4.x

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

1 files changed, 37 insertions, 44 deletions

diff --git a/java/sca/modules/node-impl-osgi/pom.xml b/java/sca/modules/node-impl-osgi/pom.xml
index cc42ebbd00..3d7f61f8ea 100644
--- a/java/sca/modules/node-impl-osgi/pom.xml
+++ b/java/sca/modules/node-impl-osgi/pom.xml
@@ -29,16 +29,15 @@
 
     <artifactId>tuscany-node-impl-osgi</artifactId>
     <name>Apache Tuscany SCA OSGi Node Implementation</name>
-    
+
     <repositories>
         <repository>
+            <id>tuscany.repo</id>
+            <name>Tuscany Maven 2.x Repository</name>
+            <url>http://svn.apache.org/repos/asf/tuscany/maven</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-            <id>rfeng.repo</id>
-            <name>A Temporary Maven 2.x Repository for Equinox 3.4.2</name>
-            <url>http://people.apache.org/~rfeng/repo/maven2/</url>
-            <layout>default</layout>
         </repository>
     </repositories>
 
@@ -47,21 +46,15 @@
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
             <version>3.4.0-v20080605-1900</version>
-            <!-- 
-            <version>3.3.0-v20070530</version>
-             -->
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>services</artifactId>
             <version>3.1.200-v20071203</version>
-            <!-- 
-            <version>3.1.200-v20070605</version>
-             -->
             <scope>test</scope>
-        </dependency>         
-        
+        </dependency>
+
         <!-- Equinox Declarative Services -->
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
@@ -69,91 +62,91 @@
             <version>1.0.0-v20080427-0830</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>util</artifactId>
             <version>1.0.0-v20080414</version>
             <scope>test</scope>
         </dependency>
-                
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
+
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-                
+
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-                  
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>          
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-                
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
@@ -195,70 +188,70 @@
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
-        </dependency> 
-               
+        </dependency>
+
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
-        </dependency>  
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
-        </dependency>        
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
-        </dependency>        
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-                      
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-            
+
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
             <version>2.2</version>
             <scope>test</scope>
-        </dependency>                  
-                              
+        </dependency>
+
     </dependencies>
 
 </project>