HHH-8624 Update to Infinispan 6.0 snapshot

* Snapshot update is only to verify that the testsuite passes with
the latest Infinispan fixes for ISPN-3639.

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java

@@ -16,6 +16,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.infinispan.AdvancedCache;
 import org.infinispan.commands.module.ModuleCommandFactory;
+import org.infinispan.commons.util.FileLookupFactory;
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.configuration.cache.Configuration;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
@@ -26,7 +27,6 @@ import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.transaction.TransactionMode;
 import org.infinispan.transaction.lookup.GenericTransactionManagerLookup;
-import org.infinispan.util.FileLookupFactory;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;

hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:infinispan:config:5.1"
+            xmlns="urn:infinispan:config:6.0"
-            xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd">
+            xsi:schemaLocation="urn:infinispan:config:6.0 http://www.infinispan.org/schemas/infinispan-config-6.0.xsd">
    <global>
       <transport
             transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"
@@ -26,7 +26,7 @@
    <!-- Default configuration is appropriate for entity/collection caching. -->
    <namedCache name="entity">
       <clustering mode="invalidation">
-         <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
+         <stateTransfer fetchInMemoryState="false" timeout="20000"/>
          <sync replTimeout="20000"/>
       </clustering>
       <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -35,7 +35,6 @@
            0 means the eviction thread will never run.  A separate executor is used for eviction in each cache. -->
       <eviction maxEntries="10000" strategy="LRU"/>
       <expiration maxIdle="100000" wakeUpInterval="5000"/>
-      <lazyDeserialization enabled="true"/>
       <transaction transactionMode="TRANSACTIONAL" autoCommit="false"
                    lockingMode="OPTIMISTIC"/>
    </namedCache>
@@ -43,7 +42,7 @@
    <!-- Default configuration is appropriate for entity/collection caching. -->
    <namedCache name="entity-repeatable">
       <clustering mode="invalidation">
-         <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
+         <stateTransfer fetchInMemoryState="false" timeout="20000"/>
          <sync replTimeout="20000"/>
       </clustering>
       <!-- Note: REPEATABLE_READ is only useful if the application evicts/clears entities 
@@ -58,7 +57,6 @@
            0 means the eviction thread will never run.  A separate executor is used for eviction in each cache. -->
       <eviction maxEntries="10000" strategy="LRU"/>
       <expiration maxIdle="100000" wakeUpInterval="5000"/>
-      <lazyDeserialization enabled="true"/>
       <transaction transactionMode="TRANSACTIONAL" autoCommit="false"
                    lockingMode="OPTIMISTIC"/>
    </namedCache>
@@ -66,7 +64,7 @@
    <!-- An alternative configuration for entity/collection caching that uses replication instead of invalidation -->
    <namedCache name="replicated-entity">
       <clustering mode="replication">
-         <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
+         <stateTransfer fetchInMemoryState="false" timeout="20000"/>
          <sync replTimeout="20000"/>
       </clustering>
       <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -107,15 +105,9 @@
                    lockingMode="OPTIMISTIC"/>
       <!-- State transfer forces all replication calls to be synchronous,
            so for calls to remain async, use a cluster cache loader instead -->
-      <loaders passivation="false" shared="false" preload="false">
+      <persistence passivation="false">
-         <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader"
+         <cluster remoteCallTimeout="20000" />
-                 fetchPersistentState="false"
+      </persistence>
-                 ignoreModifications="false" purgeOnStartup="false">
-            <properties>
-               <property name="remoteCallTimeout" value="20000"/>
-            </properties>
-         </loader>
-      </loaders>
    </namedCache>
 
    <!-- Optimized for timestamp caching. A clustered timestamp cache
@@ -127,7 +119,6 @@
       </clustering>
       <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
                lockAcquisitionTimeout="15000" useLockStriping="false"/>
-      <lazyDeserialization enabled="true"/>
       <!--  Don't ever evict modification timestamps -->
       <eviction strategy="NONE"/>
       <expiration wakeUpInterval="0"/>
@@ -135,15 +126,9 @@
       <transaction transactionMode="NON_TRANSACTIONAL"/>
       <!-- State transfer forces all replication calls to be synchronous,
            so for calls to remain async, use a cluster cache loader instead -->
-      <loaders passivation="false" shared="false" preload="false">
+      <persistence passivation="false">
-         <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader"
+         <cluster remoteCallTimeout="20000" />
-                 fetchPersistentState="false"
+      </persistence>
-                 ignoreModifications="false" purgeOnStartup="false">
-            <properties>
-               <property name="remoteCallTimeout" value="20000"/>
-            </properties>
-         </loader>
-      </loaders>
    </namedCache>
 
 </infinispan>

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java

@@ -320,7 +320,6 @@ public class InfinispanRegionFactoryTestCase  {
          Configuration cacheCfg = cache.getCacheConfiguration();
          assertEquals(EvictionStrategy.NONE, cacheCfg.eviction().strategy());
          assertEquals(CacheMode.REPL_ASYNC, cacheCfg.clustering().cacheMode());
-         assertTrue(cacheCfg.storeAsBinary().enabled());
          assertFalse(cacheCfg.jmxStatistics().enabled());
       } finally {
          factory.stop();

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java

@@ -96,7 +96,7 @@ public class PutFromLoadValidatorUnitTestCase {
 
    private void nakedPutTest(final boolean transactional) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             try {
@@ -132,7 +132,7 @@ public class PutFromLoadValidatorUnitTestCase {
 
    private void registeredPutTest(final boolean transactional) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator testee = new PutFromLoadValidator(cm,
@@ -179,7 +179,7 @@ public class PutFromLoadValidatorUnitTestCase {
    private void nakedPutAfterRemovalTest(final boolean transactional,
          final boolean removeRegion) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator testee = new PutFromLoadValidator(cm,
@@ -231,7 +231,7 @@ public class PutFromLoadValidatorUnitTestCase {
    private void registeredPutAfterRemovalTest(final boolean transactional,
          final boolean removeRegion) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator testee = new PutFromLoadValidator(cm,
@@ -285,7 +285,7 @@ public class PutFromLoadValidatorUnitTestCase {
          final boolean transactional, final boolean removeRegion)
          throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator testee = new PutFromLoadValidator(cm,
@@ -338,7 +338,7 @@ public class PutFromLoadValidatorUnitTestCase {
          final boolean transactional, final boolean removeRegion)
          throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator testee = new TestValidator(cm,
@@ -382,7 +382,7 @@ public class PutFromLoadValidatorUnitTestCase {
 
    private void multipleRegistrationtest(final boolean transactional) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             final PutFromLoadValidator testee = new PutFromLoadValidator(cm,
@@ -453,7 +453,7 @@ public class PutFromLoadValidatorUnitTestCase {
    @Test
    public void testRemovalCleanup() throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             TestValidator testee = new TestValidator(cm, null, 200);
@@ -501,7 +501,7 @@ public class PutFromLoadValidatorUnitTestCase {
 
    private void invalidationBlocksForInProgressPutTest(final boolean keyOnly) throws Exception {
       withCacheManager(new CacheManagerCallable(
-            TestCacheManagerFactory.createLocalCacheManager(false)) {
+            TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             final PutFromLoadValidator testee = new PutFromLoadValidator(

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java

@@ -164,7 +164,7 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs
 		final CountDownLatch pferLatch = new CountDownLatch( 1 );
 		final CountDownLatch removeLatch = new CountDownLatch( 1 );
       final TransactionManager remoteTm = remoteCollectionRegion.getTransactionManager();
-      withCacheManager(new CacheManagerCallable(TestCacheManagerFactory.createLocalCacheManager(false)) {
+      withCacheManager(new CacheManagerCallable(TestCacheManagerFactory.createCacheManager(false)) {
          @Override
          public void call() {
             PutFromLoadValidator validator = new PutFromLoadValidator(cm,

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java

@@ -296,7 +296,7 @@ public class QueryRegionImplTestCase extends AbstractGeneralDataRegionTestCase {
 			blockerLatch.countDown();
 			unblocked = true;
 
-			if ( IsolationLevel.REPEATABLE_READ.equals( jbc.getConfiguration().getIsolationLevel() ) ) {
+			if ( IsolationLevel.REPEATABLE_READ.equals( jbc.getCacheConfiguration().locking().isolationLevel() ) ) {
 				assertEquals( VALUE1, region.get( KEY ) );
 			}
 			else {

libraries.gradle

@@ -30,7 +30,7 @@ ext {
     junitVersion = '4.11'
     h2Version = '1.2.145'
     bytemanVersion = '2.1.2'
-    infinispanVersion = '5.3.0.Final'
+    infinispanVersion = '6.0.0-SNAPSHOT'
     jnpVersion = '5.0.6.CR1'
 
     libraries = [