This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 530bc29b3ff368b92e9ec578fd0fdab1c1960dbe Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Mar 11 14:07:49 2021 +0100 CAMEL-16332 - Have a middle folder for microprofile components --- bom/camel-bom/pom.xml | 10 +++++----- .../modules/ROOT/pages/microprofile-metrics-component.adoc | 2 +- docs/components/modules/others/pages/microprofile-config.adoc | 2 +- .../modules/others/pages/microprofile-fault-tolerance.adoc | 2 +- docs/components/modules/others/pages/microprofile-health.adoc | 2 +- parent/pom.xml | 10 +++++----- .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index d5a9edf..76a6bc8 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -1235,11 +1235,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-microprofile-parent</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-microprofile-config</artifactId> <version>${project.version}</version> </dependency> @@ -1260,6 +1255,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-microprofile-parent</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-milo</artifactId> <version>${project.version}</version> </dependency> diff --git a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc index b3a898d..805662d 100644 --- a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc +++ b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc @@ -1,7 +1,7 @@ [[microprofile-metrics-component]] = MicroProfile Metrics Component //THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc +:page-source: components/camel-microprofile/camel-microprofile-metrics/src/main/docs/microprofile-metrics-component.adoc :docTitle: MicroProfile Metrics :artifactId: camel-microprofile-metrics :description: Expose metrics from Camel routes. diff --git a/docs/components/modules/others/pages/microprofile-config.adoc b/docs/components/modules/others/pages/microprofile-config.adoc index 101ff57..b0cd2fa 100644 --- a/docs/components/modules/others/pages/microprofile-config.adoc +++ b/docs/components/modules/others/pages/microprofile-config.adoc @@ -1,7 +1,7 @@ [[microprofile-config-other]] = Microprofile Config Component //THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-microprofile-config/src/main/docs/microprofile-config.adoc +:page-source: components/camel-microprofile/camel-microprofile-config/src/main/docs/microprofile-config.adoc :docTitle: Microprofile Config :artifactId: camel-microprofile-config :description: Bridging Eclipse MicroProfile Config with Camel properties diff --git a/docs/components/modules/others/pages/microprofile-fault-tolerance.adoc b/docs/components/modules/others/pages/microprofile-fault-tolerance.adoc index c341b04..3ec0f0d 100644 --- a/docs/components/modules/others/pages/microprofile-fault-tolerance.adoc +++ b/docs/components/modules/others/pages/microprofile-fault-tolerance.adoc @@ -1,7 +1,7 @@ [[microprofile-fault-tolerance-other]] = Microprofile Fault Tolerance Component //THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-microprofile-fault-tolerance/src/main/docs/microprofile-fault-tolerance.adoc +:page-source: components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/docs/microprofile-fault-tolerance.adoc :docTitle: Microprofile Fault Tolerance :artifactId: camel-microprofile-fault-tolerance :description: Circuit Breaker EIP using MicroProfile Fault Tolerance diff --git a/docs/components/modules/others/pages/microprofile-health.adoc b/docs/components/modules/others/pages/microprofile-health.adoc index 40a1488..c0580d9 100644 --- a/docs/components/modules/others/pages/microprofile-health.adoc +++ b/docs/components/modules/others/pages/microprofile-health.adoc @@ -1,7 +1,7 @@ [[microprofile-health-other]] = Microprofile Health Component //THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-microprofile-health/src/main/docs/microprofile-health.adoc +:page-source: components/camel-microprofile/camel-microprofile-health/src/main/docs/microprofile-health.adoc :docTitle: Microprofile Health :artifactId: camel-microprofile-health :description: Bridging Eclipse MicroProfile Health with Camel health checks diff --git a/parent/pom.xml b/parent/pom.xml index bf5efe8..bf5c1fa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1831,11 +1831,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-microprofile-parent</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-microprofile-config</artifactId> <version>${project.version}</version> </dependency> @@ -1856,6 +1851,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-microprofile-parent</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-milo</artifactId> <version>${project.version}</version> </dependency> diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 2f5ed9b..4ba2b11 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -1182,8 +1182,9 @@ public class PrepareCatalogMojo extends AbstractMojo { return Arrays.asList(dir.resolve("camel-debezium-mongodb"), dir.resolve("camel-debezium-mysql"), dir.resolve("camel-debezium-postgres"), dir.resolve("camel-debezium-sqlserver")); case "camel-microprofile": - return Arrays.asList(dir.resolve("camel-microprofile-config"), dir.resolve("camel-microprofile-fault-tolerance"), - dir.resolve("camel-microprofile-health"), dir.resolve("camel-microprofile-metrics")); + return Arrays.asList(dir.resolve("camel-microprofile-config"), + dir.resolve("camel-microprofile-fault-tolerance"), + dir.resolve("camel-microprofile-health"), dir.resolve("camel-microprofile-metrics")); case "camel-aws": return Arrays.asList(dir.resolve("camel-aws2-athena"), dir.resolve("camel-aws2-cw"), dir.resolve("camel-aws2-ddb"), dir.resolve("camel-aws2-ec2"),
