You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/02/28 08:59:32 UTC
[camel] branch master updated (7f556e4 -> 50d0a5c)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7f556e4 CAMEL-12298: Fixed camel-aws test that required a region to be configured.
new 0df5b6c Polished
new 50d0a5c CAMEL-12300: Fixed example
The 2 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.
Summary of changes:
.../camel-example-artemis-amqp-blueprint/pom.xml | 32 +++++++++++++++-------
1 file changed, 22 insertions(+), 10 deletions(-)
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 01/02: Polished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0df5b6ca565973cc15526b6430c7b4710144f49d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 28 09:36:32 2018 +0100
Polished
---
examples/camel-example-artemis-amqp-blueprint/pom.xml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/examples/camel-example-artemis-amqp-blueprint/pom.xml b/examples/camel-example-artemis-amqp-blueprint/pom.xml
index 599771f..953b9b9 100644
--- a/examples/camel-example-artemis-amqp-blueprint/pom.xml
+++ b/examples/camel-example-artemis-amqp-blueprint/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>
@@ -30,7 +31,9 @@
<artifactId>camel-example-artemis-amqp-blueprint</artifactId>
<packaging>bundle</packaging>
<name>Camel :: Example :: ActiveMQ Artemis AMQP :: Blueprint</name>
- <description>Demonstrates ActiveMQ Artemis using Camel's AMQP component. The example includes a JUnit showcasing how to embed for testing an AMQP enabled Artemis broker.</description>
+ <description>Demonstrates ActiveMQ Artemis using Camel's AMQP component. The example includes a JUnit showcasing how
+ to embed for testing an AMQP enabled Artemis broker.
+ </description>
<properties>
<category>Messaging</category>
@@ -52,26 +55,26 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty4-http</artifactId>
</dependency>
-
+
<!-- Embbeded Artemis AMQP JMS Broker -->
<!-- ATTENTION: Needs to be placed before Camel's AMQP component -->
<!-- Netty versions between both enter in conflict -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
- <version>${activemq-artemis-version}</version>
+ <version>${activemq-artemis-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-server</artifactId>
- <version>${activemq-artemis-version}</version>
+ <version>${activemq-artemis-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-amqp-protocol</artifactId>
- <version>${activemq-artemis-version}</version>
+ <version>${activemq-artemis-version}</version>
<scope>test</scope>
</dependency>
@@ -117,7 +120,7 @@
<extensions>true</extensions>
</plugin>
- <!-- to run the example using mvn camel:run -->
+ <!-- to run the example using mvn camel:run -->
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-maven-plugin</artifactId>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/02: CAMEL-12300: Fixed example
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 50d0a5ce3b708b49aa7250bf2b92ca7e97892b08
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 28 09:59:17 2018 +0100
CAMEL-12300: Fixed example
---
examples/camel-example-artemis-amqp-blueprint/pom.xml | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/examples/camel-example-artemis-amqp-blueprint/pom.xml b/examples/camel-example-artemis-amqp-blueprint/pom.xml
index 953b9b9..8ed33da 100644
--- a/examples/camel-example-artemis-amqp-blueprint/pom.xml
+++ b/examples/camel-example-artemis-amqp-blueprint/pom.xml
@@ -39,7 +39,6 @@
<category>Messaging</category>
</properties>
-
<dependencies>
<!-- camel -->
@@ -57,13 +56,17 @@
</dependency>
<!-- Embbeded Artemis AMQP JMS Broker -->
- <!-- ATTENTION: Needs to be placed before Camel's AMQP component -->
- <!-- Netty versions between both enter in conflict -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>${activemq-artemis-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -76,6 +79,12 @@
<artifactId>artemis-amqp-protocol</artifactId>
<version>${activemq-artemis-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Camel's AMQP connectivity -->
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.