[
https://issues.apache.org/jira/browse/CAMEL-12549?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16571322#comment-16571322
]
ASF GitHub Bot commented on CAMEL-12549:
----------------------------------------
onderson closed pull request #2455: CAMEL-12549 - upgrade groovy 2.5.1
URL: https://github.com/apache/camel/pull/2455
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index ffb98508e76..5e8d7bdbb89 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 04eaa723c1a..e408f6dc789 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 11296c4b641..315f99725b5 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 74714c41b19..62ac12aef9c 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 af534252b6d..b80b2b94977 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 a9b3cad8a7d..18028687981 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 fcadb9b263c..d7a4861dec0 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 44303e023c0..28aa265f861 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 1dbfb05937f..cf4afbef150 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4485,7 +4485,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 c833b6b7565..7dde85659b8 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 9c7e44921ad..11b0d955bbe 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Upgrade to Groovy 2.5
> ---------------------
>
> Key: CAMEL-12549
> URL: https://issues.apache.org/jira/browse/CAMEL-12549
> Project: Camel
> Issue Type: Task
> Components: camel-groovy
> Reporter: Claus Ibsen
> Assignee: Önder Sezgin
> Priority: Minor
> Fix For: 2.23.0
>
>
> Groovy 2.5 was just released.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
