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 2018/10/09 08:26:37 UTC
[camel] branch master updated: Upgrade Infinispan to version
9.4.0.Final
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
The following commit(s) were added to refs/heads/master by this push:
new 8b647ec Upgrade Infinispan to version 9.4.0.Final
8b647ec is described below
commit 8b647ec8b47f04c584a766c4800849c1b9e24b45
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 9 10:25:51 2018 +0200
Upgrade Infinispan to version 9.4.0.Final
---
.../apache/camel/component/infinispan/InfinispanClusterTestSupport.java | 2 +-
.../org/apache/camel/component/infinispan/InfinispanTestSupport.java | 2 +-
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
index 747a9e4..b4add8b 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
@@ -22,6 +22,7 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.infinispan.Cache;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.commons.time.TimeService;
import org.infinispan.configuration.cache.CacheMode;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.manager.EmbeddedCacheManager;
@@ -29,7 +30,6 @@ import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.TransactionMode;
import org.infinispan.util.ControlledTimeService;
-import org.infinispan.util.TimeService;
import org.junit.Before;
public class InfinispanClusterTestSupport extends CamelTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
index bdfbeb0..36051c8 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
@@ -20,11 +20,11 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.commons.time.TimeService;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.util.ControlledTimeService;
-import org.infinispan.util.TimeService;
import org.junit.Before;
public class InfinispanTestSupport extends CamelTestSupport {
diff --git a/parent/pom.xml b/parent/pom.xml
index 072dd65..a61626f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -315,7 +315,7 @@
<ibatis-version>2.3.4.726</ibatis-version>
<ical4j-version>1.0.7</ical4j-version>
<ignite-version>2.6.0</ignite-version>
- <infinispan-version>9.3.3.Final</infinispan-version>
+ <infinispan-version>9.4.0.Final</infinispan-version>
<infinispan-spring-boot-version>2.0.0.Beta2</infinispan-spring-boot-version>
<influx-java-driver-version>2.13</influx-java-driver-version>
<influx-java-driver-bundle-version>2.13_1</influx-java-driver-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 6a4b49d..f2536f3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1089,6 +1089,7 @@
<bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-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>