camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: CAMEL-11453 fix camel-box feature
Date Mon, 26 Jun 2017 08:57:43 GMT
Repository: camel
Updated Branches:
  refs/heads/master 87f53dfce -> b612a50bc


CAMEL-11453 fix camel-box feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b612a50b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b612a50b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b612a50b

Branch: refs/heads/master
Commit: b612a50bcb3afa15da3b2b3da212fb038b0dbb7b
Parents: 87f53df
Author: jpoth <poth.john@gmail.com>
Authored: Mon Jun 26 10:54:37 2017 +0200
Committer: jpoth <poth.john@gmail.com>
Committed: Mon Jun 26 10:54:37 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 4 ++++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b612a50b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d2cb13c..ca4754c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -383,6 +383,7 @@
     <jolt-version>0.1.0</jolt-version>
     <jolt-bundle-version>0.1.0_1</jolt-bundle-version>
     <johnzon-version>1.1.0</johnzon-version>
+    <jose4j-version>0.4.4</jose4j-version>
     <josql-bundle-version>1.5_5</josql-bundle-version>
     <josql-version>1.5</josql-version>
     <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b612a50b/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 36a1ffa..e617969 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -275,6 +275,10 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
+    <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}</bundle>
+    <bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle>
+    <bundle dependency='true'>mvn:org.bitbucket.b_c/jose4j/${jose4j-version}</bundle>
     <bundle dependency='true'>wrap:mvn:com.box/box-java-sdk/${box-java-sdk-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.camel/camel-box-api/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle>


Mime
View raw message