servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r1462613 - in /servicemix/smx4/features/trunk: assemblies/apache-servicemix/src/main/filtered-resources/features.xml pom.xml
Date Fri, 29 Mar 2013 19:15:06 GMT
Author: janstey
Date: Fri Mar 29 19:15:06 2013
New Revision: 1462613

URL: http://svn.apache.org/r1462613
Log:
SMX4-1424 - Use official org.jruby:jruby lib

Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1462613&r1=1462612&r2=1462613&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Fri Mar 29 19:15:06 2013
@@ -289,7 +289,7 @@
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
         <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.jruby/jruby/${jruby.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
         <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1462613&r1=1462612&r2=1462613&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Mar 29 19:15:06 2013
@@ -165,7 +165,7 @@
         <jaxp-ri.bundle.version>1.4.4_2</jaxp-ri.bundle.version>
         <jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
         <jdom.bundle.version>1.1_4</jdom.bundle.version>
-        <jruby.bundle.version>1.1.2_3</jruby.bundle.version>
+        <jruby.version>1.7.2</jruby.version>
         <josql.bundle.version>1.5_4</josql.bundle.version>
         <jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
         <opensaml.bundle.version>2.4.1_1</opensaml.bundle.version>
@@ -412,9 +412,9 @@
                <version>${josql.bundle.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.servicemix.bundles</groupId>
-               <artifactId>org.apache.servicemix.bundles.jruby</artifactId>
-               <version>${jruby.bundle.version}</version>
+               <groupId>org.jruby</groupId>
+               <artifactId>jruby</artifactId>
+               <version>${jruby.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.servicemix.bundles</groupId>



Mime
View raw message