Repository: camel Updated Branches: refs/heads/master 2ce87814e -> 1d9eb8e16
Upgraded camel-amqp to latest and fixed its karaf feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d9eb8e1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d9eb8e1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d9eb8e1 Branch: refs/heads/master Commit: 1d9eb8e16ec168dbaae78fef7a52048d8971c0b3 Parents: 2ce8781 Author: Claus Ibsen <[email protected]> Authored: Sat Dec 24 10:41:41 2016 +0100 Committer: Claus Ibsen <[email protected]> Committed: Sat Dec 24 10:41:41 2016 +0100 ---------------------------------------------------------------------- components/camel-amqp/pom.xml | 39 +++++++++++++++++--- parent/pom.xml | 3 +- .../features/src/main/resources/features.xml | 19 ++++------ 3 files changed, 43 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1d9eb8e1/components/camel-amqp/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml index c594d32..3077fc3 100644 --- a/components/camel-amqp/pom.xml +++ b/components/camel-amqp/pom.xml @@ -48,15 +48,45 @@ <artifactId>camel-jms</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <scope>provided</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-jms-client</artifactId> <version>${qpid-jms-client-version}</version> </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>proton-j</artifactId> + <version>${qpid-proton-j-version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <version>${netty40-version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty40-version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty40-version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>${netty40-version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>${netty40-version}</version> + </dependency> <!-- testing --> <dependency> @@ -67,10 +97,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-amqp</artifactId> - <!-- TODO: ActiveMQ 5.14.3 causes an error when testing <version>${activemq-version}</version> - --> - <version>5.14.2</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1d9eb8e1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 860e39f..e692f3e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -491,7 +491,8 @@ <powermock-version>1.6.1</powermock-version> <protobuf-version>3.1.0</protobuf-version> <qpid-bundle-version>0.28_1</qpid-bundle-version> - <qpid-proton-j-version>0.14.0</qpid-proton-j-version> + <qpid-proton-j-version>0.16.0</qpid-proton-j-version> + <qpid-proton-j-bundle-version>0.14.0</qpid-proton-j-bundle-version> <qpid-jms-client-version>0.11.1</qpid-jms-client-version> <quartz-bundle-version>1.8.6_1</quartz-bundle-version> <quartz-version>1.8.6</quartz-version> http://git-wip-us.apache.org/repos/asf/camel/blob/1d9eb8e1/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 0a9e844..ae2e5eb 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -105,17 +105,14 @@ </feature> <feature name='camel-amqp' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-jms</feature> - <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> - <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> - <bundle dependency='true'>wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle> - <bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle> - <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle> + <bundle dependency='true'>mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle> + <bundle dependency='true'>mvn:org.apache.qpid/proton-j/${qpid-proton-j-bundle-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-common/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty40-version}</bundle> <bundle>mvn:org.apache.camel/camel-amqp/${project.version}</bundle> </feature> <feature name='camel-apns' version='${project.version}' resolver='(obr)' start-level='50'>
