TUSCANY-2359 rationalize the SCA runtime use of cglib and asm dependencies

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

3 files changed, 11 insertions, 4 deletions

diff --git a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 0acafa256d..f2a680cbad 100644
--- a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bnd-LastModified: 1225397324375
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA RMI Binding Extension

-Import-Package: net.sf.cglib.asm,

+Import-Package: org.objectweb.asm,

  net.sf.cglib.core,

  net.sf.cglib.proxy,

  org.apache.tuscany.sca.assembly;version="2.0.0",

diff --git a/java/sca/modules/binding-rmi-runtime/pom.xml b/java/sca/modules/binding-rmi-runtime/pom.xml
index 7214f8cea8..d6d89a24c7 100644
--- a/java/sca/modules/binding-rmi-runtime/pom.xml
+++ b/java/sca/modules/binding-rmi-runtime/pom.xml
@@ -50,11 +50,17 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
+            <artifactId>cglib</artifactId>
             <version>2.2</version>
         </dependency>
 
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
diff --git a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
index 898b518b17..b351bfacc7 100644
--- a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
+++ b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
@@ -25,10 +25,11 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import net.sf.cglib.asm.ClassWriter;
-import net.sf.cglib.asm.Type;
 import net.sf.cglib.core.Constants;
 
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
+
 /**
  * 
  */