Author: davsclaus
Date: Sat Dec 22 21:28:53 2012
New Revision: 1425348

URL: http://svn.apache.org/viewvc?rev=1425348&view=rev
Log:
CAMEL-5898: Use groovy-all as otherwise may have weird class loading issues 
when evaluating groovy expressions.

Modified:
    camel/trunk/components/camel-groovy/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-groovy/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/pom.xml?rev=1425348&r1=1425347&r2=1425348&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/pom.xml (original)
+++ camel/trunk/components/camel-groovy/pom.xml Sat Dec 22 21:28:53 2012
@@ -39,15 +39,13 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
+    <!-- must use groovy-all as otherwise may have weird class loading issues
+         when evaluating groovy expressions -->
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy</artifactId>
+      <artifactId>groovy-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-xml</artifactId>
-    </dependency>
-    
+
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1425348&r1=1425347&r2=1425348&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Dec 22 21:28:53 2012
@@ -1537,12 +1537,7 @@
       <!-- optional scripting support -->
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy</artifactId>
-        <version>${groovy-version}</version>
-      </dependency>
-         <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-xml</artifactId>
+        <artifactId>groovy-all</artifactId>
         <version>${groovy-version}</version>
       </dependency>
       <dependency>


Reply via email to