You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/11/05 17:27:03 UTC
[camel-quarkus] branch master updated: Revert to the previous usage
in examples where the user now has to change the pom to camel-quarkus-bom
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new b35d5fd Revert to the previous usage in examples where the user now has to change the pom to camel-quarkus-bom
b35d5fd is described below
commit b35d5fd545eaf914766e5d4e044346a316b75339
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Nov 5 18:25:22 2019 +0100
Revert to the previous usage in examples where the user now has to change the pom to camel-quarkus-bom
---
docs/modules/ROOT/pages/user-guide.adoc | 19 ++++++++++---------
examples/observability/pom.xml | 13 -------------
examples/rest-json/pom.xml | 13 -------------
examples/timer-log-xml/pom.xml | 13 -------------
examples/timer-log/pom.xml | 13 -------------
poms/build-parent/pom.xml | 8 ++++++++
6 files changed, 18 insertions(+), 61 deletions(-)
diff --git a/docs/modules/ROOT/pages/user-guide.adoc b/docs/modules/ROOT/pages/user-guide.adoc
index d648be0..7de58f7 100644
--- a/docs/modules/ROOT/pages/user-guide.adoc
+++ b/docs/modules/ROOT/pages/user-guide.adoc
@@ -59,24 +59,25 @@ sketched below:
<project>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
+ <artifactId>camel-quarkus-bom</artifactId><!--1-->
<version>{camel-quarkus-last-release}</version>
- <!-- <relativePath>../../bom/pom.xml</relativePath> --><!--1-->
+ <!-- <relativePath>../../bom/pom.xml</relativePath> --><!--2-->
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.my-org</groupId><!--2-->
- <artifactId>my-app</artifactId><!--3-->
- <version>0.0.1-SNAPSHOT</version><!--4-->
+ <groupId>org.my-org</groupId><!--3-->
+ <artifactId>my-app</artifactId><!--4-->
+ <version>0.0.1-SNAPSHOT</version><!--5-->
...
</project>
----
-<1> Remove the `<relativePath>` element.
-<2> Add a `groupId` of your choice.
-<3> Change the `artifactId` to whatever you like
-<4> Add the `version`
+<1> Change the `<artifactId>` element to `camel-quarkus-bom`.
+<2> Remove the `<relativePath>` element.
+<3> Add a `groupId` of your choice.
+<4> Change the `artifactId` to whatever you like
+<5> Add the `version`
=== Explore the application code
diff --git a/examples/observability/pom.xml b/examples/observability/pom.xml
index 8c4a22b..728e58a 100644
--- a/examples/observability/pom.xml
+++ b/examples/observability/pom.xml
@@ -31,19 +31,6 @@
<name>Camel Quarkus :: Examples :: Observability</name>
<description>Camel Quarkus Example :: Observability</description>
- <dependencyManagement>
- <dependencies>
- <!-- Import BOM -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/examples/rest-json/pom.xml b/examples/rest-json/pom.xml
index 76b9eed..e6d4dd7 100644
--- a/examples/rest-json/pom.xml
+++ b/examples/rest-json/pom.xml
@@ -31,19 +31,6 @@
<name>Camel Quarkus :: Examples :: Rest Json</name>
<description>Camel Quarkus Example :: Rest Json</description>
- <dependencyManagement>
- <dependencies>
- <!-- Import BOM -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/examples/timer-log-xml/pom.xml b/examples/timer-log-xml/pom.xml
index b45e9e0..084a725 100644
--- a/examples/timer-log-xml/pom.xml
+++ b/examples/timer-log-xml/pom.xml
@@ -31,19 +31,6 @@
<name>Camel Quarkus :: Examples :: Timer Log XML</name>
<description>Camel Quarkus Example :: Timer to Log XML</description>
- <dependencyManagement>
- <dependencies>
- <!-- Import BOM -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/examples/timer-log/pom.xml b/examples/timer-log/pom.xml
index 06c2d0c..575a6d2 100644
--- a/examples/timer-log/pom.xml
+++ b/examples/timer-log/pom.xml
@@ -31,19 +31,6 @@
<name>Camel Quarkus :: Examples :: Timer Log</name>
<description>Camel Quarkus Example :: Timer to Log</description>
- <dependencyManagement>
- <dependencies>
- <!-- Import BOM -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 0e9bf72..230a8c5 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -49,6 +49,14 @@
<dependencyManagement>
<dependencies>
+ <!-- Import BOM -->
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>