Merge pull request wildfly#17369 from pferraro/infinispan

WFLY-18630 Upgrade Infinispan to 14.0.20.Final
ropalka · Nov 6, 2023 · a6a8a53 · a6a8a53
2 parents 4c4b279 + fe6e23a
commit a6a8a53
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.../src/main/java/org/jboss/as/clustering/infinispan/client/ManagedRemoteCacheContainer.java b/.../src/main/java/org/jboss/as/clustering/infinispan/client/ManagedRemoteCacheContainer.java
@@ -108,6 +108,11 @@ public boolean isStarted() {
         return this.container.isStarted();
     }
 
+    @Override
+    public String getCurrentClusterName() {
+        return this.container.getCurrentClusterName();
+    }
+
     @Override
     public boolean switchToCluster(String clusterName) {
         return this.container.switchToCluster(clusterName);

diff --git a/pom.xml b/pom.xml
@@ -493,7 +493,7 @@
         <version.org.hibernate.search>6.2.2.Final</version.org.hibernate.search>
         <version.org.hibernate.validator>8.0.1.Final</version.org.hibernate.validator>
         <version.org.hornetq>2.4.9.Final</version.org.hornetq>
-        <version.org.infinispan>14.0.17.Final</version.org.infinispan>
+        <version.org.infinispan>14.0.20.Final</version.org.infinispan>
         <version.org.infinispan.protostream>4.6.5.Final</version.org.infinispan.protostream>
         <version.org.jasypt>1.9.3</version.org.jasypt>
         <version.org.jberet>2.1.3.Final</version.org.jberet>

diff --git a/...g/src/test/java/org/jboss/as/test/clustering/cluster/jsf/AbstractJSFFailoverTestCase.java b/...g/src/test/java/org/jboss/as/test/clustering/cluster/jsf/AbstractJSFFailoverTestCase.java
@@ -15,7 +15,6 @@
 
 import jakarta.servlet.http.HttpServletResponse;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.methods.HttpGet;
@@ -27,6 +26,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase;
@@ -53,7 +53,7 @@ private static NumberGuessState parseState(HttpResponse response, String session
         Matcher matcher;
 
         NumberGuessState state = new NumberGuessState();
-        String responseString = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+        String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
 
         Map.Entry<String, String> sessionRouteEntry = parseSessionRoute(response);
         state.sessionId = (sessionRouteEntry != null) ? sessionRouteEntry.getKey() : sessionId;