Author: nfilotto Date: 2012-03-09 07:25:55 -0500 (Fri, 09 Mar 2012) New Revision: 5830 Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/trunk/pom.xml Log: EXOJCR-1789: Upgrade ISPN to 5.1.2 FINAL and indirectly to JGroups 3.0.6.Final Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-03-09 11:48:34 UTC (rev 5829) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-03-09 12:25:55 UTC (rev 5830) @@ -34,7 +34,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.4.Final</version> + <version>3.0.6.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java 2012-03-09 11:48:34 UTC (rev 5829) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java 2012-03-09 12:25:55 UTC (rev 5830) @@ -510,7 +510,7 @@ } } - public static class MyKeyGenerator implements KeyGenerator<DistributedExoCache.CacheKey<MyKey>> + public static class MyKeyGenerator implements KeyGenerator<DistributedExoCache.CacheKey<Serializable>> { public static final Random rnd = new Random(); @@ -523,9 +523,9 @@ } @Override - public DistributedExoCache.CacheKey<MyKey> getKey() + public DistributedExoCache.CacheKey<Serializable> getKey() { - return new DistributedExoCache.CacheKey<MyKey>(fullName, new MyKey(rnd.nextLong())); + return new DistributedExoCache.CacheKey<Serializable>(fullName, new MyKey(rnd.nextLong())); } } Modified: kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-03-09 11:48:34 UTC (rev 5829) +++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-03-09 12:25:55 UTC (rev 5830) @@ -40,7 +40,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.4.Final</version> + <version>3.0.6.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2012-03-09 11:48:34 UTC (rev 5829) +++ kernel/trunk/pom.xml 2012-03-09 12:25:55 UTC (rev 5830) @@ -213,7 +213,7 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.1.FINAL</version> + <version>5.1.2.FINAL</version> </dependency> <dependency> <groupId>org.jibx</groupId>