Repository: camel Updated Branches: refs/heads/master 758be5383 -> a9f133823
Resolve CAMEL-8627 Update Infinispan version from 6.0.2.Final to 7.1.1.Final Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d982cd4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d982cd4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d982cd4a Branch: refs/heads/master Commit: d982cd4afb7f3fbac9ebbc29d3c531c251381dd7 Parents: 758be53 Author: ancosen <[email protected]> Authored: Tue Apr 14 22:37:03 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Apr 15 08:04:38 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 6 +++--- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d982cd4a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 250601a..59003ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -221,7 +221,7 @@ <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version> <ibatis-version>2.3.4.726</ibatis-version> <ical4j-version>1.0.5.2</ical4j-version> - <infinispan-version>6.0.2.Final</infinispan-version> + <infinispan-version>7.1.1.Final</infinispan-version> <irclib-bundle-version>1.10_5</irclib-bundle-version> <irclib-version>1.10</irclib-version> <isorelax-bundle-version>20050913_4</isorelax-bundle-version> @@ -247,7 +247,7 @@ <jaxen-version>1.1.6</jaxen-version> <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version> <jboss-logging-version>3.1.4.GA</jboss-logging-version> - <jboss-marshalling-version>1.3.18.GA</jboss-marshalling-version> + <jboss-marshalling-version>1.4.4.Final</jboss-marshalling-version> <jclouds-version>1.9.0</jclouds-version> <!-- jclouds must use this guava version --> <jclouds-google-guava-version>16.0</jclouds-google-guava-version> @@ -265,7 +265,7 @@ <jettison-version>1.3.7</jettison-version> <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version> <jexcelapi-version>2.4.2</jexcelapi-version> - <jgroups-version>3.4.1.Final</jgroups-version> + <jgroups-version>3.6.1.Final</jgroups-version> <jibx-version>1.2.5</jibx-version> <jing-bundle-version>20030619_5</jing-bundle-version> <jing-version>20030619</jing-version> http://git-wip-us.apache.org/repos/asf/camel/blob/d982cd4a/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 5574112..4e70dcb 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -713,7 +713,7 @@ <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.jboss.logging/jboss-logging/${jboss-logging-version}</bundle> - <bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling/${jboss-marshalling-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> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <feature version='${project.version}'>camel-avro</feature>
