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/06/06 15:37:19 UTC
[camel-quarkus] branch 4960/upgrade-groovy created (now ab80b16bef)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch 4960/upgrade-groovy
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
at ab80b16bef Ref #4960: Upgrade Groovy to 4.0.12
This branch includes the following new commits:
new ab80b16bef Ref #4960: Upgrade Groovy to 4.0.12
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-quarkus] 01/01: Ref #4960: Upgrade Groovy to 4.0.12
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch 4960/upgrade-groovy
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ab80b16befffa2eabe82ae83bc06eada32a9f2e9
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Tue Jun 6 17:36:46 2023 +0200
Ref #4960: Upgrade Groovy to 4.0.12
---
docs/pom.xml | 18 ++++----
.../aws2-quarkus-client/aws2-ddb/pom.xml | 8 ++--
.../aws2-quarkus-client/aws2-s3/pom.xml | 8 ++--
.../aws2-quarkus-client/aws2-ses/pom.xml | 8 ++--
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 8 ++--
.../aws2-quarkus-client/aws2-sqs/pom.xml | 8 ++--
integration-test-groups/aws2/aws2-s3/pom.xml | 8 ++--
integration-tests-jvm/xml-grouped/pom.xml | 8 ++--
integration-tests/aws2-grouped/pom.xml | 8 ++--
.../aws2-quarkus-client-grouped/pom.xml | 28 ++++++++----
integration-tests/azure-grouped/pom.xml | 8 ++--
integration-tests/compression-grouped/pom.xml | 8 ++--
integration-tests/cxf-soap-grouped/pom.xml | 8 ++--
integration-tests/dataformats-json-grouped/pom.xml | 8 ++--
integration-tests/foundation-grouped/pom.xml | 8 ++--
integration-tests/grpc/pom.xml | 36 +++++++++-------
integration-tests/mongodb-grouped/pom.xml | 8 ++--
integration-tests/xml-grouped/pom.xml | 8 ++--
pom.xml | 50 +++++++++++-----------
poms/bom/pom.xml | 2 +-
poms/build-parent/pom.xml | 16 ++++---
tooling/scripts/copy-tests.groovy | 10 ++---
tooling/scripts/group-tests.groovy | 18 ++++----
tooling/scripts/report-build-status.groovy | 16 +++----
tooling/scripts/sanity-checks.groovy | 2 +-
tooling/scripts/update-antora-config.groovy | 2 +-
tooling/scripts/update-antora-yaml.groovy | 2 +-
tooling/scripts/validate-extension-metadata.groovy | 3 +-
28 files changed, 183 insertions(+), 140 deletions(-)
diff --git a/docs/pom.xml b/docs/pom.xml
index 037b5251b8..469b107969 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -33,8 +33,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>update-antora-config</id>
@@ -43,10 +43,9 @@
</goals>
<phase>validate</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-config.groovy</source>
- <properties>
- <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- </properties>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-config.groovy</script>
+ </scripts>
</configuration>
</execution>
<execution>
@@ -56,10 +55,9 @@
</goals>
<phase>validate</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</source>
- <properties>
- <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- </properties>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
index 4d045c0a6c..d84b4f2b30 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
@@ -113,8 +113,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -123,7 +123,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
index 217a29d737..74ef7d7974 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
@@ -117,8 +117,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -127,7 +127,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
index 52483b3975..f8ef4dd9ff 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
@@ -118,8 +118,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -128,7 +128,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
index b7a3e40590..a60e2a29bc 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
@@ -121,8 +121,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -131,7 +131,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
index 9602099585..44d923d379 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
@@ -118,8 +118,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -128,7 +128,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-test-groups/aws2/aws2-s3/pom.xml b/integration-test-groups/aws2/aws2-s3/pom.xml
index 872bd64b4a..d2572a336c 100644
--- a/integration-test-groups/aws2/aws2-s3/pom.xml
+++ b/integration-test-groups/aws2/aws2-s3/pom.xml
@@ -108,8 +108,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -118,7 +118,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-tests-jvm/xml-grouped/pom.xml b/integration-tests-jvm/xml-grouped/pom.xml
index 1e24bc8297..04ba515b31 100644
--- a/integration-tests-jvm/xml-grouped/pom.xml
+++ b/integration-tests-jvm/xml-grouped/pom.xml
@@ -100,8 +100,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -110,7 +110,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/xml/jvm</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/aws2-grouped/pom.xml b/integration-tests/aws2-grouped/pom.xml
index 8281d6e714..30cf19ce25 100644
--- a/integration-tests/aws2-grouped/pom.xml
+++ b/integration-tests/aws2-grouped/pom.xml
@@ -134,8 +134,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -144,7 +144,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/aws2-quarkus-client-grouped/pom.xml b/integration-tests/aws2-quarkus-client-grouped/pom.xml
index 609236849e..03853545a5 100644
--- a/integration-tests/aws2-quarkus-client-grouped/pom.xml
+++ b/integration-tests/aws2-quarkus-client-grouped/pom.xml
@@ -153,8 +153,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -163,7 +163,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2-quarkus-client</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
@@ -179,7 +181,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
@@ -195,7 +199,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
@@ -211,7 +217,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
@@ -227,7 +235,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
@@ -243,7 +253,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
+ </scripts>
<properties>
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
diff --git a/integration-tests/azure-grouped/pom.xml b/integration-tests/azure-grouped/pom.xml
index e100982f4e..6143863e08 100644
--- a/integration-tests/azure-grouped/pom.xml
+++ b/integration-tests/azure-grouped/pom.xml
@@ -106,8 +106,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -116,7 +116,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/azure</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/compression-grouped/pom.xml b/integration-tests/compression-grouped/pom.xml
index bd5bde0257..52aee9f613 100644
--- a/integration-tests/compression-grouped/pom.xml
+++ b/integration-tests/compression-grouped/pom.xml
@@ -84,8 +84,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -94,7 +94,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/compression</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/cxf-soap-grouped/pom.xml b/integration-tests/cxf-soap-grouped/pom.xml
index 68f9007d5e..a3cd9785a7 100644
--- a/integration-tests/cxf-soap-grouped/pom.xml
+++ b/integration-tests/cxf-soap-grouped/pom.xml
@@ -119,8 +119,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -129,7 +129,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/cxf-soap</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/dataformats-json-grouped/pom.xml b/integration-tests/dataformats-json-grouped/pom.xml
index 25a449ec74..d481f6b227 100644
--- a/integration-tests/dataformats-json-grouped/pom.xml
+++ b/integration-tests/dataformats-json-grouped/pom.xml
@@ -121,8 +121,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -131,7 +131,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/dataformats-json</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index bd9f3a0793..01c2d3633a 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -191,8 +191,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -201,7 +201,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/foundation</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/grpc/pom.xml b/integration-tests/grpc/pom.xml
index b25d1528d9..22f60c306e 100644
--- a/integration-tests/grpc/pom.xml
+++ b/integration-tests/grpc/pom.xml
@@ -98,8 +98,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<!-- Skip code generation & tests on unsupported platforms -->
@@ -109,11 +109,13 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- String platformUnsupported = project.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true'
- project.properties['skipTests'] = platformUnsupported
- project.properties['cq.skip.protobuf'] = platformUnsupported || project.properties.containsKey('quickly')
- </source>
+ <scripts>
+ <script>
+ String platformUnsupported = project.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true'
+ project.properties['skipTests'] = platformUnsupported
+ project.properties['cq.skip.protobuf'] = platformUnsupported || project.properties.containsKey('quickly')
+ </script>
+ </scripts>
</configuration>
</execution>
<execution>
@@ -134,15 +136,17 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- def buildDir = project.build.directory
- new File("${buildDir}/generated-sources").eachFileRecurse { file ->
- if (file.name.endsWith(".java") && file.text.contains("javax.annotation.Generated")) {
- def modifiedContent = file.text.replace("javax", "jakarta")
- file.write(modifiedContent)
- }
- }
- </source>
+ <scripts>
+ <script><![CDATA[
+ def buildDir = project.build.directory
+ new File("${buildDir}/generated-sources").eachFileRecurse { file ->
+ if (file.name.endsWith('.java') && file.text.contains('javax.annotation.Generated')) {
+ def modifiedContent = file.text.replace('javax', 'jakarta')
+ file.write(modifiedContent)
+ }
+ }
+ ]]></script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/integration-tests/mongodb-grouped/pom.xml b/integration-tests/mongodb-grouped/pom.xml
index 933847c651..b43b5d02c2 100644
--- a/integration-tests/mongodb-grouped/pom.xml
+++ b/integration-tests/mongodb-grouped/pom.xml
@@ -77,8 +77,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -87,7 +87,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/mongodb</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/integration-tests/xml-grouped/pom.xml b/integration-tests/xml-grouped/pom.xml
index ca1860feb4..df6aa428bc 100644
--- a/integration-tests/xml-grouped/pom.xml
+++ b/integration-tests/xml-grouped/pom.xml
@@ -87,8 +87,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>group-sources</id>
@@ -97,7 +97,9 @@
</goals>
<phase>generate-sources</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
+ </scripts>
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/xml/native</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
diff --git a/pom.xml b/pom.xml
index d8ca88028a..730209ac59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,8 +169,8 @@
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<formatter-maven-plugin.version>2.23.0</formatter-maven-plugin.version>
- <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
- <groovy.version>3.0.14</groovy.version>
+ <gmavenplus-maven-plugin.version>3.0.0</gmavenplus-maven-plugin.version>
+ <groovy.version>4.0.12</groovy.version>
<impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
@@ -436,22 +436,15 @@
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>${groovy-maven-plugin.version}</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-maven-plugin.version}</version>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <!-- groovy-testng depends on testng 7.2.0 which is not on maven central -->
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-testng</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</plugin>
@@ -715,8 +708,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>validate-github-workflows</id>
@@ -726,7 +719,9 @@
</goals>
<phase>process-resources</phase>
<configuration>
- <source>file:${project.basedir}/tooling/scripts/validate-github-workflows.groovy</source>
+ <scripts>
+ <script>file:${project.basedir}/tooling/scripts/validate-github-workflows.groovy</script>
+ </scripts>
</configuration>
</execution>
<execution>
@@ -737,7 +732,9 @@
</goals>
<phase>verify</phase>
<configuration>
- <source>file:${project.basedir}/tooling/scripts/validate-extension-metadata.groovy</source>
+ <scripts>
+ <script>file:${project.basedir}/tooling/scripts/validate-extension-metadata.groovy</script>
+ </scripts>
<properties>
<extensionDirs>extensions-core,extensions-support,extensions</extensionDirs>
</properties>
@@ -1064,8 +1061,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>update-antora-yaml</id>
@@ -1075,10 +1072,9 @@
</goals>
<phase>validate</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</source>
- <properties>
- <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- </properties>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -1247,8 +1243,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>build-notify</id>
@@ -1258,7 +1254,9 @@
</goals>
<phase>verify</phase>
<configuration>
- <source>file:${project.basedir}/tooling/scripts/report-build-status.groovy</source>
+ <scripts>
+ <script>file:${project.basedir}/tooling/scripts/report-build-status.groovy</script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index b6b7bae3df..63140acf54 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -44,7 +44,7 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-bom</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index fc2b91432c..000e4af686 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -193,8 +193,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>sanity-checks</id>
@@ -203,7 +203,9 @@
</goals>
<phase>validate</phase>
<configuration>
- <source>file:${maven.multiModuleProjectDirectory}/tooling/scripts/sanity-checks.groovy</source>
+ <scripts>
+ <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/sanity-checks.groovy</script>
+ </scripts>
<properties>
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
</properties>
@@ -266,8 +268,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>sanity-checks</id>
@@ -288,8 +290,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>sanity-checks</id>
diff --git a/tooling/scripts/copy-tests.groovy b/tooling/scripts/copy-tests.groovy
index 4c00f779a4..92593ebf0d 100644
--- a/tooling/scripts/copy-tests.groovy
+++ b/tooling/scripts/copy-tests.groovy
@@ -31,17 +31,17 @@ import groovy.ant.AntBuilder
* so that the tests can be executed. Use of ('copy-tests.exclude') allows to exclude files.
*/
-final Path sourceDir = Paths.get(properties['copy-tests.source.dir'])
-final Path destinationModuleDir = Paths.get(properties['copy-tests.dest.module.dir'])
-final String excl = properties['copy-tests.excludes']
-final String classNamePrefix = properties['group-tests.class.name.prefix'] ?: ""
+final Path sourceDir = Paths.get(binding.properties.variables.'copy-tests.source.dir')
+final Path destinationModuleDir = Paths.get(binding.properties.variables.'copy-tests.dest.module.dir')
+final String excl = binding.properties.variables.'copy-tests.excludes'
+final String classNamePrefix = binding.properties.variables.'group-tests.class.name.prefix' ?: ""
copyResources(sourceDir.resolve('src/main/resources'), destinationModuleDir.resolve('target/classes'), excl)
copyResources(sourceDir.resolve('src/main/java'), destinationModuleDir.resolve('target/src/main/java'), excl)
copyResources(sourceDir.resolve('src/test/java'), destinationModuleDir.resolve('target/src/test/java'), excl)
copyResources(sourceDir.resolve('src/test/resources'), destinationModuleDir.resolve('target/test-classes'), excl)
-String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
+String scriptDir = new File(System.getProperty('maven.multiModuleProjectDirectory') + '/tooling/scripts')
File sourceFile = new File("${scriptDir}/group-test-utils.groovy")
Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(sourceFile);
GroovyObject utils = (GroovyObject) groovyClass.getDeclaredConstructor().newInstance();
diff --git a/tooling/scripts/group-tests.groovy b/tooling/scripts/group-tests.groovy
index 565e1df4bd..0e3c0be04c 100644
--- a/tooling/scripts/group-tests.groovy
+++ b/tooling/scripts/group-tests.groovy
@@ -31,11 +31,11 @@ import groovy.ant.AntBuilder
* one destination module (`group-tests.dest.module.dir`) so that the tests can be executed all at once
*/
-final Path sourceDir = Paths.get(properties['group-tests.source.dir'])
-final String[] concatRelPaths = properties['group-tests.concat.rel.paths'].split('[\\s,]+')
-final Path destinationModuleDir = Paths.get(properties['group-tests.dest.module.dir'])
-final String excludes = properties['group-tests.files.excludes'] ?: ""
-final String classNamePrefix = properties['group-tests.class.name.prefix'] ?: ""
+final Path sourceDir = Paths.get(binding.properties.variables.'group-tests.source.dir')
+final String[] concatRelPaths = binding.properties.variables.'group-tests.concat.rel.paths'.split('[\\s,]+')
+final Path destinationModuleDir = Paths.get(binding.properties.variables.'group-tests.dest.module.dir')
+final String excludes = binding.properties.variables.'group-tests.files.excludes' ?: ""
+final String classNamePrefix = binding.properties.variables.'group-tests.class.name.prefix' ?: ""
final List<String> fileExcludes = excludes.split('[\\s,]+') as List
/* Property names whose values originating from distinct application.properties files can be concatenated using comma as a separator */
final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set
@@ -63,7 +63,7 @@ Files.list(sourceDir)
srcDestMap.forEach { src, dest -> copyResources(p.resolve(src), dest) }
}
-String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
+String scriptDir = new File(System.getProperty('maven.multiModuleProjectDirectory') + '/tooling/scripts')
File sourceFile = new File("${scriptDir}/group-test-utils.groovy")
Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(sourceFile)
GroovyObject utils = (GroovyObject) groovyClass.getDeclaredConstructor().newInstance()
@@ -97,10 +97,10 @@ class ResourceConcatenator {
private final List<Path> visitedPaths = new ArrayList<>()
private final Set<String> commaConcatenatePropertyNames;
- public ResourceConcatenator(Set<String> commaConcatenatePropertyNames) {
+ ResourceConcatenator(Set<String> commaConcatenatePropertyNames) {
this.commaConcatenatePropertyNames = commaConcatenatePropertyNames;
}
- public ResourceConcatenator append(Path path) {
+ ResourceConcatenator append(Path path) {
if (Files.exists(path)) {
if (path.getFileName().toString().endsWith(".properties")) {
Properties newProps = new Properties()
@@ -126,7 +126,7 @@ class ResourceConcatenator {
return this
}
- public void store(Path path) {
+ void store(Path path) {
Files.createDirectories(path.getParent())
if (path.getFileName().toString().endsWith(".properties")) {
path.withOutputStream { out ->
diff --git a/tooling/scripts/report-build-status.groovy b/tooling/scripts/report-build-status.groovy
index 8cd6231f3b..dd6ea84ca9 100644
--- a/tooling/scripts/report-build-status.groovy
+++ b/tooling/scripts/report-build-status.groovy
@@ -20,7 +20,7 @@ import org.kohsuke.github.*
/**
* A script to report on the build status of synchronization for branches camel-main and quarkus-main.
*
- * A GitHub issue ID is passed to this script from the GitHub workflow. The issue is inteded to be repeatedly closed / reopened
+ * A GitHub issue ID is passed to this script from the GitHub workflow. The issue is intended to be repeatedly closed / reopened
* whenever a build workflow run is successful / unsuccessful.
*
* If failures were encountered in the build, a comment is appended to a specified GitHub issue, with the body containing
@@ -32,17 +32,17 @@ import org.kohsuke.github.*
* should automatically merge the latest changes from the main branch, to the target branch.
*/
-final String TOKEN = properties['token']
-final String STATUS = properties['status'].toLowerCase(Locale.US)
-final String BUILD_ID = properties['buildId']
-final String REPO = properties['repo']
-final String BRANCH = properties['branch']
+final String TOKEN = System.getProperty('token')
+final String STATUS = System.getProperty('status').toLowerCase(Locale.US)
+final String BUILD_ID = System.getProperty('buildId')
+final String REPO = System.getProperty('repo')
+final String BRANCH = System.getProperty('branch')
final String BRANCH_NAME = "${BRANCH.split('-')[0].capitalize()} ${BRANCH.split('-')[1].capitalize()}"
-final String BRANCH_COMMIT = properties['branch-commit'] ?: 'Unknown'
+final String BRANCH_COMMIT = System.getProperty('branch-commit') ?: 'Unknown'
final String ACTIONS_URL = "https://github.com/${REPO}/actions/runs/${BUILD_ID.split("-")[0]}"
final String BRANCH_URL = "https://github.com/${REPO}/tree/${BRANCH}"
final String ISSUE_LABEL = "build/${BRANCH}"
-final Integer ISSUE_ID = properties['issueId'] as Integer
+final Integer ISSUE_ID = System.getProperty('issueId') as Integer
class Utils {
static boolean workflowHasPreviousFailures(GHIssue issue, String buildId) {
diff --git a/tooling/scripts/sanity-checks.groovy b/tooling/scripts/sanity-checks.groovy
index d030266b57..4dd1b161cf 100644
--- a/tooling/scripts/sanity-checks.groovy
+++ b/tooling/scripts/sanity-checks.groovy
@@ -22,7 +22,7 @@ import java.nio.file.Paths
final List<String> badDeps = []
final File pomXml = new File(project.basedir, "pom.xml")
-final Path treeRootDir = Paths.get(properties['maven.multiModuleProjectDirectory'])
+final Path treeRootDir = Paths.get(System.getProperty('maven.multiModuleProjectDirectory'))
final Path relativePomPath = treeRootDir.relativize(pomXml.toPath().normalize())
if (pomXml.exists()) {
diff --git a/tooling/scripts/update-antora-config.groovy b/tooling/scripts/update-antora-config.groovy
index 109c9cce5f..126f83bbe3 100644
--- a/tooling/scripts/update-antora-config.groovy
+++ b/tooling/scripts/update-antora-config.groovy
@@ -27,7 +27,7 @@ import java.util.regex.Pattern
import java.util.regex.Matcher
-final Path treeRootDir = Paths.get(properties['maven.multiModuleProjectDirectory'])
+final Path treeRootDir = Paths.get(System.getProperty('maven.multiModuleProjectDirectory'))
final List<Path> replaceInFiles = [
treeRootDir.resolve('docs/antora.yml')
diff --git a/tooling/scripts/update-antora-yaml.groovy b/tooling/scripts/update-antora-yaml.groovy
index 858b7d8cad..c4003a8d16 100644
--- a/tooling/scripts/update-antora-yaml.groovy
+++ b/tooling/scripts/update-antora-yaml.groovy
@@ -26,7 +26,7 @@ import java.util.regex.Matcher
final String PROJECT_BRANCH_ROOT = ''
-final Path treeRootDir = Paths.get(properties['maven.multiModuleProjectDirectory'])
+final Path treeRootDir = Paths.get(System.getProperty('maven.multiModuleProjectDirectory'))
final Path antoraYmlPath = treeRootDir.resolve('docs/antora.yml')
final Path sourceMapPath = treeRootDir.resolve('docs/source-map.yml')
diff --git a/tooling/scripts/validate-extension-metadata.groovy b/tooling/scripts/validate-extension-metadata.groovy
index 9fec6ac872..6d9e7736c3 100644
--- a/tooling/scripts/validate-extension-metadata.groovy
+++ b/tooling/scripts/validate-extension-metadata.groovy
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-import groovy.io.FileType
import java.nio.file.Files
import java.nio.file.Path
-final String[] extensionDirs = properties['extensionDirs'].split(',')
+final String[] extensionDirs = extensionDirs.split(',')
final String quarkusExtensionRelPath = 'runtime/src/main/resources/META-INF/quarkus-extension.yaml'
final List<String> messages = []