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-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 5fc8a1a Fixed Camel-Braintree Karaf feature
5fc8a1a is described below
commit 5fc8a1ae99a800a58736d31fd5c44958c09f7a90
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Sep 1 07:19:27 2020 +0200
Fixed Camel-Braintree Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
pom.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index aea250e..a097723 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -685,8 +685,8 @@
</feature>
<feature name='camel-braintree' version='${project.version}'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:com.fasterxml.jackson.jr/jackson-jr-objects/${jackson2-version}</bundle>
- <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle
dependency='true'>mvn:com.fasterxml.jackson.jr/jackson-jr-objects/${braintree-jackson2-version}</bundle>
+ <bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${braintree-jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.braintreepayments.gateway/braintree-java/${braintree-gateway-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle>
<bundle>mvn:org.apache.camel/camel-braintree/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 6891df0..854f185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
<backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<bndlib-version>2.4.0</bndlib-version>
+ <braintree-jackson2-version>2.11.2</braintree-jackson2-version>
<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
<c3p0-bundle-version>0.9.5.5_1</c3p0-bundle-version>
<cassandra-jackson2-version>2.11.1</cassandra-jackson2-version>
