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 2017/03/14 08:49:35 UTC
[2/4] camel git commit: CAMEL-10987: Downgrade JGroups version that
Infinispan depends on to fix CamelInfinispanTest
CAMEL-10987: Downgrade JGroups version that Infinispan depends on to fix CamelInfinispanTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/146bdc85
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/146bdc85
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/146bdc85
Branch: refs/heads/master
Commit: 146bdc85998e8d7c28e0932df68675b2c374d030
Parents: 44451ab
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Tue Mar 14 14:57:25 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/146bdc85/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cf601ce..0b7a154 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,6 +346,7 @@
<jettison-version>1.3.8</jettison-version>
<jgit-version>4.6.1.201703071140-r</jgit-version>
<jgroups-version>4.0.1.Final</jgroups-version>
+ <jgroups-infinispan-version>3.6.13.Final</jgroups-infinispan-version>
<libthrift-version>0.9.3</libthrift-version>
<jibx-version>1.2.6</jibx-version>
<jing-bundle-version>20030619_5</jing-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/146bdc85/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 4caccfc..c4bf366 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -887,7 +887,7 @@
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-query-dsl/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
- <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
+ <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-osgi/${jboss-marshalling-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-river/${jboss-marshalling-version}</bundle>