This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0dd44d440df1 CAMEL-22369: Upgrade to Groovy 5 (#21742)
0dd44d440df1 is described below
commit 0dd44d440df13d83c45896842ad723991c47f832
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 6 20:52:56 2026 +0100
CAMEL-22369: Upgrade to Groovy 5 (#21742)
---
.../test/java/org/apache/camel/spring/MisspelledRouteRefTest.java | 7 ++++++-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 7 +++++++
parent/pom.xml | 4 ++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java
b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java
index 783eae8675b4..492ec36b48b8 100644
---
a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java
+++
b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.spring;
+import org.apache.camel.CamelException;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class MisspelledRouteRefTest {
@@ -31,8 +34,10 @@ public class MisspelledRouteRefTest {
Exception ex = assertThrows(RuntimeCamelException.class, () ->
main.start());
+ CamelException ce = ObjectHelper.getException(CamelException.class,
ex);
+ assertNotNull(ce, "Expected a CamelException in the cause chain");
assertEquals("Cannot find any routes with this RouteBuilder reference:
RouteBuilderRef[xxxroute]",
- ex.getCause().getCause().getMessage());
+ ce.getMessage());
}
}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
index 51b448658839..8febd2db1815 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
@@ -231,6 +231,13 @@ The deprecated options `buildToool` and `gradleWrapper`
has been removed.
The `camel-tooling-maven` which is used for downloading JARs from Maven has
been refactored to use
the new https://github.com/maveniverse/mima[MIMA] project (jbang is using this
also).
+=== camel-groovy
+
+The Groovy library has been upgraded from 4.0.x to 5.0.x. This is a major
version upgrade.
+If you use Groovy scripts or the Groovy DSL, review the
+https://groovy-lang.org/releasenotes/groovy-5.0.html[Groovy 5.0 release notes]
for potential breaking changes.
+The Spock testing framework has also been upgraded to 2.4-groovy-5.0.
+
=== camel-groovy-xml
The `camel-groovy-xml` has been moved into `camel-groovy` and this JAR is no
longer shipped.
diff --git a/parent/pom.xml b/parent/pom.xml
index 19c5ee947c1b..3c6138531a98 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -224,7 +224,7 @@
<graphql-java-version>25.0</graphql-java-version>
<greenmail-version>2.1.8</greenmail-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
- <groovy-version>4.0.30</groovy-version>
+ <groovy-version>5.0.4</groovy-version>
<grpc-version>1.79.0</grpc-version>
<grpc-google-auth-library-version>1.41.0</grpc-google-auth-library-version>
<grpc-java-jwt-version>4.5.0</grpc-java-jwt-version>
@@ -506,7 +506,7 @@
<solr-version>9.10.1</solr-version>
<solr-zookeeper-version>3.9.4</solr-zookeeper-version>
<splunk-version>1.9.5_1</splunk-version>
- <spock-version>2.4-groovy-4.0</spock-version>
+ <spock-version>2.4-groovy-5.0</spock-version>
<spring-ai-version>1.1.2</spring-ai-version>
<spring-cloud-config-version>5.0.1</spring-cloud-config-version>
<spring-batch-version>6.0.2</spring-batch-version>
