You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/11/08 11:59:00 UTC
[camel] branch master updated (39539d6 -> a250a90)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 39539d6 CAMEL-14160 - Updating the default algorithm for the Crypto Component
new 5fdc2bc Camel-Jpbm: Fixed Karaf feature
new a250a90 Camel-Optaplanner: Fixed Karaf feature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
[camel] 02/02: Camel-Optaplanner: Fixed Karaf feature
Posted by ac...@apache.org.
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 a250a90878a8e47468e762eeb8c8148aee040d07
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 8 12:58:11 2019 +0100
Camel-Optaplanner: Fixed Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 633a610..4d4e34f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1980,7 +1980,7 @@
<bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${jbpm-guava-osgi-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
</feature>
[camel] 01/02: Camel-Jpbm: Fixed Karaf feature
Posted by ac...@apache.org.
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 5fdc2bc86b8904eae8f35b0000e1ef8e46902445
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 8 12:57:00 2019 +0100
Camel-Jpbm: Fixed Karaf feature
---
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index b8d93ee..573adde 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -332,6 +332,7 @@
<glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
<jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
<jbpm-version>7.29.0.Final</jbpm-version>
+ <jbpm-guava-osgi-version>25.0-jre</jbpm-guava-osgi-version>
<jboss-logging-version>3.4.0.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
<jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3e0c5ab..633a610 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1441,7 +1441,7 @@
<bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${jbpm-version}</bundle>
<bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${jbpm-guava-osgi-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>