You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/03/08 15:10:54 UTC
[camel] branch CAMEL-18920/upgrade-groovy-4 created (now 32944da5b8c)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-18920/upgrade-groovy-4
in repository https://gitbox.apache.org/repos/asf/camel.git
at 32944da5b8c CAMEL-18920: Upgrade to Groovy 4.x
This branch includes the following new commits:
new 32944da5b8c CAMEL-18920: Upgrade to Groovy 4.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-18920: Upgrade to Groovy 4.x
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-18920/upgrade-groovy-4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 32944da5b8c50565069691f82c04d047e5ac443e
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Mar 8 16:09:53 2023 +0100
CAMEL-18920: Upgrade to Groovy 4.x
---
buildingtools/pom.xml | 4 ++--
camel-dependencies/pom.xml | 4 ++--
catalog/camel-catalog-maven/pom.xml | 2 +-
components/camel-grape/pom.xml | 2 +-
components/camel-groovy/pom.xml | 2 +-
components/camel-grpc/pom.xml | 4 ++--
components/camel-olingo2/camel-olingo2-component/pom.xml | 4 ++--
components/camel-protobuf/pom.xml | 4 ++--
.../processor/aggregate/AggregationStrategyBeanAdapter.java | 5 +++--
dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml | 2 +-
.../org.codehaus.groovy.runtime.ExtensionModule | 0
dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml | 4 ++--
dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml | 10 +++++-----
dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml | 10 +++++-----
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 10 +++++-----
.../org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy | 2 +-
parent/pom.xml | 4 ++--
pom.xml | 4 ++--
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 2 +-
20 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 7a031214e09..841ba74d973 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -115,13 +115,13 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 483335e4767..166ad9f14ed 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -175,7 +175,7 @@
<jakarta-json-bind-api-version>3.0.0</jakarta-json-bind-api-version>
<jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
<jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
- <gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
+ <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
<google-api-client-version>1.35.2</google-api-client-version>
<google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
@@ -453,7 +453,7 @@
<solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<spark-version>3.3.1</spark-version>
<splunk-version>1.9.0_1</splunk-version>
- <spock-version>2.1-groovy-3.0</spock-version>
+ <spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>4.3.8</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
diff --git a/catalog/camel-catalog-maven/pom.xml b/catalog/camel-catalog-maven/pom.xml
index 28116fa441b..9ef12b787cc 100644
--- a/catalog/camel-catalog-maven/pom.xml
+++ b/catalog/camel-catalog-maven/pom.xml
@@ -93,7 +93,7 @@
<!-- use groovy grape to download JARs as that is easy to use -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 58fed8b7634..3f921c0fcfa 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -53,7 +53,7 @@
<version>${ivy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 86b50d1c4a7..a1e88fe8409 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -42,7 +42,7 @@
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 5823d6cfdca..23aef1a489d 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -206,13 +206,13 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index dfbe264f976..177ce3ca54e 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -117,7 +117,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
@@ -280,7 +280,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index af5c46c9b22..781fa5dd05e 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -110,13 +110,13 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy-version}</version>
<scope>runtime</scope>
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
index 2b314b49352..3b1e3253c27 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
@@ -177,8 +177,9 @@ public final class AggregationStrategyBeanAdapter extends ServiceSupport impleme
return false;
}
- // must not be groovy meta class
- if (method.getName().equals("getMetaClass") || method.getName().equals("setMetaClass")) {
+ // must not be the groovy meta class and lookup methods
+ if (method.getName().equals("getMetaClass") || method.getName().equals("setMetaClass")
+ || method.getName().equals("$getLookup")) {
return false;
}
if (method.getDeclaringClass().getName().startsWith("groovy.lang")) {
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
index be1b0a35c0d..6888fd2107b 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/pom.xml
@@ -58,7 +58,7 @@
<artifactId>camel-endpointdsl</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/resources/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule
similarity index 100%
rename from dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
rename to dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/resources/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
index aebc6ab320b..8fe8f2d0d8e 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml
@@ -124,11 +124,11 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>junit</groupId>
+ <groupId>org.junit.platform</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
index 513a2e3f491..fb8c4adf48e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml
@@ -75,25 +75,25 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>junit</groupId>
+ <groupId>org.junit.platform</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index a7a02b092fa..47bb0e5229b 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -70,25 +70,25 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>junit</groupId>
+ <groupId>org.junit.platform</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
index a80f63e6dbb..170a32931e9 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
@@ -77,11 +77,11 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>junit</groupId>
+ <groupId>org.junit.platform</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -194,14 +194,14 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
<version>${groovy-version}</version>
<scope>test</scope>
</dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
index f30ec14cb1c..a3dd1005d56 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
@@ -579,7 +579,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
context.routeDefinitions.size() == 3
// global stream caching enabled
- context.streamCaching == true
+ context.isStreamCaching() == true
with (context.routeDefinitions[1]) {
template == true
diff --git a/parent/pom.xml b/parent/pom.xml
index d120443a9c7..3423490f15b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -170,7 +170,7 @@
<jakarta-json-bind-api-version>3.0.0</jakarta-json-bind-api-version>
<jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
<jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
- <gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
+ <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
<google-api-client-version>1.35.2</google-api-client-version>
<google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
@@ -448,7 +448,7 @@
<solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<spark-version>3.3.1</spark-version>
<splunk-version>1.9.0_1</splunk-version>
- <spock-version>2.1-groovy-3.0</spock-version>
+ <spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>4.3.8</spring-batch-version>
<spring-data-redis-version>2.6.2</spring-data-redis-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
diff --git a/pom.xml b/pom.xml
index 6d85750a1c6..0906a23dad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,8 +138,8 @@
<jaxb-jxc-version>4.0.1</jaxb-jxc-version>
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
- <gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
- <groovy-version>3.0.15</groovy-version>
+ <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
+ <groovy-version>4.0.9</groovy-version>
<cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
<camel.javadoc.offline>false</camel.javadoc.offline>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index d4123499f86..718f94d3fbe 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -243,7 +243,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index 23725561013..289497f5824 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -121,7 +121,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>