From 79155a53131a98f4db8cb119e1fc167bd63ec73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= <galder@zamarreno.com>
Date: Mon, 25 Jun 2018 17:10:12 +0200
Subject: [PATCH 1/2] Upgrade to Infinispan 9.3.0.Final

See gh-13570
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 6d809833110..6ed62c3d4f6 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -76,7 +76,7 @@
 		<httpasyncclient.version>4.1.3</httpasyncclient.version>
 		<httpclient.version>4.5.5</httpclient.version>
 		<httpcore.version>4.4.10</httpcore.version>
-		<infinispan.version>9.1.7.Final</infinispan.version>
+		<infinispan.version>9.3.0.Final</infinispan.version>
 		<influxdb-java.version>2.11</influxdb-java.version>
 		<jackson.version>2.9.6</jackson.version>
 		<janino.version>3.0.8</janino.version>
@@ -1867,11 +1867,6 @@
 				<artifactId>hibernate-hikaricp</artifactId>
 				<version>${hibernate.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-infinispan</artifactId>
-				<version>${hibernate.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-java8</artifactId>
@@ -2009,7 +2004,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-hibernate-cache</artifactId>
+				<artifactId>infinispan-hibernate-cache-v53</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
 			<dependency>

From bc65c4cb2c733ec88837eacbc618d6c11e5642c9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 4 Jul 2018 14:00:22 +0100
Subject: [PATCH 2/2] Update Infinispan dependency management for changes
 between 9.1 and 9.3

Closes gh-13570
---
 .../spring-boot-dependencies/pom.xml          | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 6ed62c3d4f6..7028213a994 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -1957,11 +1957,6 @@
 				<artifactId>infinispan-cdi-remote</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-cli</artifactId>
-				<version>${infinispan.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
 				<artifactId>infinispan-client-hotrod</artifactId>
@@ -1979,27 +1974,22 @@
 			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-commons</artifactId>
-				<version>${infinispan.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-core</artifactId>
+				<artifactId>infinispan-clustered-lock</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-directory-provider</artifactId>
+				<artifactId>infinispan-commons</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-embedded</artifactId>
+				<artifactId>infinispan-core</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-embedded-query</artifactId>
+				<artifactId>infinispan-directory-provider</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
 			<dependency>
@@ -2057,11 +2047,6 @@
 				<artifactId>infinispan-query-dsl</artifactId>
 				<version>${infinispan.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.infinispan</groupId>
-				<artifactId>infinispan-remote</artifactId>
-				<version>${infinispan.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
 				<artifactId>infinispan-remote-query-client</artifactId>