This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch release-1.15.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.15.x by this push: new aebd245e Define a maven group for the quarkus maven plugin (#1069) aebd245e is described below commit aebd245e591bd38fe5b9abbe8f7836b5b5b64cd3 Author: Claudio Miranda <clau...@claudius.com.br> AuthorDate: Thu Jul 13 18:22:12 2023 -0300 Define a maven group for the quarkus maven plugin (#1069) - also removes unused quarkus-extension-maven-plugin --- .gitignore | 2 +- examples/cron/pom.xml | 7 +------ examples/groovy/pom.xml | 7 +------ examples/java/pom.xml | 7 +------ examples/js/pom.xml | 7 +------ examples/kafka-source-s3/pom.xml | 7 +------ examples/kamelets-discovery/pom.xml | 7 +------ examples/kamelets/pom.xml | 7 +------ examples/knative/pom.xml | 7 +------ examples/kotlin/pom.xml | 7 +------ examples/xml/pom.xml | 7 +------ examples/yaml/pom.xml | 9 ++------- itests/pom.xml | 4 ++-- pom.xml | 7 ++++--- support/camel-k-runtime-bom/pom.xml | 5 +++-- 15 files changed, 22 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index fe1a519a..056869fc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,5 @@ target .settings .factorypath .classpath - +.vscode .DS_Store diff --git a/examples/cron/pom.xml b/examples/cron/pom.xml index 09e709b2..4d7a36ec 100644 --- a/examples/cron/pom.xml +++ b/examples/cron/pom.xml @@ -64,12 +64,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml index 5007387f..a68bbd96 100644 --- a/examples/groovy/pom.xml +++ b/examples/groovy/pom.xml @@ -56,12 +56,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 2e788b7e..be6be59b 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -56,12 +56,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/js/pom.xml b/examples/js/pom.xml index 29038499..6b87d074 100644 --- a/examples/js/pom.xml +++ b/examples/js/pom.xml @@ -56,12 +56,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/kafka-source-s3/pom.xml b/examples/kafka-source-s3/pom.xml index 1f1c9751..11188473 100644 --- a/examples/kafka-source-s3/pom.xml +++ b/examples/kafka-source-s3/pom.xml @@ -56,12 +56,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/kamelets-discovery/pom.xml b/examples/kamelets-discovery/pom.xml index 8d955753..eb02b240 100644 --- a/examples/kamelets-discovery/pom.xml +++ b/examples/kamelets-discovery/pom.xml @@ -59,12 +59,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/kamelets/pom.xml b/examples/kamelets/pom.xml index 918306fd..eea0f388 100644 --- a/examples/kamelets/pom.xml +++ b/examples/kamelets/pom.xml @@ -59,12 +59,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/knative/pom.xml b/examples/knative/pom.xml index 62cc67e6..1ca71586 100644 --- a/examples/knative/pom.xml +++ b/examples/knative/pom.xml @@ -63,12 +63,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/kotlin/pom.xml b/examples/kotlin/pom.xml index f122f242..f8e4de24 100644 --- a/examples/kotlin/pom.xml +++ b/examples/kotlin/pom.xml @@ -55,12 +55,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/xml/pom.xml b/examples/xml/pom.xml index ac1cdac5..9f16de9b 100644 --- a/examples/xml/pom.xml +++ b/examples/xml/pom.xml @@ -55,12 +55,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/examples/yaml/pom.xml b/examples/yaml/pom.xml index bc870090..167db4ce 100644 --- a/examples/yaml/pom.xml +++ b/examples/yaml/pom.xml @@ -59,12 +59,7 @@ <build> <plugins> <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - <version>${quarkus-version}</version> - </plugin> - <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> @@ -159,7 +154,7 @@ <defaultGoal>quarkus:dev</defaultGoal> <plugins> <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> <executions> diff --git a/itests/pom.xml b/itests/pom.xml index bf3710c9..0dd282e7 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -84,7 +84,7 @@ </executions> </plugin> <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <executions> <execution> @@ -112,7 +112,7 @@ <artifactId>build-helper-maven-plugin</artifactId> </plugin> <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> </plugin> <plugin> diff --git a/pom.xml b/pom.xml index 9d2c383f..be9a8e19 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,7 @@ <quarkus-platform-version>2.13.7.Final</quarkus-platform-version> <!-- The quarkus camel bom may differ from quarkus platfom --> <quarkus-camel-bom-version>2.13.7.Final</quarkus-camel-bom-version> + <quarkus-platform-group>io.quarkus.platform</quarkus-platform-group> <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11</quarkus-native-builder-image> <!-- camel-k-runtime specific --> @@ -294,7 +295,7 @@ <version>${maven-plugin-plugin-version}</version> </plugin> <plugin> - <groupId>io.quarkus</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${quarkus-version}</version> </plugin> @@ -406,14 +407,14 @@ <scope>import</scope> </dependency> <dependency> - <groupId>io.quarkus.platform</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-camel-bom</artifactId> <version>${quarkus-camel-bom-version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> - <groupId>io.quarkus.platform</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-bom</artifactId> <version>${quarkus-platform-version}</version> <type>pom</type> diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 363954af..a0c961c9 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -39,6 +39,7 @@ <jolokia-version>1.7.1</jolokia-version> <maven-enforcer-plugin-version>3.1.0</maven-enforcer-plugin-version> <maven-version>3.6.3</maven-version> + <quarkus-platform-group>io.quarkus.platform</quarkus-platform-group> <quarkus-platform-version>2.13.7.Final</quarkus-platform-version> <!-- The quarkus camel bom may differ from quarkus platfom --> <quarkus-camel-bom-version>2.13.7.Final</quarkus-camel-bom-version> @@ -99,14 +100,14 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>io.quarkus.platform</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-camel-bom</artifactId> <version>${quarkus-camel-bom-version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> - <groupId>io.quarkus.platform</groupId> + <groupId>${quarkus-platform-group}</groupId> <artifactId>quarkus-bom</artifactId> <version>${quarkus-platform-version}</version> <type>pom</type>