Author: jbonofre
Date: Fri Jul 15 13:49:39 2011
New Revision: 1147150
URL: http://svn.apache.org/viewvc?rev=1147150&view=rev
Log:
[SMX4-881] Upgrade to Groovy 1.8.0.
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1147150&r1=1147149&r2=1147150&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Fri Jul 15 13:49:39 2011
@@ -306,8 +306,8 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm2.bundle.version}</bundle>
<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.groovy/${groovy.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>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
<bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1147150&r1=1147149&r2=1147150&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Jul 15 13:49:39 2011
@@ -155,7 +155,6 @@
<commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
<drools.bundle.version>5.1.1_1</drools.bundle.version>
<fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
- <groovy.bundle.version>1.5.6_4</groovy.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
@@ -202,6 +201,7 @@
<commons-jexl.version>2.0.1</commons-jexl.version>
<commons-logging.version>1.1.1</commons-logging.version>
<drools.version>5.1.1</drools.version>
+ <groovy.version>1.8.0</groovy.version>
<javax.mail.version>1.4.4</javax.mail.version>
<jaxp-ri.version>1.4.4</jaxp-ri.version>
<xerces.version>2.11.0</xerces.version>
@@ -411,11 +411,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.groovy</artifactId>
- <version>${groovy.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxb-impl.bundle.version}</version>
</dependency>
@@ -643,6 +638,11 @@
<version>${jettison.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>${drools.version}</version>
