Update cglib, jaxb-impl versions

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

8 files changed, 17 insertions, 12 deletions

diff --git a/java/sca/modules/binding-corba-runtime/pom.xml b/java/sca/modules/binding-corba-runtime/pom.xml
index 1bf6d22095..77b1a02b55 100644
--- a/java/sca/modules/binding-corba-runtime/pom.xml
+++ b/java/sca/modules/binding-corba-runtime/pom.xml
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
+			<version>2.2</version>
 			<scope>compile</scope>
 		</dependency>
     </dependencies>
diff --git a/java/sca/modules/binding-ejb-runtime/pom.xml b/java/sca/modules/binding-ejb-runtime/pom.xml
index 979383ec99..357ecf9206 100644
--- a/java/sca/modules/binding-ejb-runtime/pom.xml
+++ b/java/sca/modules/binding-ejb-runtime/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
+            <version>2.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-rmi-runtime/pom.xml b/java/sca/modules/binding-rmi-runtime/pom.xml
index ecf3683c52..7214f8cea8 100644
--- a/java/sca/modules/binding-rmi-runtime/pom.xml
+++ b/java/sca/modules/binding-rmi-runtime/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
+            <version>2.2</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index 4f657103d5..e277160aae 100644
--- a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
@@ -28,8 +28,8 @@ import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 
 import net.sf.cglib.asm.ClassWriter;
-import net.sf.cglib.asm.Constants;
 import net.sf.cglib.asm.Type;
+import net.sf.cglib.core.Constants;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
@@ -153,11 +153,11 @@ public class RMIServiceBindingProvider implements ServiceBindingProvider {
      */
     private byte[] generateRemoteInterface(Class serviceInterface) {
         String interfazeName = serviceInterface.getName();
-        ClassWriter cw = new ClassWriter(false);
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
 
         String simpleName = serviceInterface.getSimpleName();
         cw.visit(Constants.V1_5, Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT + Constants.ACC_INTERFACE, interfazeName
-            .replace('.', '/'), "java/lang/Object", new String[] {"java/rmi/Remote"}, simpleName + ".java");
+            .replace('.', '/'), null, "java/lang/Object", new String[] {"java/rmi/Remote"});
 
         StringBuffer argsAndReturn = null;
         Method[] methods = serviceInterface.getMethods();
@@ -175,8 +175,8 @@ public class RMIServiceBindingProvider implements ServiceBindingProvider {
             cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT,
                            method.getName(),
                            argsAndReturn.toString(),
-                           new String[] {"java/rmi/RemoteException"},
-                           null);
+                           null,
+                           new String[] {"java/rmi/RemoteException"});
         }
         cw.visitEnd();
         return cw.toByteArray();
diff --git a/java/sca/modules/core/pom.xml b/java/sca/modules/core/pom.xml
index e42a05ec52..2e231bf36a 100644
--- a/java/sca/modules/core/pom.xml
+++ b/java/sca/modules/core/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
+            <version>2.2</version>
         </dependency>        
     </dependencies>
 
diff --git a/java/sca/modules/databinding-jaxb/pom.xml b/java/sca/modules/databinding-jaxb/pom.xml
index 3fbe9455bc..4e97fd271a 100644
--- a/java/sca/modules/databinding-jaxb/pom.xml
+++ b/java/sca/modules/databinding-jaxb/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.9</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -151,7 +151,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.5</version>
+                <version>0.6.3</version>
                 <executions>
                     <execution>
                         <id>generate-jaxb</id>
diff --git a/java/sca/modules/interface-java-jaxws/pom.xml b/java/sca/modules/interface-java-jaxws/pom.xml
index cd0622c3de..c5a7e8f368 100644
--- a/java/sca/modules/interface-java-jaxws/pom.xml
+++ b/java/sca/modules/interface-java-jaxws/pom.xml
@@ -158,7 +158,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
+                <version>1.11</version>
                 <executions>
                     <execution>
                         <id>wsimport</id>
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 18c23bc866..06ef8f9cc4 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -66,6 +66,11 @@
         <module>node-impl</module>
         <module>node-launcher</module>
         <module>node-launcher-equinox</module>
+
+        <module>host-rmi</module>
+        <module>binding-rmi</module>
+        <module>binding-rmi-runtime</module>
+
         <module>policy</module>
         <module>policy-security</module>
         <module>policy-xml</module>