From f485660482b6077360c4a3a1b65d723a1308c268 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Wed, 21 Sep 2016 17:16:23 +0200
Subject: [PATCH] Upgrade Spring Session to 1.3.0.M2

Closes gh-6979
---
 .../session/SessionAutoConfigurationTests.java             | 5 +++--
 spring-boot-dependencies/pom.xml                           | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java
index 4519e002e3..812d76721c 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java
@@ -37,6 +37,7 @@ import org.springframework.session.ExpiringSession;
 import org.springframework.session.MapSessionRepository;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.data.mongo.MongoOperationsSessionRepository;
+import org.springframework.session.hazelcast.HazelcastSessionRepository;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
@@ -107,7 +108,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat
 	public void hazelcastSessionStore() {
 		load(Collections.<Class<?>>singletonList(HazelcastConfiguration.class),
 				"spring.session.store-type=hazelcast");
-		validateSessionRepository(MapSessionRepository.class);
+		validateSessionRepository(HazelcastSessionRepository.class);
 	}
 
 	@Test
@@ -115,7 +116,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat
 		load(Collections.<Class<?>>singletonList(HazelcastSpecificMap.class),
 				"spring.session.store-type=hazelcast",
 				"spring.session.hazelcast.map-name=foo:bar:biz");
-		validateSessionRepository(MapSessionRepository.class);
+		validateSessionRepository(HazelcastSessionRepository.class);
 		HazelcastInstance hazelcastInstance = this.context
 				.getBean(HazelcastInstance.class);
 		verify(hazelcastInstance, times(1)).getMap("foo:bar:biz");
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7563805246..2aedcb681c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -160,7 +160,7 @@
 		<spring-security.version>4.1.3.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.5.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.0.11.RELEASE</spring-security-oauth.version>
-		<spring-session.version>1.2.2.RELEASE</spring-session.version>
+		<spring-session.version>1.3.0.M2</spring-session.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>
 		<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
 		<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
@@ -2244,6 +2244,11 @@
 				<artifactId>spring-session-data-mongo</artifactId>
 				<version>${spring-session.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.session</groupId>
+				<artifactId>spring-session-hazelcast</artifactId>
+				<version>${spring-session.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session-jdbc</artifactId>