Author: ningjiang
Date: Thu Dec 20 07:05:49 2012
New Revision: 1424347

URL: http://svn.apache.org/viewvc?rev=1424347&view=rev
Log:
CAMEL-5898 depend on modularized groovy 2.0.x libs instead of groovy-all

Modified:
    camel/trunk/components/camel-groovy/pom.xml
    camel/trunk/components/camel-script/pom.xml
    camel/trunk/components/camel-solr/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=1424347&r1=1424346&r2=1424347&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/pom.xml (original)
+++ camel/trunk/components/camel-groovy/pom.xml Thu Dec 20 07:05:49 2012
@@ -30,7 +30,7 @@
   <description>Camel Groovy support</description>
 
   <properties>
-         
<camel.osgi.export.pkg>org.apache.camel.language.groovy.*</camel.osgi.export.pkg>
+         
<camel.osgi.export.pkg>org.apache.camel.language.groovy.*,org.apache.camel.groovy.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -41,9 +41,13 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
+    </dependency>
+    
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -61,5 +65,47 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
+  
+  <build>
+       <plugins>
+         <plugin>
+           <artifactId>maven-compiler-plugin</artifactId>
+           <configuration>
+             <compilerId>groovy-eclipse-compiler</compilerId>
+             <!-- set verbose to be true if you want lots of uninteresting 
messages -->
+             <!-- <verbose>true</verbose> -->
+           </configuration>
+           <dependencies>
+             <dependency>
+               <groupId>org.codehaus.groovy</groupId>
+               <artifactId>groovy-eclipse-compiler</artifactId>
+               <version>2.7.0-01</version>
+             </dependency>
+           </dependencies>
+         </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <configuration>
+              <additionalProjectnatures>
+                  
<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
+              </additionalProjectnatures>
+              <classpathContainers>
+                 
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                 <classpathContainer>GROOVY_DSL_SUPPORT</classpathContainer>
+              </classpathContainers>              
+          </configuration>
+      </plugin>          
+       </plugins>
+       <!-- Need to explicitly specify test resources, otherwise maven eclipse 
plugin
+            does not include src/test/groovy as source folder -->
+    <testResources>
+      <testResource>
+        <directory>src/test/groovy</directory>
+      </testResource>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
+  </build>
 </project>

Modified: camel/trunk/components/camel-script/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1424347&r1=1424346&r2=1424347&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Thu Dec 20 07:05:49 2012
@@ -91,10 +91,15 @@
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+            <scope>test</scope>
+        </dependency>          
+        <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby</artifactId>
             <scope>test</scope>

Modified: camel/trunk/components/camel-solr/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/pom.xml?rev=1424347&r1=1424346&r2=1424347&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/pom.xml (original)
+++ camel/trunk/components/camel-solr/pom.xml Thu Dec 20 07:05:49 2012
@@ -88,6 +88,10 @@
           <groupId>edu.ucar</groupId>
           <artifactId>netcdf</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -125,7 +129,17 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-jsr223</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1424347&r1=1424346&r2=1424347&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Dec 20 07:05:49 2012
@@ -1537,13 +1537,18 @@
       <!-- optional scripting support -->
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-all</artifactId>
+        <artifactId>groovy</artifactId>
+        <version>${groovy-version}</version>
+      </dependency>
+         <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-xml</artifactId>
         <version>${groovy-version}</version>
       </dependency>
       <dependency>
-        <groupId>com.sun.script</groupId>
-        <artifactId>groovy-engine</artifactId>
-        <version>20070112</version>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-jsr223</artifactId>
+        <version>${groovy-version}</version>
       </dependency>
 
       <!-- optional ognl support -->


Reply via email to