Merge pull request #2907 from myronkscott/bump

chrisdennis · web-flow · commit 784d191e1871 · 2021-05-20T12:59:34.000-04:00
bump dependencies
diff --git a/clustered/integration-test/src/test/java/org/ehcache/clustered/management/ClusteringManagementServiceTest.java b/clustered/integration-test/src/test/java/org/ehcache/clustered/management/ClusteringManagementServiceTest.java
@@ -302,18 +302,18 @@ public void test_E_notifs_on_add_cache() throws Exception {
     if (cluster.serverStream().count() == 2) {
       waitForAllNotifications(
         "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED",
-        "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED"); // passive server
+        "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "CLIENT_REGISTRY_AVAILABLE"); // passive server
     } else {
       waitForAllNotifications(
-        "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED");
+        "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED", "CLIENT_REGISTRY_AVAILABLE");
     }
   }
 
   @Test
   public void test_F_notifs_on_remove_cache() throws Exception {
     cacheManager.removeCache("cache-2");
 
-    waitForAllNotifications("CACHE_REMOVED", "SERVER_ENTITY_UNFETCHED");
+    waitForAllNotifications("CACHE_REMOVED", "SERVER_ENTITY_UNFETCHED", "CLIENT_REGISTRY_AVAILABLE");
   }
 
   @Test
diff --git a/gradle.properties b/gradle.properties
@@ -10,10 +10,10 @@ sizeofVersion = 0.4.0
 jaxbVersion = [2.2,3)
 
 # Terracotta clustered
-terracottaPlatformVersion = 5.8.4
+terracottaPlatformVersion = 5.8.5
 terracottaApisVersion = 1.8.0
-terracottaCoreVersion = 5.8.0
-terracottaPassthroughTestingVersion = 1.8.0
+terracottaCoreVersion = 5.8.1
+terracottaPassthroughTestingVersion = 1.8.1
 terracottaUtilitiesVersion = 0.0.8
 
 # Test lib versions

Original file line number	Diff line number	Diff line change
`@@ -302,18 +302,18 @@ public void test_E_notifs_on_add_cache() throws Exception {`
`302`	`302`	`if (cluster.serverStream().count() == 2) {`
`303`	`303`	`waitForAllNotifications(`
`304`	`304`	`"SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED",`
`305`		`- "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED"); // passive server`
	`305`	`+ "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "CLIENT_REGISTRY_AVAILABLE"); // passive server`
`306`	`306`	`} else {`
`307`	`307`	`waitForAllNotifications(`
`308`		`- "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED");`
	`308`	`+ "SERVER_ENTITY_CREATED", "ENTITY_REGISTRY_AVAILABLE", "EHCACHE_SERVER_STORE_CREATED", "SERVER_ENTITY_FETCHED", "CACHE_ADDED", "CLIENT_REGISTRY_AVAILABLE");`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`@Test`
`313`	`313`	`public void test_F_notifs_on_remove_cache() throws Exception {`
`314`	`314`	`cacheManager.removeCache("cache-2");`
`315`	`315`
`316`		`- waitForAllNotifications("CACHE_REMOVED", "SERVER_ENTITY_UNFETCHED");`
	`316`	`+ waitForAllNotifications("CACHE_REMOVED", "SERVER_ENTITY_UNFETCHED", "CLIENT_REGISTRY_AVAILABLE");`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`@Test`