You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by oa...@apache.org on 2020/02/11 16:36:44 UTC
[camel-examples] 01/01: Change the first patch to camel BOM
This is an automated email from the ASF dual-hosted git repository.
oalsafi pushed a commit to branch change-to-camel-bom
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
commit 0fc23608ad9e74f83370d1efe5368fd67cc02a7f
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Tue Feb 11 17:36:14 2020 +0100
Change the first patch to camel BOM
---
examples/camel-example-activemq-tomcat/pom.xml | 10 ++++++
examples/camel-example-aggregate/pom.xml | 3 ++
examples/camel-example-any23/pom.xml | 1 +
.../camel-example-artemis-amqp-blueprint/pom.xml | 3 ++
.../camel-example-artemis-large-messages/pom.xml | 4 +++
examples/camel-example-artemis/pom.xml | 3 ++
examples/pom.xml | 38 +++++++++++++---------
7 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/examples/camel-example-activemq-tomcat/pom.xml b/examples/camel-example-activemq-tomcat/pom.xml
index e336e44..bdc1e28 100644
--- a/examples/camel-example-activemq-tomcat/pom.xml
+++ b/examples/camel-example-activemq-tomcat/pom.xml
@@ -83,6 +83,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <version>${spring-version}</version>
</dependency>
<!-- camel jms and activemq -->
@@ -99,20 +100,24 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
+ <version>${activemq-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
+ <version>${activemq-version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
+ <version>${activemq-version}</version>
</dependency>
<!-- ActiveMQ client -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
+ <version>${activemq-version}</version>
<!-- lets use JMS 2.0 api but camel-jms still works with ActiveMQ 5.x that is JMS 1.1 only -->
<exclusions>
<exclusion>
@@ -124,6 +129,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pool</artifactId>
+ <version>${activemq-version}</version>
<!-- lets use JMS 2.0 api but camel-jms still works with ActiveMQ 5.x that is JMS 1.1 only -->
<exclusions>
<exclusion>
@@ -137,22 +143,26 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
+ <version>${xbean-spring-version}</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/examples/camel-example-aggregate/pom.xml b/examples/camel-example-aggregate/pom.xml
index dca384e..16224c3 100644
--- a/examples/camel-example-aggregate/pom.xml
+++ b/examples/camel-example-aggregate/pom.xml
@@ -54,16 +54,19 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/examples/camel-example-any23/pom.xml b/examples/camel-example-any23/pom.xml
index c833291..a310e2a 100644
--- a/examples/camel-example-any23/pom.xml
+++ b/examples/camel-example-any23/pom.xml
@@ -56,6 +56,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
</dependencies>
diff --git a/examples/camel-example-artemis-amqp-blueprint/pom.xml b/examples/camel-example-artemis-amqp-blueprint/pom.xml
index 556857d..d66d62a 100644
--- a/examples/camel-example-artemis-amqp-blueprint/pom.xml
+++ b/examples/camel-example-artemis-amqp-blueprint/pom.xml
@@ -106,16 +106,19 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>runtime</scope>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>runtime</scope>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
+ <version>${log4j2-version}</version>
</dependency>
</dependencies>
diff --git a/examples/camel-example-artemis-large-messages/pom.xml b/examples/camel-example-artemis-large-messages/pom.xml
index 36ae711..8847e52 100644
--- a/examples/camel-example-artemis-large-messages/pom.xml
+++ b/examples/camel-example-artemis-large-messages/pom.xml
@@ -58,20 +58,24 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
+ <version>${geronimo-jms2-spec-version}</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
</dependencies>
diff --git a/examples/camel-example-artemis/pom.xml b/examples/camel-example-artemis/pom.xml
index c6a79ea..e382f72 100644
--- a/examples/camel-example-artemis/pom.xml
+++ b/examples/camel-example-artemis/pom.xml
@@ -62,14 +62,17 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
</dependency>
</dependencies>
diff --git a/examples/pom.xml b/examples/pom.xml
index f8a69b5..eef3203 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -190,6 +191,7 @@
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.5.0.Final</arquillian-version>
<asciidoctorj-version>2.1.0</asciidoctorj-version>
+ <activemq-version>5.15.11</activemq-version>
<activemq-artemis-version>2.11.0</activemq-artemis-version>
<atomix-version>1.0.8</atomix-version>
<avro-version>1.8.1</avro-version>
@@ -209,7 +211,7 @@
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
<google-guava-version>19.0</google-guava-version>
<groovy-version>2.5.8</groovy-version>
- <groovy-version>2.5.8</groovy-version>
+ <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
<grpc-guava-version>26.0-android</grpc-guava-version>
<grpc-version>1.24.1</grpc-version>
<gson-version>2.8.5</gson-version>
@@ -276,6 +278,9 @@
<undertow-version>2.0.28.Final</undertow-version>
<weld3-version>3.0.5.Final</weld3-version>
<wsdl4j-version>1.6.3</wsdl4j-version>
+ <xbean-spring-version>4.14</xbean-spring-version>
+ <xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
+
<!-- for symbolicName in OSGi examples we only want the artifactId, eg camel-example-sql -->
<!-- as having org.apache.camel as prefix is not needed and makes the name very long -->
@@ -295,8 +300,8 @@
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
<camel.osgi.import.defaults>
</camel.osgi.import.defaults>
- <camel.osgi.import.before.defaults />
- <camel.osgi.import.additional />
+ <camel.osgi.import.before.defaults/>
+ <camel.osgi.import.additional/>
<camel.osgi.import.pkg>
org.apache.camel.*;${camel.osgi.import.camel.version},
${camel.osgi.import.before.defaults},
@@ -304,17 +309,17 @@
${camel.osgi.import.additional},
*
</camel.osgi.import.pkg>
- <camel.osgi.activator />
+ <camel.osgi.activator/>
<camel.osgi.failok>false</camel.osgi.failok>
<camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
<camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
<camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
<camel.osgi.version>version=${project.version}</camel.osgi.version>
<camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
- <camel.osgi.dynamic />
+ <camel.osgi.dynamic/>
<camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
- <camel.osgi.require.capability />
- <camel.osgi.provide.capability />
+ <camel.osgi.require.capability/>
+ <camel.osgi.provide.capability/>
</properties>
<!-- Comment out the snapshot repositories as we don't need them now -->
@@ -362,17 +367,18 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${google-guava-version}</version>
</dependency>
+ <!-- Add Camel BOM -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-bom</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -532,7 +538,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>