You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/12/11 14:15:37 UTC
(camel-k-runtime) 03/03: chore(ci): new groovy dependency maven gav
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit d01a73c7278dbefb000d8d96e7156c9dad1d6061
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Dec 11 14:40:20 2023 +0100
chore(ci): new groovy dependency maven gav
---
pom.xml | 12 ++++++------
support/camel-k-maven-plugin/pom.xml | 8 ++++----
.../src/it/generate-rest-dsl-from-v2/verify.groovy | 2 +-
.../src/it/generate-rest-dsl-from-v3/verify.groovy | 2 +-
support/camel-k-test/pom.xml | 12 ++++++------
support/pom.xml | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7efe1293..f41ab8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17</quarkus-native-builder-image>
<!-- camel-k-runtime specific -->
- <groovy-version>3.0.19</groovy-version>
+ <groovy-version>4.0.16</groovy-version>
<immutables-version>2.10.0</immutables-version>
<commons-collections4-version>4.4</commons-collections4-version>
<assertj-version>3.24.2</assertj-version>
@@ -533,27 +533,27 @@
<!-- groovy -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-yaml</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml
index 25f1c1ab..88a17524 100644
--- a/support/camel-k-maven-plugin/pom.xml
+++ b/support/camel-k-maven-plugin/pom.xml
@@ -212,22 +212,22 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-yaml</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy-version}</version>
</dependency>
diff --git a/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
index 9dfe128c..38cc8515 100644
--- a/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
+++ b/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
@@ -17,7 +17,7 @@
new File(basedir, "document.xml").withReader {
- def document = new groovy.util.XmlSlurper().parse(it)
+ def document = new groovy.xml.XmlSlurper().parse(it)
assert document.rest.@path == '/camel/'
assert document.rest.get.size() == 1
diff --git a/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
index 6be540e4..215a4d8a 100644
--- a/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
+++ b/support/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
@@ -16,7 +16,7 @@
*/
new File(basedir, "document.xml").withReader {
- def document = new groovy.util.XmlSlurper().parse(it)
+ def document = new groovy.xml.XmlSlurper().parse(it)
assert document.rest.@path == '/v1'
assert document.rest.get.size() == 2
diff --git a/support/camel-k-test/pom.xml b/support/camel-k-test/pom.xml
index e2de009c..945551a3 100644
--- a/support/camel-k-test/pom.xml
+++ b/support/camel-k-test/pom.xml
@@ -49,7 +49,7 @@
<artifactId>rest-assured</artifactId>
<exclusions>
<exclusion>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
@@ -60,23 +60,23 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-yaml</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
</dependency>
</dependencies>
diff --git a/support/pom.xml b/support/pom.xml
index 767de617..2cc75f2f 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -32,10 +32,10 @@
<module>camel-k-annotations</module>
<module>camel-k-apt</module>
<module>camel-k-catalog-model</module>
- <module>camel-k-catalog</module>
<module>camel-k-maven-plugin</module>
<module>camel-k-test</module>
<module>camel-k-itests-support</module>
+ <module>camel-k-catalog</module>
<module>camel-k-runtime-bom</module>
<module>camel-k-maven-logging</module>
</modules>