TUSCANY-3794: Update the jython version to match implementation.python which fixes the jython incompatibility, but that then has a conflict with JRuby so update the JRuby level too, and that causes something funny in the JRuby refernce test whcih only seems to work now with the target component defined before the reference component in the scdl so update that too.

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

2 files changed, 22 insertions, 8 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
index 3b1ff92fba..596fbee03c 100644
--- a/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
@@ -57,8 +57,22 @@
 
         <dependency>
             <groupId>org.apache.bsf</groupId>
-            <artifactId>bsf-all</artifactId>
-            <version>3.0</version>    
+            <artifactId>bsf-utils</artifactId>
+            <version>3.1</version>    
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.bsf</groupId>
+                    <artifactId>bsf-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.bsf</groupId>
+                    <artifactId>bsf-engines</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -143,7 +157,7 @@
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.5</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -164,7 +178,7 @@
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython</artifactId>
-            <version>2.2.1</version>
+            <version>2.5.2-beta1</version>
             <scope>runtime</scope>
          </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index da4e721faf..710772c394 100644
--- a/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
@@ -21,6 +21,10 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://sample"

            name="JRubyReference">

 

+    <component name="TargetComponent">

+        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

+    </component>

+

     <component name="ClientComponent">

         <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

         <reference name="delegate" target="ReferenceComponent"></reference>

@@ -31,8 +35,4 @@
         <reference name="ref" target="TargetComponent" />

     </component>

 

-    <component name="TargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

-    </component>

-

 </composite>