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/04/17 07:14:08 UTC
[camel] branch master updated: camel-braintree in Karaf should use
same jackson version as others do.
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
The following commit(s) were added to refs/heads/master by this push:
new 50b1493 camel-braintree in Karaf should use same jackson version as others do.
50b1493 is described below
commit 50b1493b7a5e9ff29199c298e4cdfa75021047aa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 17 09:13:48 2018 +0200
camel-braintree in Karaf should use same jackson version as others do.
---
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bf243fa..0aef2e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -99,7 +99,6 @@
<boxjavalibv2.version>3.2.1</boxjavalibv2.version>
<box-java-sdk-version>2.10.0</box-java-sdk-version>
<braintree-gateway-version>2.77.0</braintree-gateway-version>
- <braintree-jackson-version>2.9.0</braintree-jackson-version>
<brave-zipkin-version>4.13.4</brave-zipkin-version>
<build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.2</c3p0-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b1cb57b..d4998af 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -290,8 +290,8 @@
</feature>
<feature name='camel-braintree' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jr/jackson-jr-objects/${braintree-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${braintree-jackson-version}</bundle>
+ <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.braintreepayments.gateway/braintree-java/${braintree-gateway-version}</bundle>
<bundle>mvn:org.apache.camel/camel-braintree/${project.version}</bundle>
</feature>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.