[camel] branch master updated: CAMEL-12549 - upgrade groovy 2.5.1

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-12549 - upgrade groovy 2.5.1

onders-2
This is an automated email from the ASF dual-hosted git repository.

onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new c50435f  CAMEL-12549 - upgrade groovy 2.5.1
c50435f is described below

commit c50435f3486a3b9a4b8e5a3aa0746e9d43fc1e1d
Author: onders <[hidden email]>
AuthorDate: Tue Aug 7 11:24:00 2018 +0300

    CAMEL-12549 - upgrade groovy 2.5.1
---
 buildingtools/pom.xml                                        | 10 ++++++++--
 components/camel-grape/pom.xml                               |  1 -
 .../org/apache/camel/component/grape/MavenCoordinates.groovy |  4 ++--
 components/camel-groovy-dsl/pom.xml                          |  7 ++++++-
 components/camel-groovy/pom.xml                              |  2 +-
 components/camel-grpc/pom.xml                                |  8 +++++++-
 components/camel-protobuf/pom.xml                            |  8 +++++++-
 components/camel-script/pom.xml                              |  2 +-
 parent/pom.xml                                               | 12 +++++++++++-
 pom.xml                                                      |  2 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml           |  2 +-
 11 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index ffb9850..5e8d7bd 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -116,10 +116,16 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
+                        <artifactId>groovy-ant</artifactId>
                         <version>${groovy-version}</version>
                         <scope>runtime</scope>
-                    </dependency>
+    </dependency>
+            <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-xml</artifactId>
+                        <version>${groovy-version}</version>
+                        <scope>runtime</scope>
+    </dependency>
                 </dependencies>
             </plugin>
             <plugin>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 04eaa72..e408f6d 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -63,7 +63,6 @@
       <artifactId>groovy</artifactId>
       <version>${groovy-version}</version>
     </dependency>
-
     <!-- Testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
index 11296c4..315f997 100644
--- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
+++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.grape
 
-import groovy.transform.Immutable
+import groovy.transform.ImmutableBase
 
-@Immutable
+@ImmutableBase
 class MavenCoordinates {
 
     private final String groupId
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 74714c4..62ac12a 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -58,7 +58,12 @@
     </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 -->
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index af53425..b80b2b9 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -53,7 +53,7 @@
          when evaluating groovy expressions -->
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
     </dependency>
 
     <!-- testing -->
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index a9b3cad..1802868 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -175,7 +175,13 @@
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy-version}</version>
+            <scope>runtime</scope>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-ant</artifactId>
             <version>${groovy-version}</version>
             <scope>runtime</scope>
           </dependency>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index fcadb9b..d7a4861 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -128,7 +128,13 @@
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy-version}</version>
+            <scope>runtime</scope>
+          </dependency>
+  <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-ant</artifactId>
             <version>${groovy-version}</version>
             <scope>runtime</scope>
           </dependency>
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 44303e0..28aa265 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -80,7 +80,7 @@
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index d236086..5509b22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4484,7 +4484,17 @@
       <!-- 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>org.codehaus.groovy</groupId>
+        <artifactId>groovy-ant</artifactId>
         <version>${groovy-version}</version>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index c833b6b..7dde856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <errorprone-version>2.5</errorprone-version>
     <mycila-license-version>3.0</mycila-license-version>
     <gmavenplus-plugin-version>1.5</gmavenplus-plugin-version>
-    <groovy-version>2.4.15</groovy-version>
+    <groovy-version>2.5.1</groovy-version>
   </properties>
 
   <mailingLists>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 9c7e449..11b0d95 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -63,7 +63,7 @@
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
             <version>${groovy-version}</version>
           </dependency>
         </dependencies>