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 41c5545d390eec2e4fa2772c637790e01331b1c0
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Dec 18 08:07:13 2017 +0100
Use only one version property for Proton J
---
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ca1204c..da4d6c5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -568,7 +568,6 @@
<pubnub-version>4.16.0</pubnub-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
<qpid-proton-j-version>0.24.0</qpid-proton-j-version>
- <qpid-proton-j-bundle-version>0.24.0</qpid-proton-j-bundle-version>
<qpid-jms-client-version>0.28.0</qpid-jms-client-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 966e473..7384166 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -98,7 +98,7 @@
<feature name='camel-amqp' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-jms</feature>
<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:org.apache.qpid/proton-j/${qpid-proton-j-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-resolver/${netty-version}</bundle>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <commits@camel.apache.org>.
