Release 2.2.0.M2

Upgrade Spring Security to 5.2.0.M3
Resolves: #1437
2019-06-14 23:26:47 +02:00 · 2019-06-14 23:04:55 +02:00 · 2019-06-14 22:55:38 +02:00 · 2019-06-14 22:55:21 +02:00 · 2019-06-14 22:55:11 +02:00 · 2019-06-14 15:38:52 +02:00
444 changed files with 3484 additions and 2713 deletions
--- a/CODE_OF_CONDUCT.adoc
+++ b/CODE_OF_CONDUCT.adoc
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.

 This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -10,8 +10,8 @@ By participating, you  are expected to uphold this code. Please report unaccepta
 == Using GitHub issues

 We use GitHub issues to track bugs and enhancements. If you have a general usage question
-please ask on http://stackoverflow.com[Stack Overflow]. The Spring Session team and the
-broader community monitor the http://stackoverflow.com/tags/spring-session[`spring-session`]
+please ask on https://stackoverflow.com[Stack Overflow]. The Spring Session team and the
+broader community monitor the https://stackoverflow.com/tags/spring-session[`spring-session`]
 tag.

 If you are reporting a bug, please help to speed up problem diagnosis by providing as much
--- a/54
+++ b/54
@@ -12,10 +12,13 @@ try {
 	parallel check: {
 		stage('Check') {
 			timeout(time: 45, unit: 'MINUTES') {
-				node('ubuntu1804') {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
-						sh './gradlew clean check --no-daemon --refresh-dependencies'
+						withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
+							sh './gradlew clean check --no-daemon --refresh-dependencies --stacktrace'
+						}
 					}
 					catch (e) {
 						currentBuild.result = 'FAILED: check'
@@ -31,11 +34,12 @@ try {
 	jdk9: {
 		stage('JDK 9') {
 			timeout(time: 45, unit: 'MINUTES') {
-				node {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
 						withEnv(["JAVA_HOME=${tool 'jdk9'}"]) {
-							sh './gradlew clean test --no-daemon --refresh-dependencies'
+							sh './gradlew clean test --no-daemon --refresh-dependencies --stacktrace'
 						}
 					}
 					catch (e) {
@@ -49,11 +53,12 @@ try {
 	jdk10: {
 		stage('JDK 10') {
 			timeout(time: 45, unit: 'MINUTES') {
-				node {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
 						withEnv(["JAVA_HOME=${tool 'jdk10'}"]) {
-							sh './gradlew clean test --no-daemon --refresh-dependencies'
+							sh './gradlew clean test --no-daemon --refresh-dependencies --stacktrace'
 						}
 					}
 					catch (e) {
@@ -67,11 +72,12 @@ try {
 	jdk11: {
 		stage('JDK 11') {
 			timeout(time: 45, unit: 'MINUTES') {
-				node('ubuntu1804') {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
 						withEnv(["JAVA_HOME=${tool 'jdk11'}"]) {
-							sh './gradlew clean test integrationTest --no-daemon --refresh-dependencies'
+							sh './gradlew clean test integrationTest --no-daemon --refresh-dependencies --stacktrace'
 						}
 					}
 					catch (e) {
@@ -81,19 +87,40 @@ try {
 				}
 			}
 		}
+	},
+	jdk12: {
+		stage('JDK 12') {
+			timeout(time: 45, unit: 'MINUTES') {
+				node('linux') {
+					checkout scm
+					try {
+						withEnv(["JAVA_HOME=${tool 'openjdk12'}"]) {
+							sh './gradlew clean test integrationTest --no-daemon --refresh-dependencies --stacktrace'
+						}
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: jdk12'
+						throw e
+					}
+				}
+			}
+		}
 	}

 	if (currentBuild.result == 'SUCCESS') {
 		parallel artifacts: {
 			stage('Deploy Artifacts') {
-				node {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
 						withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
 							withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
 								withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
 									withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
-										sh './gradlew deployArtifacts finalizeDeployArtifacts --stacktrace --no-daemon --refresh-dependencies -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD'
+										withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
+											sh './gradlew deployArtifacts finalizeDeployArtifacts --no-daemon --refresh-dependencies --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD'
+										}
 									}
 								}
 							}
@@ -108,11 +135,14 @@ try {
 		},
 		docs: {
 			stage('Deploy Docs') {
-				node {
+				node('linux') {
 					checkout scm
+					sh "git clean -dfx"
 					try {
 						withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
-							sh './gradlew deployDocs --stacktrace --no-daemon --refresh-dependencies -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME'
+							withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
+								sh './gradlew deployDocs --no-daemon --refresh-dependencies --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME'
+							}
 						}
 					}
 					catch (e) {
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
--- a/README.adoc
+++ b/README.adoc
@@ -25,8 +25,8 @@ By participating, you  are expected to uphold this code. Please report unaccepta

 == Spring Session Project Site

-You can find the documentation, issue management, support, samples, and guides for using Spring Session at http://projects.spring.io/spring-session/
+You can find the documentation, issue management, support, samples, and guides for using Spring Session at https://projects.spring.io/spring-session/

 == License

-Spring Session is Open Source software released under the http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
+Spring Session is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)

-		springBootVersion = '2.1.3.RELEASE'
+		springBootVersion = '2.2.0.M2'
 	}

 	repositories {
@@ -13,26 +13,28 @@ buildscript {
 	}

 	dependencies {
-		classpath 'io.spring.gradle:spring-build-conventions:0.0.23.RELEASE'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.25.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
 	}
 }

 apply plugin: 'io.spring.convention.root'
+apply plugin: 'io.spring.nohttp'
+
+repositories {
+	mavenCentral()
+}

 group = 'org.springframework.session'
 description = 'Spring Session'

-gradle.taskGraph.whenReady { graph ->
-	def jacocoEnabled = graph.allTasks.any { it instanceof JacocoReport }
-	subprojects {
-		plugins.withType(JavaPlugin) {
-			sourceCompatibility = 1.8
-		}
-		plugins.withType(JacocoPlugin) {
-			tasks.withType(Test) {
-				jacoco.enabled = jacocoEnabled
-			}
+subprojects {
+	plugins.withType(JavaPlugin) {
+		sourceCompatibility = JavaVersion.VERSION_1_8
+
+		tasks.withType(Test) {
+			useJUnitPlatform()
 		}
 	}
 }
--- a/docs/src/docs/asciidoc/guides/grails3.adoc
+++ b/docs/src/docs/asciidoc/guides/grails3.adoc
@@ -1,151 +0,0 @@
-= Spring Session - Grails
-Eric Helgeson
-:toc:
-
-This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when you use Grails 3.1
-
-NOTE: Grails 3.1 is based off spring boot 1.3, so much of the advanced configuration and options can be found in the Boot docs as well.
-
-NOTE: You can find the completed guid in the <<grails3-sample, Grails 3 sample application>>.
-
-== Updating Dependencies
-
-Before you use Spring Session, you must update your dependencies.
-We assume you are working with a working Grails 3.1 web profile.
-You must add the following dependencies:
-
-====
-.build.gradle
-[source,groovy]
-[subs="verbatim,attributes"]
----
-dependencies {
-    compile 'org.springframework.boot:spring-boot-starter-redis'
-    compile 'org.springframework.session:spring-session:{spring-session-version}'
-}
----
-====
-
-ifeval::["{version-snapshot}" == "true"]
-Since we use a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
-You must have the following in your build.gradle:
-
-====
-.build.gradle
-[source,groovy]
----
-repositories {
-    maven {
-        url 'https://repo.spring.io/libs-snapshot'
-    }
-}
----
-====
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we use a Milestone version, we need to add the Spring Milestone Maven Repository.
-You must have the following in your build.gradle:
-
-====
-.build.gradle
-[source,groovy]
----
-repositories {
-    maven {
-        url 'https://repo.spring.io/libs-milestone'
-    }
-}
----
-====
-endif::[]
-
-[[grails3-redis-configuration]]
-== Configuring the Redis Connection
-
-Spring Boot automatically creates a `RedisConnectionFactory` that connects Spring Session to a Redis Server on localhost on port 6379 (default port).
-In a production environment you need to ensure to update your configuration to point to your Redis server.
-For example, you can include the following in your application.yml:
-
-====
-.grails-app/conf/application.yml
-[source,yml]
----
-spring:
-  redis:
-    host: localhost
-    password: secret
-    port: 6397
----
-====
-
-For more information, see the https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
-
-[[grails3-sample]]
-== Grails 3 Sample Application
-
-The Grails 3 Sample Application demonstrates how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Grails.
-
-[[grails3-running]]
-=== Running the Grails 3 Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
----
-$ ./gradlew :spring-session-sample-misc-grails3:bootRun
----
-
-NOTE:For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
-Another option is to use https://www.docker.com/[Docker] to run Redis on localhost.
-See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
-
-You should now be able to access the application at http://localhost:8080/test/index
-
-[[grails3-explore]]
-=== Exploring the `security` Sample Application
-
-You can now try using the application. Enter the following to log in:
-
-* *Username* _user_
-* *Password* _password_
-
-Now click the *Login* button.
-You should now see a message indicating that your are logged in with the user entered previously.
-The user's information is stored in Redis rather than Tomcat's `HttpSession` implementation.
-
-[[grails3-how]]
-=== How Does It Work?
-
-Instead of using Tomcat's `HttpSession`, we persist the values in Redis.
-Spring Session replaces the `HttpSession` with an implementation that is backed by Redis.
-When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession`, it is then persisted into Redis.
-
-When a new `HttpSession` is created, Spring Session creates a cookie named `SESSION` in your browser.
-That cookie contains the ID of your session.
-You can view the cookies (with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
-
-You can remove the session by using redis-cli.
-For example, on a Linux based system you can type the following:
-
-====
----
-	$ redis-cli keys '*' | xargs redis-cli del
----
-====
-
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
-
-Alternatively, you can also delete the explicit key.
-To do so, enter the following into your terminal, being sure to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your `SESSION` cookie:
-
-====
----
-	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
----
-====
-
-Now you can visit the application at http://localhost:8080/test/index and see that we are no longer authenticated.
-
-NOTE: Spring Session does not work with Grails flash scope without additional work.
-See https://stackoverflow.com/a/43311427  for an explanation.
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -1,12 +1,37 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+		"https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
-	<!-- Supressions -->
 	<module name="SuppressionFilter">
 		<property name="file" value="${config_loc}/suppressions.xml"/>
 	</module>
-
-	<!-- Root Checks -->
 	<module name="io.spring.javaformat.checkstyle.SpringChecks"/>
+	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
+			<property name="regexp" value="true"/>
+			<property name="illegalPkgs"
+					value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"/>
+			<property name="illegalClasses"
+					value="^reactor\.core\.support\.Assert, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.junit\.Assert\.assert"/>
+			<property name="message" value="Please use AssertJ imports."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format"
+					value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)"/>
+			<property name="message" value="Please use specialized AssertJ assertThat*Exception method."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)"/>
+			<property name="message" value="Please use BDDMockito imports."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+	</module>
 </module>
--- a/etc/checkstyle/suppressions.xml
+++ b/etc/checkstyle/suppressions.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<!-- global -->
 	<suppress files="[\\/]src[\\/]integration-test[\\/]java[\\/]" checks="Javadoc*"/>
-
-	<!-- docs -->
-	<suppress files="[\\/]docs[\\/]" checks="Javadoc*"/>
-	<suppress files="[\\/]docs[\\/]" checks="InnerTypeLast"/>
-
-	<!-- samples -->
-	<suppress files="[\\/]samples[\\/]" checks="Javadoc*"/>
-	<suppress files="[\\/]samples[\\/].+Application\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files="[\\/]spring-session-docs[\\/]" checks="Javadoc*"/>
+	<suppress files="[\\/]spring-session-docs[\\/]" checks="InnerTypeLast"/>
+	<suppress files="[\\/]spring-session-samples[\\/]" checks="Javadoc*"/>
+	<suppress files="[\\/]spring-session-samples[\\/].+Application\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files="SessionRepositoryFilterTests\.java" checks="SpringLambda"/>
 </suppressions>
--- a/etc/eclipse/org.eclipse.jdt.ui.prefs
+++ b/etc/eclipse/org.eclipse.jdt.ui.prefs
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.1.5.BUILD-SNAPSHOT
+version=2.2.0.M2
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,33 +1,33 @@
 dependencyManagement {
 	imports {
 		mavenBom 'com.fasterxml.jackson:jackson-bom:2.9.6'
-		mavenBom 'io.projectreactor:reactor-bom:Californium-SR5'
-		mavenBom 'org.springframework:spring-framework-bom:5.1.5.RELEASE'
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-SR5'
-		mavenBom 'org.springframework.security:spring-security-bom:5.1.4.RELEASE'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.10.6'
+		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-M2'
+		mavenBom 'org.junit:junit-bom:5.4.2'
+		mavenBom 'org.springframework:spring-framework-bom:5.2.0.M3'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-RC1'
+		mavenBom 'org.springframework.security:spring-security-bom:5.2.0.M3'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.11.3'
 	}

 	dependencies {
-		dependencySet(group: 'com.hazelcast', version: '3.11.1') {
+		dependencySet(group: 'com.hazelcast', version: '3.12.1') {
 			entry 'hazelcast'
 			entry 'hazelcast-client'
 		}

-		dependency 'com.h2database:h2:1.4.197'
-		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.2.1.jre8'
+		dependency 'com.h2database:h2:1.4.199'
+		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8'
 		dependency 'com.zaxxer:HikariCP:3.3.1'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:5.1.4.RELEASE'
+		dependency 'io.lettuce:lettuce-core:5.1.7.RELEASE'
 		dependency 'javax.annotation:javax.annotation-api:1.3.2'
 		dependency 'javax.servlet:javax.servlet-api:4.0.1'
-		dependency 'junit:junit:4.12'
-		dependency 'mysql:mysql-connector-java:8.0.15'
+		dependency 'mysql:mysql-connector-java:8.0.16'
 		dependency 'org.apache.derby:derby:10.14.2.0'
-		dependency 'org.assertj:assertj-core:3.11.1'
-		dependency 'org.hsqldb:hsqldb:2.4.1'
-		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.0'
-		dependency 'org.mockito:mockito-core:2.24.0'
+		dependency 'org.assertj:assertj-core:3.12.2'
+		dependency 'org.hsqldb:hsqldb:2.5.0'
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
+		dependency 'org.mockito:mockito-core:2.28.2'
 		dependency 'org.postgresql:postgresql:42.2.5'
 	}
 }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/18
+++ b/18
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh

+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
--- a/samples/misc/grails3/gradle.properties
+++ b/samples/misc/grails3/gradle.properties
@@ -1 +0,0 @@
-grailsVersion=3.1.4
--- a/samples/misc/grails3/grails-app/conf/application.groovy
+++ b/samples/misc/grails3/grails-app/conf/application.groovy
@@ -1,28 +0,0 @@
-
-
-// Added by the Spring Security Core plugin:
-grails.plugin.springsecurity.userLookup.userDomainClassName = 'grails3.redis.session.User'
-grails.plugin.springsecurity.userLookup.authorityJoinClassName = 'grails3.redis.session.UserRole'
-grails.plugin.springsecurity.authority.className = 'grails3.redis.session.Role'
-grails.plugin.springsecurity.controllerAnnotations.staticRules = [
-	[pattern: '/',               access: ['permitAll']],
-	[pattern: '/error',          access: ['permitAll']],
-	[pattern: '/index',          access: ['permitAll']],
-	[pattern: '/index.gsp',      access: ['permitAll']],
-	[pattern: '/shutdown',       access: ['permitAll']],
-	[pattern: '/assets/**',      access: ['permitAll']],
-	[pattern: '/**/js/**',       access: ['permitAll']],
-	[pattern: '/**/css/**',      access: ['permitAll']],
-	[pattern: '/**/images/**',   access: ['permitAll']],
-	[pattern: '/**/favicon.ico', access: ['permitAll']]
-]
-
-grails.plugin.springsecurity.filterChain.chainMap = [
-	[pattern: '/assets/**',      filters: 'none'],
-	[pattern: '/**/js/**',       filters: 'none'],
-	[pattern: '/**/css/**',      filters: 'none'],
-	[pattern: '/**/images/**',   filters: 'none'],
-	[pattern: '/**/favicon.ico', filters: 'none'],
-	[pattern: '/**',             filters: 'JOINED_FILTERS']
-]
-
--- a/samples/misc/grails3/grails-app/conf/application.yml
+++ b/samples/misc/grails3/grails-app/conf/application.yml
@@ -1,122 +0,0 @@
---
-hibernate:
-    cache:
-        queries: false
-        use_second_level_cache: true
-        use_query_cache: false
-        region.factory_class: 'org.hibernate.cache.ehcache.EhCacheRegionFactory'
-
-dataSource:
-    pooled: true
-    jmxExport: true
-    driverClassName: org.h2.Driver
-    username: sa
-    password:
-
-environments:
-    development:
-        dataSource:
-            dbCreate: create-drop
-            url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-    test:
-        dataSource:
-            dbCreate: update
-            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-    production:
-        dataSource:
-            dbCreate: update
-            url: jdbc:h2:./prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-            properties:
-                jmxEnabled: true
-                initialSize: 5
-                maxActive: 50
-                minIdle: 5
-                maxIdle: 25
-                maxWait: 10000
-                maxAge: 600000
-                timeBetweenEvictionRunsMillis: 5000
-                minEvictableIdleTimeMillis: 60000
-                validationQuery: SELECT 1
-                validationQueryTimeout: 3
-                validationInterval: 15000
-                testOnBorrow: true
-                testWhileIdle: true
-                testOnReturn: false
-                jdbcInterceptors: ConnectionState
-                defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED
-
---
---
-grails:
-    profile: web
-    codegen:
-        defaultPackage: grails3.redis.session
-    spring:
-        transactionManagement:
-            proxies: false
-info:
-    app:
-        name: '@info.app.name@'
-        version: '@info.app.version@'
-        grailsVersion: '@info.app.grailsVersion@'
-spring:
-
-    groovy:
-        template:
-            check-template-location: false
-
---
-grails:
-    mime:
-        disable:
-            accept:
-                header:
-                    userAgents:
-                        - Gecko
-                        - WebKit
-                        - Presto
-                        - Trident
-        types:
-            all: '*/*'
-            atom: application/atom+xml
-            css: text/css
-            csv: text/csv
-            form: application/x-www-form-urlencoded
-            html:
-              - text/html
-              - application/xhtml+xml
-            js: text/javascript
-            json:
-              - application/json
-              - text/json
-            multipartForm: multipart/form-data
-            pdf: application/pdf
-            rss: application/rss+xml
-            text: text/plain
-            hal:
-              - application/hal+json
-              - application/hal+xml
-            xml:
-              - text/xml
-              - application/xml
-    urlmapping:
-        cache:
-            maxsize: 1000
-    controllers:
-        defaultScope: singleton
-    converters:
-        encoding: UTF-8
-    views:
-        default:
-            codec: html
-        gsp:
-            encoding: UTF-8
-            htmlcodec: xml
-            codecs:
-                expression: html
-                scriptlets: html
-                taglib: none
-                staticparts: none
-endpoints:
-    jmx:
-        unique-names: true
--- a/samples/misc/grails3/grails-app/conf/logback.groovy
+++ b/samples/misc/grails3/grails-app/conf/logback.groovy
@@ -1,23 +0,0 @@
-import grails.util.BuildSettings
-import grails.util.Environment
-
-// See http://logback.qos.ch/manual/groovy.html for details on configuration
-appender('STDOUT', ConsoleAppender) {
-    encoder(PatternLayoutEncoder) {
-        pattern = "%level %logger - %msg%n"
-    }
-}
-
-root(ERROR, ['STDOUT'])
-
-def targetDir = BuildSettings.TARGET_DIR
-if (Environment.isDevelopmentMode() && targetDir) {
-    appender("FULL_STACKTRACE", FileAppender) {
-        file = "${targetDir}/stacktrace.log"
-        append = true
-        encoder(PatternLayoutEncoder) {
-            pattern = "%level %logger - %msg%n"
-        }
-    }
-    logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false)
-}
--- a/samples/misc/grails3/grails-app/conf/spring/resources.groovy
+++ b/samples/misc/grails3/grails-app/conf/spring/resources.groovy
@@ -1,3 +0,0 @@
-// Place your Spring DSL code here
-beans = {
-}
--- a/samples/misc/grails3/grails-app/controllers/grails3/redis/session/TestController.groovy
+++ b/samples/misc/grails3/grails-app/controllers/grails3/redis/session/TestController.groovy
@@ -1,8 +0,0 @@
-package grails3.redis.session
-
-import grails.plugin.springsecurity.annotation.Secured
-
-class TestController {
-  @Secured('ROLE_ADMIN')
-  def index() { } // Renders `test/index.gsp`
-}
--- a/samples/misc/grails3/grails-app/controllers/grails3/redis/session/UrlMappings.groovy
+++ b/samples/misc/grails3/grails-app/controllers/grails3/redis/session/UrlMappings.groovy
@@ -1,16 +0,0 @@
-package grails3.redis.session
-
-class UrlMappings {
-
-    static mappings = {
-        "/$controller/$action?/$id?(.$format)?"{
-            constraints {
-                // apply constraints here
-            }
-        }
-
-        "/"(view:"/index")
-        "500"(view:'/error')
-        "404"(view:'/notFound')
-    }
-}
--- a/samples/misc/grails3/grails-app/domain/grails3/redis/session/Role.groovy
+++ b/samples/misc/grails3/grails-app/domain/grails3/redis/session/Role.groovy
@@ -1,26 +0,0 @@
-package grails3.redis.session
-
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.ToString
-
-@EqualsAndHashCode(includes='authority')
-@ToString(includes='authority', includeNames=true, includePackage=false)
-class Role implements Serializable {
-
-	private static final long serialVersionUID = 1
-
-	String authority
-
-	Role(String authority) {
-		this()
-		this.authority = authority
-	}
-
-	static constraints = {
-		authority blank: false, unique: true
-	}
-
-	static mapping = {
-		cache true
-	}
-}
--- a/samples/misc/grails3/grails-app/domain/grails3/redis/session/User.groovy
+++ b/samples/misc/grails3/grails-app/domain/grails3/redis/session/User.groovy
@@ -1,55 +0,0 @@
-package grails3.redis.session
-
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.ToString
-
-@EqualsAndHashCode(includes='username')
-@ToString(includes='username', includeNames=true, includePackage=false)
-class User implements Serializable {
-
-	private static final long serialVersionUID = 1
-
-	transient springSecurityService
-
-	String username
-	String password
-	boolean enabled = true
-	boolean accountExpired
-	boolean accountLocked
-	boolean passwordExpired
-
-	User(String username, String password) {
-		this()
-		this.username = username
-		this.password = password
-	}
-
-	Set<Role> getAuthorities() {
-		UserRole.findAllByUser(this)*.role
-	}
-
-	def beforeInsert() {
-		encodePassword()
-	}
-
-	def beforeUpdate() {
-		if (isDirty('password')) {
-			encodePassword()
-		}
-	}
-
-	protected void encodePassword() {
-		password = springSecurityService?.passwordEncoder ? springSecurityService.encodePassword(password) : password
-	}
-
-	static transients = ['springSecurityService']
-
-	static constraints = {
-		password blank: false, password: true
-		username blank: false, unique: true
-	}
-
-	static mapping = {
-		password column: '`password`'
-	}
-}
--- a/samples/misc/grails3/grails-app/domain/grails3/redis/session/UserRole.groovy
+++ b/samples/misc/grails3/grails-app/domain/grails3/redis/session/UserRole.groovy
@@ -1,103 +0,0 @@
-package grails3.redis.session
-
-import grails.gorm.DetachedCriteria
-import groovy.transform.ToString
-
-import org.apache.commons.lang.builder.HashCodeBuilder
-
-@ToString(cache=true, includeNames=true, includePackage=false)
-class UserRole implements Serializable {
-
-	private static final long serialVersionUID = 1
-
-	User user
-	Role role
-
-	UserRole(User u, Role r) {
-		this()
-		user = u
-		role = r
-	}
-
-	@Override
-	boolean equals(other) {
-		if (!(other instanceof UserRole)) {
-			return false
-		}
-
-		other.user?.id == user?.id && other.role?.id == role?.id
-	}
-
-	@Override
-	int hashCode() {
-		def builder = new HashCodeBuilder()
-		if (user) builder.append(user.id)
-		if (role) builder.append(role.id)
-		builder.toHashCode()
-	}
-
-	static UserRole get(long userId, long roleId) {
-		criteriaFor(userId, roleId).get()
-	}
-
-	static boolean exists(long userId, long roleId) {
-		criteriaFor(userId, roleId).count()
-	}
-
-	private static DetachedCriteria criteriaFor(long userId, long roleId) {
-		UserRole.where {
-			user == User.load(userId) &&
-			role == Role.load(roleId)
-		}
-	}
-
-	static UserRole create(User user, Role role, boolean flush = false) {
-		def instance = new UserRole(user: user, role: role)
-		instance.save(flush: flush, insert: true)
-		instance
-	}
-
-	static boolean remove(User u, Role r, boolean flush = false) {
-		if (u == null || r == null) return false
-
-		int rowCount = UserRole.where { user == u && role == r }.deleteAll()
-
-		if (flush) { UserRole.withSession { it.flush() } }
-
-		rowCount
-	}
-
-	static void removeAll(User u, boolean flush = false) {
-		if (u == null) return
-
-		UserRole.where { user == u }.deleteAll()
-
-		if (flush) { UserRole.withSession { it.flush() } }
-	}
-
-	static void removeAll(Role r, boolean flush = false) {
-		if (r == null) return
-
-		UserRole.where { role == r }.deleteAll()
-
-		if (flush) { UserRole.withSession { it.flush() } }
-	}
-
-	static constraints = {
-		role validator: { Role r, UserRole ur ->
-			if (ur.user == null || ur.user.id == null) return
-			boolean existing = false
-			UserRole.withNewSession {
-				existing = UserRole.exists(ur.user.id, r.id)
-			}
-			if (existing) {
-				return 'userRole.exists'
-			}
-		}
-	}
-
-	static mapping = {
-		id composite: ['user', 'role']
-		version false
-	}
-}
--- a/samples/misc/grails3/grails-app/i18n/messages.properties
+++ b/samples/misc/grails3/grails-app/i18n/messages.properties
@@ -1,56 +0,0 @@
-default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]
-default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL
-default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number
-default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address
-default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}]
-default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}]
-default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}]
-default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}]
-default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}]
-default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}]
-default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation
-default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}]
-default.blank.message=Property [{0}] of class [{1}] cannot be blank
-default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}]
-default.null.message=Property [{0}] of class [{1}] cannot be null
-default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique
-
-default.paginate.prev=Previous
-default.paginate.next=Next
-default.boolean.true=True
-default.boolean.false=False
-default.date.format=yyyy-MM-dd HH:mm:ss z
-default.number.format=0
-
-default.created.message={0} {1} created
-default.updated.message={0} {1} updated
-default.deleted.message={0} {1} deleted
-default.not.deleted.message={0} {1} could not be deleted
-default.not.found.message={0} not found with id {1}
-default.optimistic.locking.failure=Another user has updated this {0} while you were editing
-
-default.home.label=Home
-default.list.label={0} List
-default.add.label=Add {0}
-default.new.label=New {0}
-default.create.label=Create {0}
-default.show.label=Show {0}
-default.edit.label=Edit {0}
-
-default.button.create.label=Create
-default.button.edit.label=Edit
-default.button.update.label=Update
-default.button.delete.label=Delete
-default.button.delete.confirm.message=Are you sure?
-
-# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author)
-typeMismatch.java.net.URL=Property {0} must be a valid URL
-typeMismatch.java.net.URI=Property {0} must be a valid URI
-typeMismatch.java.util.Date=Property {0} must be a valid Date
-typeMismatch.java.lang.Double=Property {0} must be a valid number
-typeMismatch.java.lang.Integer=Property {0} must be a valid number
-typeMismatch.java.lang.Long=Property {0} must be a valid number
-typeMismatch.java.lang.Short=Property {0} must be a valid number
-typeMismatch.java.math.BigDecimal=Property {0} must be a valid number
-typeMismatch.java.math.BigInteger=Property {0} must be a valid number
-typeMismatch=Property {0} is type-mismatched
--- a/samples/misc/grails3/grails-app/init/BootStrap.groovy
+++ b/samples/misc/grails3/grails-app/init/BootStrap.groovy
@@ -1,24 +0,0 @@
-import grails3.redis.session.*
-
-class BootStrap {
-
-    def init = { servletContext ->
-      def adminRole = new Role('ROLE_ADMIN').save()
-      def userRole = new Role('ROLE_USER').save()
-
-      def testUser = new User('user', 'password').save()
-
-      UserRole.create testUser, adminRole
-
-      UserRole.withSession {
-         it.flush()
-         it.clear()
-      }
-
-      assert User.count() == 1
-      assert Role.count() == 2
-      assert UserRole.count() == 1
-    }
-    def destroy = {
-    }
-}
--- a/samples/misc/grails3/grails-app/init/grails3/redis/session/Application.groovy
+++ b/samples/misc/grails3/grails-app/init/grails3/redis/session/Application.groovy
@@ -1,10 +0,0 @@
-package grails3.redis.session
-
-import grails.boot.GrailsApp
-import grails.boot.config.GrailsAutoConfiguration
-
-class Application extends GrailsAutoConfiguration {
-    static void main(String[] args) {
-        GrailsApp.run(Application, args)
-    }
-}
--- a/samples/misc/grails3/grails-app/views/error.gsp
+++ b/samples/misc/grails3/grails-app/views/error.gsp
@@ -1,31 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
-        <meta name="layout" content="main">
-        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
-    </head>
-    <body>
-        <g:if env="development">
-            <g:if test="${Throwable.isInstance(exception)}">
-                <g:renderException exception="${exception}" />
-            </g:if>
-            <g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
-                <g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}" />
-            </g:elseif>
-            <g:else>
-                <ul class="errors">
-                    <li>An error has occurred</li>
-                    <li>Exception: ${exception}</li>
-                    <li>Message: ${message}</li>
-                    <li>Path: ${path}</li>
-                </ul>
-            </g:else>
-        </g:if>
-        <g:else>
-            <ul class="errors">
-                <li>An error has occurred</li>
-            </ul>
-        </g:else>
-    </body>
-</html>
--- a/samples/misc/grails3/grails-app/views/index.gsp
+++ b/samples/misc/grails3/grails-app/views/index.gsp
@@ -1,8 +0,0 @@
-<html>
-<head>
-  <title>Index</title>
-</head>
-<body>
-  Left blank, goto <a href="/test">test</a>
-</body>
-</html>
--- a/samples/misc/grails3/grails-app/views/notFound.gsp
+++ b/samples/misc/grails3/grails-app/views/notFound.gsp
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Page Not Found</title>
-        <meta name="layout" content="main">
-        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
-    </head>
-    <body>
-        <ul class="errors">
-            <li>Error: Page Not Found (404)</li>
-            <li>Path: ${request.forwardURI}</li>
-        </ul>
-    </body>
-</html>
--- a/samples/misc/grails3/grails-app/views/test/index.gsp
+++ b/samples/misc/grails3/grails-app/views/test/index.gsp
@@ -1,16 +0,0 @@
-<html>
-<head>
-  <title>Home Page</title>
-</head>
-<body>
-  <div id="un">
-    <sec:loggedInUserInfo field='username'/>
-  </div>
-  <div id="session">
-    ${session.id}
-  </div>
-  <form action="/logout" method="post">
-    <input type="submit" value="Log Out"/>
-  </form>
-</body>
-</html>
--- a/samples/misc/grails3/spring-session-sample-misc-grails3.gradle
+++ b/samples/misc/grails3/spring-session-sample-misc-grails3.gradle
@@ -1,71 +0,0 @@
-buildscript {
-	ext {
-		grailsVersion = project.grailsVersion
-	}
-	repositories {
-		mavenLocal()
-		maven { url "https://repo.grails.org/grails/core" }
-	}
-	dependencies {
-		classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-		classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.5.0"
-		classpath "org.grails.plugins:hibernate4:5.0.2"
-	}
-}
-
-apply plugin: "eclipse"
-apply plugin: "idea"
-apply plugin: "war"
-apply plugin: "org.grails.grails-web"
-apply plugin: "org.grails.grails-gsp"
-apply plugin: "asset-pipeline"
-apply from: SAMPLE_GRADLE
-
-ext {
-	grailsVersion = project.grailsVersion
-}
-
-repositories {
-	mavenLocal()
-	maven { url "https://repo.grails.org/grails/core" }
-}
-
-dependencyManagement {
-	imports {
-		mavenBom "org.grails:grails-bom:$grailsVersion"
-	}
-	applyMavenExclusions false
-}
-
-dependencies {
-	compile "org.springframework.boot:spring-boot-starter-logging"
-	compile "org.springframework.boot:spring-boot-autoconfigure"
-	compile "org.grails:grails-core"
-	compile "org.springframework.boot:spring-boot-starter-actuator"
-	compile "org.springframework.boot:spring-boot-starter-tomcat"
-	compile "org.grails:grails-dependencies"
-	compile "org.grails:grails-web-boot"
-	compile "org.grails.plugins:cache"
-	compile "org.grails.plugins:scaffolding"
-	compile "org.grails.plugins:hibernate4"
-	compile "org.hibernate:hibernate-ehcache"
-	console "org.grails:grails-console"
-	profile "org.grails.profiles:web:3.1.4"
-	runtime "org.grails.plugins:asset-pipeline"
-	runtime "com.h2database:h2"
-	testCompile "org.grails:grails-plugin-testing"
-	testCompile "org.grails.plugins:geb"
-	testCompile "org.assertj:assertj-core"
-	testCompile "org.seleniumhq.selenium:selenium-htmlunit-driver"
-	testCompile "net.sourceforge.htmlunit:htmlunit"
-
-	compile "org.springframework.boot:spring-boot-starter-redis"
-	compile 'org.springframework.session:spring-session:1.1.1.RELEASE'
-
-	compile 'org.grails.plugins:spring-security-core:3.0.4'
-}
-
-assets {
-	minifyJs = true
-	minifyCss = true
-}
--- a/samples/misc/grails3/src/integration-test/groovy/sample/HomeSpec.groovy
+++ b/samples/misc/grails3/src/integration-test/groovy/sample/HomeSpec.groovy
@@ -1,98 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample
-
-import grails.test.mixin.integration.Integration
-import grails.transaction.Transactional
-import org.springframework.boot.test.IntegrationTest
-
-import spock.lang.*
-import geb.spock.*
-
-import sample.pages.HomePage
-import sample.pages.LoginPage
-import sample.pages.IndexPage
-import spock.lang.Stepwise
-import pages.*
-
-/**
- * Functional tests for grails 3 and spring-session
- *
- * @author Eric Helgeson
- */
-
-@Stepwise
-@IntegrationTest("server.port:0")
-@Integration(applicationClass=grails3.redis.session.Application)
-class HomeSpec extends GebSpec {
-
-    def setup() {
-    }
-
-    def cleanup() {
-    }
-
-    void 'Anonymous page not redirected to login'() {
-        when: 'The index page is visited'
-        go '/'
-
-        then: 'Not redirected'
-        at IndexPage
-    }
-
-    void 'Unauthenticated user sent to log in page'() {
-        when: 'The test page is visited'
-        go '/test/index'
-        if(title != 'Login') {
-          println driver.pageSource
-        }
-
-        then: 'The password form is correct'
-        title == 'Login'
-        $('#password')
-        $('#username')
-    }
-
-    void 'Log in views home page'() {
-      when: 'log in successfully'
-      to LoginPage
-      login()
-
-      then: 'sent to original page'
-      at HomePage
-
-      and: 'the username is displayed'
-      username == 'user'
-
-      and: 'session id is not blank'
-      session != ''
-
-      and: 'Spring Session Management is being used'
-      driver.manage().cookies.find { it.name == 'SESSION' }
-
-      and: 'Standard Session is NOT being used'
-      !driver.manage().cookies.find { it.name == 'JSESSIONID' }
-    }
-
-    def 'Log out success'() {
-      when:
-      logout()
-
-      then:
-      at IndexPage
-    }
-}
--- a/samples/misc/grails3/src/integration-test/groovy/sample/pages/HomePage.groovy
+++ b/samples/misc/grails3/src/integration-test/groovy/sample/pages/HomePage.groovy
@@ -1,34 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample.pages
-
-import geb.*
-
-/**
- * The home page
- *
- * @author Rob Winch
- */
-class HomePage extends Page {
-  static url = '/test'
-  static at = { assert driver.title == 'Home Page'; true}
-  static content = {
-    username { $('#un').text() }
-    session { $('#session').text() }
-    logout(to:LoginPage) { $('input[type=submit]').click() }
-  }
-}
--- a/samples/misc/grails3/src/integration-test/groovy/sample/pages/IndexPage.groovy
+++ b/samples/misc/grails3/src/integration-test/groovy/sample/pages/IndexPage.groovy
@@ -1,30 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample.pages
-
-import geb.*
-
-/**
- * The Index page
- *
- * @author Eric Helgeson
- */
-class IndexPage extends Page {
-  static url = '/'
-  static at = { assert driver.title == 'Index'; true}
-  static content = { }
-}
--- a/samples/misc/grails3/src/integration-test/groovy/sample/pages/LoginPage.groovy
+++ b/samples/misc/grails3/src/integration-test/groovy/sample/pages/LoginPage.groovy
@@ -1,38 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample.pages
-
-import geb.*
-
-/**
- * The Login Page
- *
- * @author Rob Winch
- */
-class LoginPage extends Page {
-  static url = '/login'
-  static at = { assert driver.title == 'Login'; true}
-  static content = {
-    form { $('form') }
-    submit { $('input[type=submit]') }
-    login(required:false) { user='user', pass='password' ->
-      form.username = user
-      form.password = pass
-      submit.click()
-    }
-  }
-}
--- a/samples/xml/jdbc/src/integration-test/java/sample/pages/HomePage.java
+++ b/samples/xml/jdbc/src/integration-test/java/sample/pages/HomePage.java
@@ -1,135 +0,0 @@
-/*
- * Copyright 2014-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample.pages;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openqa.selenium.SearchContext;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Eddú Meléndez
- * @author Rob Winch
- */
-public class HomePage {
-
-	private WebDriver driver;
-
-	@FindBy(css = "form")
-	WebElement form;
-
-	@FindBy(css = "table tbody tr")
-	List<WebElement> trs;
-
-	List<Attribute> attributes;
-
-	public HomePage(WebDriver driver) {
-		this.driver = driver;
-		this.attributes = new ArrayList<>();
-	}
-
-	private static void get(WebDriver driver, String get) {
-		String baseUrl = "http://localhost:" + System.getProperty("app.port", "8080");
-		driver.get(baseUrl + get);
-	}
-
-	public static HomePage go(WebDriver driver) {
-		get(driver, "/");
-		return PageFactory.initElements(driver, HomePage.class);
-	}
-
-	public void assertAt() {
-		assertThat(this.driver.getTitle()).isEqualTo("Session Attributes");
-	}
-
-	public List<Attribute> attributes() {
-		List<Attribute> rows = new ArrayList<>();
-		for (WebElement tr : this.trs) {
-			rows.add(new Attribute(tr));
-		}
-		this.attributes.addAll(rows);
-		return this.attributes;
-	}
-
-	public Form form() {
-		return new Form(this.form);
-	}
-
-	public class Form {
-		@FindBy(name = "attributeName")
-		WebElement attributeName;
-
-		@FindBy(name = "attributeValue")
-		WebElement attributeValue;
-
-		@FindBy(css = "input[type=\"submit\"]")
-		WebElement submit;
-
-		public Form(SearchContext context) {
-			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
-		}
-
-		public Form attributeName(String text) {
-			this.attributeName.sendKeys(text);
-			return this;
-		}
-
-		public Form attributeValue(String text) {
-			this.attributeValue.sendKeys(text);
-			return this;
-		}
-
-		public <T> T submit(Class<T> page) {
-			this.submit.click();
-			return PageFactory.initElements(HomePage.this.driver, page);
-		}
-	}
-
-	public static class Attribute {
-		@FindBy(xpath = ".//td[1]")
-		WebElement attributeName;
-
-		@FindBy(xpath = ".//td[2]")
-		WebElement attributeValue;
-
-		public Attribute(SearchContext context) {
-			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
-		}
-
-		/**
-		 * @return the attributeName
-		 */
-		public String getAttributeName() {
-			return this.attributeName.getText();
-		}
-
-		/**
-		 * @return the attributeValue
-		 */
-		public String getAttributeValue() {
-			return this.attributeValue.getText();
-		}
-	}
-
-}
--- a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,48 +0,0 @@
-/*
- * Copyright 2014-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample;
-
-import org.testcontainers.containers.GenericContainer;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-
-@Configuration
-@Profile("embedded-redis")
-public class EmbeddedRedisConfig {
-
-	private static final String DOCKER_IMAGE = "redis:5.0.3";
-
-	@Bean
-	public GenericContainer redisContainer() {
-		GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
-				.withExposedPorts(6379);
-		redisContainer.start();
-		return redisContainer;
-	}
-
-	@Bean
-	@Primary
-	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
-				redisContainer().getFirstMappedPort());
-	}
-
-}
--- a/samples/xml/redis/src/main/resources/logback.xml
+++ b/samples/xml/redis/src/main/resources/logback.xml
@@ -1,14 +0,0 @@
-<configuration>
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-	<encoder>
-		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-	</encoder>
-	</appender>
-
-	<!-- <logger name="org.springframework.security" level="DEBUG"/> -->
-
-	<root level="INFO">
-	<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,28 +1,16 @@
 rootProject.name = 'spring-session-build'

-FileTree buildFiles = fileTree(rootDir) {
-	include '**/*.gradle'
-	exclude 'build', '**/gradle', 'settings.gradle', 'buildSrc', '/build.gradle', '.*', 'out'
-	exclude '**/grails3'
-	gradle.startParameter.projectProperties.get('excludeProjects')?.split(',')?.each { excludeProject ->
-		exclude excludeProject
-	}
+include 'spring-session-core'
+include 'spring-session-data-redis'
+include 'spring-session-docs'
+include 'spring-session-hazelcast'
+include 'spring-session-jdbc'
+
+file('spring-session-samples').eachDirMatch(~/spring-session-sample-.*/) { dir ->
+    include dir.name
+    project(":$dir.name").projectDir = dir
 }

-String rootDirPath = rootDir.absolutePath + File.separator
-buildFiles.each { buildFile ->
-	if (buildFile.name == 'build.gradle') {
-		String buildFilePath = buildFile.parentFile.absolutePath
-		String projectPath = buildFilePath.replace(rootDirPath, '').replace(File.separator, ':')
-		include projectPath
-	}
-	else {
-		String projectName = buildFile.name.replace('.gradle', '')
-		String projectPath = ':' + projectName
-		include projectPath
-		def project = findProject("${projectPath}")
-		project.name = projectName
-		project.projectDir = buildFile.parentFile
-		project.buildFileName = buildFile.name
-	}
+rootProject.children.each { project ->
+    project.buildFileName = "${project.name}.gradle"
 }
--- a/spring-session-core/spring-session-core.gradle
+++ b/spring-session-core/spring-session-core.gradle
@@ -18,10 +18,12 @@ dependencies {
 	optional "org.springframework.security:spring-security-web"

 	testCompile "io.projectreactor:reactor-test"
-	testCompile "junit:junit"
 	testCompile "org.mockito:mockito-core"
 	testCompile "edu.umd.cs.mtc:multithreadedtc"
 	testCompile "org.springframework:spring-test"
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.springframework.security:spring-security-core"
+	testCompile "org.junit.jupiter:junit-jupiter-api"
+	testCompile "org.junit.jupiter:junit-jupiter-params"
+	testRuntime "org.junit.jupiter:junit-jupiter-engine"
 }
--- a/spring-session-core/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java
+++ b/spring-session-core/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/MapSession.java
+++ b/spring-session-core/src/main/java/org/springframework/session/MapSession.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java
+++ b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/ReactiveMapSessionRepository.java
+++ b/spring-session-core/src/main/java/org/springframework/session/ReactiveMapSessionRepository.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/ReactiveSessionRepository.java
+++ b/spring-session-core/src/main/java/org/springframework/session/ReactiveSessionRepository.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/Session.java
+++ b/spring-session-core/src/main/java/org/springframework/session/Session.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java
+++ b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java
+++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java
+++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -91,7 +91,7 @@ import org.springframework.util.ObjectUtils;
 *
 * @see EnableSpringHttpSession
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SpringHttpSessionConfiguration implements ApplicationContextAware {

 	private final Log logger = LogFactory.getLog(getClass());
@@ -126,7 +126,6 @@ public class SpringHttpSessionConfiguration implements ApplicationContextAware {
 			SessionRepository<S> sessionRepository) {
 		SessionRepositoryFilter<S> sessionRepositoryFilter = new SessionRepositoryFilter<>(
 				sessionRepository);
-		sessionRepositoryFilter.setServletContext(this.servletContext);
 		sessionRepositoryFilter.setHttpSessionIdResolver(this.httpSessionIdResolver);
 		return sessionRepositoryFilter;
 	}
--- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java
+++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfiguration.java
+++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfiguration.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,7 +35,7 @@ import org.springframework.web.server.session.WebSessionManager;
 *
 * @see EnableSpringWebSession
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SpringWebSessionConfiguration {

 	/**
--- a/spring-session-core/src/main/java/org/springframework/session/events/AbstractSessionEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/events/AbstractSessionEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/events/SessionCreatedEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/events/SessionCreatedEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/events/SessionDeletedEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/events/SessionDeletedEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/events/SessionExpiredEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/events/SessionExpiredEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java
+++ b/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java
+++ b/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java
+++ b/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionIdResolver.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionIdResolver.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/CookieSerializer.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieSerializer.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionIdResolver.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionIdResolver.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,7 @@ package org.springframework.session.web.http;

 import java.io.IOException;

+import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -66,8 +67,11 @@ abstract class OncePerRequestFilter implements Filter {
 		}
 		HttpServletRequest httpRequest = (HttpServletRequest) request;
 		HttpServletResponse httpResponse = (HttpServletResponse) response;
+		String alreadyFilteredAttributeName = this.alreadyFilteredAttributeName;
+		alreadyFilteredAttributeName = updateForErrorDispatch(
+				alreadyFilteredAttributeName, request);
 		boolean hasAlreadyFilteredAttribute = request
-				.getAttribute(this.alreadyFilteredAttributeName) != null;
+				.getAttribute(alreadyFilteredAttributeName) != null;

 		if (hasAlreadyFilteredAttribute) {

@@ -76,17 +80,28 @@ abstract class OncePerRequestFilter implements Filter {
 		}
 		else {
 			// Do invoke this filter...
-			request.setAttribute(this.alreadyFilteredAttributeName, Boolean.TRUE);
+			request.setAttribute(alreadyFilteredAttributeName, Boolean.TRUE);
 			try {
 				doFilterInternal(httpRequest, httpResponse, filterChain);
 			}
 			finally {
 				// Remove the "already filtered" request attribute for this request.
-				request.removeAttribute(this.alreadyFilteredAttributeName);
+				request.removeAttribute(alreadyFilteredAttributeName);
 			}
 		}
 	}

+	private String updateForErrorDispatch(String alreadyFilteredAttributeName,
+			ServletRequest request) {
+		// Jetty does ERROR dispatch within sendError, so request attribute is still present
+		// Use a separate attribute for ERROR dispatches
+		if (DispatcherType.ERROR.equals(request.getDispatcherType())
+				&& request.getAttribute(alreadyFilteredAttributeName) != null) {
+			return alreadyFilteredAttributeName + ".ERROR";
+		}
+		return alreadyFilteredAttributeName;
+	}
+
 	/**
 	 * Same contract as for {@code doFilter}, but guaranteed to be just invoked once per
 	 * request within a single request thread.
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -106,8 +106,6 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi

 	private final SessionRepository<S> sessionRepository;

-	private ServletContext servletContext;
-
 	private HttpSessionIdResolver httpSessionIdResolver = new CookieHttpSessionIdResolver();

 	/**
@@ -143,7 +141,7 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
 		request.setAttribute(SESSION_REPOSITORY_ATTR, this.sessionRepository);

 		SessionRepositoryRequestWrapper wrappedRequest = new SessionRepositoryRequestWrapper(
-				request, response, this.servletContext);
+				request, response);
 		SessionRepositoryResponseWrapper wrappedResponse = new SessionRepositoryResponseWrapper(
 				wrappedRequest, response);

@@ -155,10 +153,6 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
 		}
 	}

-	public void setServletContext(ServletContext servletContext) {
-		this.servletContext = servletContext;
-	}
-
 	/**
 	 * Allows ensuring that the session is saved if the response is committed.
 	 *
@@ -203,8 +197,6 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi

 		private final HttpServletResponse response;

-		private final ServletContext servletContext;
-
 		private S requestedSession;

 		private boolean requestedSessionCached;
@@ -216,10 +208,9 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
 		private boolean requestedSessionInvalidated;

 		private SessionRepositoryRequestWrapper(HttpServletRequest request,
-				HttpServletResponse response, ServletContext servletContext) {
+				HttpServletResponse response) {
 			super(request);
 			this.response = response;
-			this.servletContext = servletContext;
 		}

 		/**
@@ -340,15 +331,6 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
 			return currentSession;
 		}

-		@Override
-		public ServletContext getServletContext() {
-			if (this.servletContext != null) {
-				return this.servletContext;
-			}
-			// Servlet 3.0+
-			return super.getServletContext();
-		}
-
 		@Override
 		public HttpSessionWrapper getSession() {
 			return getSession(true);
--- a/spring-session-core/src/main/java/org/springframework/session/web/server/session/SpringSessionWebSessionStore.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/server/session/SpringSessionWebSessionStore.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/server/session/package-info.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/server/session/package-info.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/spring-session-core/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,8 +21,8 @@ import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.ConcurrentHashMap;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;

@@ -35,7 +35,7 @@ public class MapSessionRepositoryTests {

 	private MapSession session;

-	@Before
+	@BeforeEach
 	public void setup() {
 		this.repository = new MapSessionRepository(new ConcurrentHashMap<>());
 		this.session = new MapSession();
--- a/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,17 +20,17 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Set;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

 public class MapSessionTests {

 	private MapSession session;

-	@Before
+	@BeforeEach
 	public void setup() {
 		this.session = new MapSession();
 		this.session.setLastAccessedTime(Instant.ofEpochMilli(1413258262962L));
@@ -38,7 +38,7 @@ public class MapSessionTests {

 	@Test
 	public void constructorNullSession() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new MapSession((Session) null))
 				.withMessage("session cannot be null");
 	}
@@ -70,7 +70,7 @@ public class MapSessionTests {

 	@Test
 	public void getRequiredAttributeWhenNullThenException() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.session.getRequiredAttribute("attrName"))
 				.withMessage("Required attribute 'attrName' is missing.");
 	}
--- a/spring-session-core/src/test/java/org/springframework/session/ReactiveMapSessionRepositoryTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/ReactiveMapSessionRepositoryTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,11 +23,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

 /**
 * Tests for {@link ReactiveMapSessionRepository}.
@@ -41,7 +41,7 @@ public class ReactiveMapSessionRepositoryTests {

 	private MapSession session;

-	@Before
+	@BeforeEach
 	public void setup() {
 		this.repository = new ReactiveMapSessionRepository(new HashMap<>());
 		this.session = new MapSession("session-id");
@@ -60,7 +60,7 @@ public class ReactiveMapSessionRepositoryTests {

 	@Test
 	public void constructorMapWhenNullThenThrowsIllegalArgumentException() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new ReactiveMapSessionRepository(null))
 				.withMessage("sessions cannot be null");
 	}
@@ -107,13 +107,12 @@ public class ReactiveMapSessionRepositoryTests {
 	public void createSessionWhenCustomMaxInactiveIntervalThenCustomMaxInactiveInterval() {
 		final Duration expectedMaxInterval = new MapSession().getMaxInactiveInterval()
 				.plusSeconds(10);
-		this.repository.setDefaultMaxInactiveInterval(
-				(int) expectedMaxInterval.getSeconds());
+		this.repository
+				.setDefaultMaxInactiveInterval((int) expectedMaxInterval.getSeconds());

 		Session session = this.repository.createSession().block();

-		assertThat(session.getMaxInactiveInterval())
-				.isEqualTo(expectedMaxInterval);
+		assertThat(session.getMaxInactiveInterval()).isEqualTo(expectedMaxInterval);
 	}

 	@Test
--- a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,9 +24,9 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +41,7 @@ import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.CookieSerializer.CookieValue;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,7 +58,7 @@ import static org.mockito.Mockito.verify;
 *
 * @author Rob Winch
 */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration
@WebAppConfiguration
 public class EnableSpringHttpSessionCustomCookieSerializerTests {
@@ -80,7 +80,7 @@ public class EnableSpringHttpSessionCustomCookieSerializerTests {
 	@Autowired
 	private CookieSerializer cookieSerializer;

-	@Before
+	@BeforeEach
 	public void setup() {
 		this.chain = new MockFilterChain();

--- a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,8 @@ import java.util.concurrent.ConcurrentHashMap;

 import javax.servlet.ServletContext;

-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -49,7 +49,7 @@ public class SpringHttpSessionConfigurationTests {

 	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

-	@After
+	@AfterEach
 	public void closeContext() {
 		if (this.context != null) {
 			this.context.close();
--- a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfigurationTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfigurationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,8 +18,8 @@ package org.springframework.session.config.annotation.web.server;

 import java.util.HashMap;

-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 public class SpringWebSessionConfigurationTests {
 	private AnnotationConfigApplicationContext context;

-	@After
+	@AfterEach
 	public void cleanup() {
 		if (this.context != null) {
 			this.context.close();
--- a/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java
+++ b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,12 +23,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextImpl;
@@ -46,7 +46,6 @@ import static org.mockito.BDDMockito.when;
 /**
 * Tests for {@link SpringSessionBackedSessionRegistry}.
 */
-@RunWith(MockitoJUnitRunner.class)
 public class SpringSessionBackedSessionRegistryTest {

 	private static final String SESSION_ID = "sessionId";
@@ -66,6 +65,11 @@ public class SpringSessionBackedSessionRegistryTest {
 	@InjectMocks
 	private SpringSessionBackedSessionRegistry<Session> sessionRegistry;

+	@BeforeEach
+	void setUp() {
+		MockitoAnnotations.initMocks(this);
+	}
+
 	@Test
 	public void sessionInformationForExistingSession() {
 		Session session = createSession(SESSION_ID, USER_NAME, NOW);
--- a/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,14 +20,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.test.util.ReflectionTestUtils;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
@@ -68,7 +68,7 @@ public class SpringSessionRememberMeServicesTests {
 	@Test
 	public void createWithNullParameter() {
 		this.rememberMeServices = new SpringSessionRememberMeServices();
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(
 						() -> this.rememberMeServices.setRememberMeParameterName(null))
 				.withMessage("rememberMeParameterName cannot be empty or null");
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,8 +21,8 @@ import java.util.Collections;

 import javax.servlet.http.Cookie;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -43,7 +43,7 @@ public class CookieHttpSessionIdResolverTests {
 	private String cookieName;
 	private Session session;

-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		this.cookieName = "SESSION";
 		this.session = new MapSession();
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,11 +20,10 @@ import java.util.Base64;

 import javax.servlet.http.Cookie;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;

 import org.springframework.mock.web.MockCookie;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -33,7 +32,8 @@ import org.springframework.session.web.http.CookieSerializer.CookieValue;
 import org.springframework.util.StringUtils;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

 /**
 * Tests for {@link DefaultCookieSerializer}.
@@ -42,16 +42,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 * @author Vedran Pavic
 * @author Eddú Meléndez
 */
-@RunWith(Parameterized.class)
 public class DefaultCookieSerializerTests {

-	@Parameters(name = "useBase64Encoding={0}")
-	public static Object[] parameters() {
-		return new Object[] { false, true };
-	}
-
-	private boolean useBase64Encoding;
-
 	private String cookieName;

 	private MockHttpServletRequest request;
@@ -62,18 +54,13 @@ public class DefaultCookieSerializerTests {

 	private String sessionId;

-	public DefaultCookieSerializerTests(boolean useBase64Encoding) {
-		this.useBase64Encoding = useBase64Encoding;
-	}
-
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.cookieName = "SESSION";
 		this.request = new MockHttpServletRequest();
 		this.response = new MockHttpServletResponse();
 		this.sessionId = "sessionId";
 		this.serializer = new DefaultCookieSerializer();
-		this.serializer.setUseBase64Encoding(this.useBase64Encoding);
 	}

 	// --- readCookieValues ---
@@ -83,9 +70,12 @@ public class DefaultCookieSerializerTests {
 		assertThat(this.serializer.readCookieValues(this.request)).isEmpty();
 	}

-	@Test
-	public void readCookieValuesSingle() {
-		this.request.setCookies(createCookie(this.cookieName, this.sessionId));
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesSingle(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
+		this.request.setCookies(
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsOnly(this.sessionId);
@@ -100,57 +90,72 @@ public class DefaultCookieSerializerTests {
 		assertThat(this.serializer.readCookieValues(this.request)).isEmpty();
 	}

-	@Test
-	public void readCookieValuesSingleAndInvalidName() {
-		this.request.setCookies(createCookie(this.cookieName, this.sessionId),
-				createCookie(this.cookieName + "INVALID", this.sessionId + "INVALID"));
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesSingleAndInvalidName(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
+		this.request.setCookies(
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding),
+				createCookie(this.cookieName + "INVALID", this.sessionId + "INVALID",
+						useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsOnly(this.sessionId);
 	}

-	@Test
-	public void readCookieValuesMulti() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesMulti(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		String secondSession = "secondSessionId";
-		this.request.setCookies(createCookie(this.cookieName, this.sessionId),
-				createCookie(this.cookieName, secondSession));
+		this.request.setCookies(
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding),
+				createCookie(this.cookieName, secondSession, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsExactly(this.sessionId, secondSession);
 	}

-	@Test
-	public void readCookieValuesMultiCustomSessionCookieName() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesMultiCustomSessionCookieName(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		setCookieName("JSESSIONID");
 		String secondSession = "secondSessionId";
-		this.request.setCookies(createCookie(this.cookieName, this.sessionId),
-				createCookie(this.cookieName, secondSession));
+		this.request.setCookies(
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding),
+				createCookie(this.cookieName, secondSession, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsExactly(this.sessionId, secondSession);
 	}

 	// gh-392
-	@Test
-	public void readCookieValuesNullCookieValue() {
-		this.request.setCookies(createCookie(this.cookieName, null));
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesNullCookieValue(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
+		this.request.setCookies(createCookie(this.cookieName, null, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request)).isEmpty();
 	}

-	@Test
-	public void readCookieValuesNullCookieValueAndJvmRoute() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesNullCookieValueAndJvmRoute(boolean useBase64Encoding) {
 		this.serializer.setJvmRoute("123");
-		this.request.setCookies(createCookie(this.cookieName, null));
+		this.request.setCookies(createCookie(this.cookieName, null, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request)).isEmpty();
 	}

-	@Test
-	public void readCookieValuesNullCookieValueAndNotNullCookie() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieValuesNullCookieValueAndNotNullCookie(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		this.serializer.setJvmRoute("123");
-		this.request.setCookies(createCookie(this.cookieName, null),
-				createCookie(this.cookieName, this.sessionId));
+		this.request.setCookies(createCookie(this.cookieName, null, useBase64Encoding),
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsOnly(this.sessionId);
@@ -158,11 +163,13 @@ public class DefaultCookieSerializerTests {

 	// --- writeCookie ---

-	@Test
-	public void writeCookie() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void writeCookie(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		this.serializer.writeCookieValue(cookieValue(this.sessionId));

-		assertThat(getCookieValue()).isEqualTo(this.sessionId);
+		assertThat(getCookieValue(useBase64Encoding)).isEqualTo(this.sessionId);
 	}

 	// --- httpOnly ---
@@ -214,7 +221,7 @@ public class DefaultCookieSerializerTests {
 	@Test
 	public void setDomainNameAndDomainNamePatternThrows() {
 		this.serializer.setDomainName("example.com");
-		assertThatExceptionOfType(IllegalStateException.class)
+		assertThatIllegalStateException()
 				.isThrownBy(() -> this.serializer.setDomainNamePattern(".*"))
 				.withMessage("Cannot set both domainName and domainNamePattern");
 	}
@@ -248,7 +255,7 @@ public class DefaultCookieSerializerTests {
 	@Test
 	public void setDomainNamePatternAndDomainNameThrows() {
 		this.serializer.setDomainNamePattern(".*");
-		assertThatExceptionOfType(IllegalStateException.class)
+		assertThatIllegalStateException()
 				.isThrownBy(() -> this.serializer.setDomainName("example.com"))
 				.withMessage("Cannot set both domainName and domainNamePattern");
 	}
@@ -274,7 +281,7 @@ public class DefaultCookieSerializerTests {

 	@Test
 	public void setCookieNameNullThrows() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.serializer.setCookieName(null))
 				.withMessage("cookieName cannot be null");
 	}
@@ -405,42 +412,53 @@ public class DefaultCookieSerializerTests {

 	// --- jvmRoute ---

-	@Test
-	public void writeCookieJvmRoute() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void writeCookieJvmRoute(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		String jvmRoute = "route";
 		this.serializer.setJvmRoute(jvmRoute);

 		this.serializer.writeCookieValue(cookieValue(this.sessionId));

-		assertThat(getCookieValue()).isEqualTo(this.sessionId + "." + jvmRoute);
+		assertThat(getCookieValue(useBase64Encoding))
+				.isEqualTo(this.sessionId + "." + jvmRoute);
 	}

-	@Test
-	public void readCookieJvmRoute() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieJvmRoute(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
+		String jvmRoute = "route";
+		this.serializer.setJvmRoute(jvmRoute);
+		this.request.setCookies(createCookie(this.cookieName,
+				this.sessionId + "." + jvmRoute, useBase64Encoding));
+
+		assertThat(this.serializer.readCookieValues(this.request))
+				.containsOnly(this.sessionId);
+	}
+
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieJvmRouteRouteMissing(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		String jvmRoute = "route";
 		this.serializer.setJvmRoute(jvmRoute);
 		this.request.setCookies(
-				createCookie(this.cookieName, this.sessionId + "." + jvmRoute));
+				createCookie(this.cookieName, this.sessionId, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request))
 				.containsOnly(this.sessionId);
 	}

-	@Test
-	public void readCookieJvmRouteRouteMissing() {
+	@ParameterizedTest
+	@ValueSource(strings = { "true", "false" })
+	public void readCookieJvmRouteOnlyRoute(boolean useBase64Encoding) {
+		this.serializer.setUseBase64Encoding(useBase64Encoding);
 		String jvmRoute = "route";
 		this.serializer.setJvmRoute(jvmRoute);
-		this.request.setCookies(createCookie(this.cookieName, this.sessionId));
-
-		assertThat(this.serializer.readCookieValues(this.request))
-				.containsOnly(this.sessionId);
-	}
-
-	@Test
-	public void readCookieJvmRouteOnlyRoute() {
-		String jvmRoute = "route";
-		this.serializer.setJvmRoute(jvmRoute);
-		this.request.setCookies(createCookie(this.cookieName, "." + jvmRoute));
+		this.request.setCookies(
+				createCookie(this.cookieName, "." + jvmRoute, useBase64Encoding));

 		assertThat(this.serializer.readCookieValues(this.request)).containsOnly("");
 	}
@@ -505,8 +523,8 @@ public class DefaultCookieSerializerTests {
 		this.serializer.setCookieName(cookieName);
 	}

-	private Cookie createCookie(String name, String value) {
-		if (this.useBase64Encoding && StringUtils.hasLength(value)) {
+	private Cookie createCookie(String name, String value, boolean useBase64Encoding) {
+		if (useBase64Encoding && StringUtils.hasLength(value)) {
 			value = new String(Base64.getEncoder().encode(value.getBytes()));
 		}
 		return new Cookie(name, value);
@@ -516,9 +534,9 @@ public class DefaultCookieSerializerTests {
 		return (MockCookie) this.response.getCookie(this.cookieName);
 	}

-	private String getCookieValue() {
+	private String getCookieValue(boolean useBase64Encoding) {
 		String value = getCookie().getValue();
-		if (!this.useBase64Encoding) {
+		if (!useBase64Encoding) {
 			return value;
 		}
 		if (value == null) {
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/HeaderHttpSessionIdResolverTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/HeaderHttpSessionIdResolverTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,15 +19,15 @@ package org.springframework.session.web.http;
 import java.util.Collections;
 import java.util.UUID;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.util.ReflectionTestUtils;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

 /**
 * Tests for {@link HeaderHttpSessionIdResolver}.
@@ -42,7 +42,7 @@ public class HeaderHttpSessionIdResolverTests {

 	private HeaderHttpSessionIdResolver resolver;

-	@Before
+	@BeforeEach
 	public void setup() {
 		this.request = new MockHttpServletRequest();
 		this.response = new MockHttpServletResponse();
@@ -74,7 +74,7 @@ public class HeaderHttpSessionIdResolverTests {

 	@Test
 	public void createResolverWithNullHeaderName() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new HeaderHttpSessionIdResolver(null))
 				.withMessage("headerName cannot be null");
 	}
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,17 +23,15 @@ import java.util.Locale;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;

-@RunWith(MockitoJUnitRunner.class)
 public class OnCommittedResponseWrapperTests {
 	private static final String NL = "\r\n";

@@ -48,8 +46,9 @@ public class OnCommittedResponseWrapperTests {

 	boolean committed;

-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
+		MockitoAnnotations.initMocks(this);
 		this.response = new OnCommittedResponseWrapper(this.delegate) {
 			@Override
 			protected void onResponseCommitted() {
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -44,7 +44,7 @@ public class OncePerRequestFilterTests {

 	private List<OncePerRequestFilter> invocations;

-	@Before
+	@BeforeEach
 	@SuppressWarnings("serial")
 	public void setup() {
 		this.servlet = new HttpServlet() {
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,13 +23,12 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.mock.web.MockServletContext;
 import org.springframework.session.MapSession;
@@ -48,7 +47,6 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 * @author Rob Winch
 * @since 1.1
 */
-@RunWith(MockitoJUnitRunner.class)
 public class SessionEventHttpSessionListenerAdapterTests {

 	@Mock
@@ -69,8 +67,9 @@ public class SessionEventHttpSessionListenerAdapterTests {

 	private SessionEventHttpSessionListenerAdapter listener;

-	@Before
+	@BeforeEach
 	public void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.listener = new SessionEventHttpSessionListenerAdapter(
 				Arrays.asList(this.listener1, this.listener2));
 		this.listener.setServletContext(new MockServletContext());
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,18 +43,16 @@ import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.http.HttpSessionContext;

 import org.assertj.core.data.Offset;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockServletContext;
 import org.springframework.session.MapSession;
 import org.springframework.session.MapSessionRepository;
 import org.springframework.session.Session;
@@ -63,6 +61,7 @@ import org.springframework.test.util.ReflectionTestUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -78,7 +77,6 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 /**
 * Tests for {@link SessionRepositoryFilter}.
 */
-@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("deprecation")
 public class SessionRepositoryFilterTests {

@@ -97,8 +95,9 @@ public class SessionRepositoryFilterTests {

 	private MockFilterChain chain;

-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
+		MockitoAnnotations.initMocks(this);
 		this.sessions = new HashMap<>();
 		this.sessionRepository = new MapSessionRepository(this.sessions);
 		this.filter = new SessionRepositoryFilter<>(this.sessionRepository);
@@ -240,22 +239,6 @@ public class SessionRepositoryFilterTests {
 		});
 	}

-	// gh-111
-	@Test
-	public void doFilterServletContextExplicit() throws Exception {
-		final ServletContext expectedContext = new MockServletContext();
-		this.filter = new SessionRepositoryFilter<>(this.sessionRepository);
-		this.filter.setServletContext(expectedContext);
-
-		doFilter(new DoInFilter() {
-			@Override
-			public void doFilter(HttpServletRequest wrappedRequest) {
-				ServletContext context = wrappedRequest.getSession().getServletContext();
-				assertThat(context).isSameAs(expectedContext);
-			}
-		});
-	}
-
 	@Test
 	public void doFilterMaxInactiveIntervalDefault() throws Exception {
 		doFilter(new DoInFilter() {
@@ -1425,7 +1408,7 @@ public class SessionRepositoryFilterTests {

 	@Test
 	public void setHttpSessionIdResolverNull() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.filter.setHttpSessionIdResolver(null))
 				.withMessage("httpSessionIdResolver cannot be null");
 	}
--- a/spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,11 +21,10 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
 import reactor.core.publisher.Mono;

 import org.springframework.session.ReactiveSessionRepository;
@@ -33,7 +32,7 @@ import org.springframework.session.Session;
 import org.springframework.web.server.WebSession;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
@@ -44,7 +43,6 @@ import static org.mockito.Mockito.verify;
 * @author Rob Winch
 * @author Vedran Pavic
 */
-@RunWith(MockitoJUnitRunner.class)
 public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Mock
@@ -58,8 +56,9 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	private SpringSessionWebSessionStore<S> webSessionStore;

-	@Before
+	@BeforeEach
 	public void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.webSessionStore = new SpringSessionWebSessionStore<>(this.sessionRepository);
 		given(this.sessionRepository.findById(any()))
 				.willReturn(Mono.just(this.findByIdSession));
@@ -69,15 +68,14 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void constructorWhenNullRepositoryThenThrowsIllegalArgumentException() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new SpringSessionWebSessionStore<S>(null))
 				.withMessage("reactiveSessionRepository cannot be null");
 	}

 	@Test
 	public void createSessionWhenNoAttributesThenNotStarted() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		assertThat(createdWebSession.isStarted()).isFalse();
 	}
@@ -86,16 +84,14 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 	public void createSessionWhenAddAttributeThenStarted() {
 		given(this.createSession.getAttributeNames())
 				.willReturn(Collections.singleton("a"));
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		assertThat(createdWebSession.isStarted()).isTrue();
 	}

 	@Test
 	public void createSessionWhenGetAttributesAndSizeThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -109,8 +105,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndIsEmptyThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -124,8 +119,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndContainsKeyAndNotStringThenFalse() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -134,8 +128,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndContainsKeyAndNotFoundThenFalse() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -146,8 +139,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 	public void createSessionWhenGetAttributesAndContainsKeyAndFoundThenTrue() {
 		given(this.createSession.getAttributeNames())
 				.willReturn(Collections.singleton("a"));
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -156,8 +148,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndPutThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		attributes.put("a", "b");
@@ -167,8 +158,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndPutNullThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		attributes.put("a", null);
@@ -178,8 +168,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndRemoveThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		attributes.remove("a");
@@ -189,8 +178,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void createSessionWhenGetAttributesAndPutAllThenDelegatesToCreateSession() {
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		attributes.putAll(Collections.singletonMap("a", "b"));
@@ -202,8 +190,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 	public void createSessionWhenGetAttributesAndClearThenDelegatesToCreateSession() {
 		given(this.createSession.getAttributeNames())
 				.willReturn(Collections.singleton("a"));
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		attributes.clear();
@@ -215,8 +202,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 	public void createSessionWhenGetAttributesAndKeySetThenDelegatesToCreateSession() {
 		given(this.createSession.getAttributeNames())
 				.willReturn(Collections.singleton("a"));
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -228,8 +214,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 		given(this.createSession.getAttributeNames())
 				.willReturn(Collections.singleton("a"));
 		given(this.createSession.getAttribute("a")).willReturn("b");
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();

@@ -243,8 +228,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 				.willReturn(Collections.singleton(attrName));
 		String attrValue = "attrValue";
 		given(this.createSession.getAttribute(attrName)).willReturn(attrValue);
-		WebSession createdWebSession = this.webSessionStore.createWebSession()
-				.block();
+		WebSession createdWebSession = this.webSessionStore.createWebSession().block();

 		Map<String, Object> attributes = createdWebSession.getAttributes();
 		Set<Map.Entry<String, Object>> entries = attributes.entrySet();
@@ -256,8 +240,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
 	@Test
 	public void retrieveSessionThenStarted() {
 		String id = "id";
-		WebSession retrievedWebSession = this.webSessionStore
-				.retrieveSession(id).block();
+		WebSession retrievedWebSession = this.webSessionStore.retrieveSession(id).block();

 		assertThat(retrievedWebSession.isStarted()).isTrue();
 		verify(this.findByIdSession).setLastAccessedTime(any());
@@ -275,7 +258,7 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {

 	@Test
 	public void setClockWhenNullThenException() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.webSessionStore.setClock(null))
 				.withMessage("clock cannot be null");
 	}
--- a/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,13 +16,12 @@

 package org.springframework.session.web.socket.handler;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
@@ -31,12 +30,11 @@ import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.WebSocketSession;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.verify;

-@RunWith(MockitoJUnitRunner.class)
 public class WebSocketConnectHandlerDecoratorFactoryTests {
 	@Mock
 	ApplicationEventPublisher eventPublisher;
@@ -49,14 +47,15 @@ public class WebSocketConnectHandlerDecoratorFactoryTests {

 	WebSocketConnectHandlerDecoratorFactory factory;

-	@Before
+	@BeforeEach
 	public void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.factory = new WebSocketConnectHandlerDecoratorFactory(this.eventPublisher);
 	}

 	@Test
 	public void constructorNullEventPublisher() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new WebSocketConnectHandlerDecoratorFactory(null))
 				.withMessage("eventPublisher cannot be null");
 	}
--- a/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,11 +20,10 @@ import java.security.Principal;
 import java.util.HashMap;
 import java.util.Map;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -45,7 +44,6 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

-@RunWith(MockitoJUnitRunner.class)
 public class WebSocketRegistryListenerTests {

 	@Mock
@@ -74,8 +72,9 @@ public class WebSocketRegistryListenerTests {

 	private WebSocketRegistryListener listener;

-	@Before
+	@BeforeEach
 	public void setup() {
+		MockitoAnnotations.initMocks(this);
 		String sessionId = "session-id";
 		MapSession session = new MapSession(sessionId);

--- a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,12 +25,11 @@ import java.util.concurrent.TimeUnit;

 import javax.servlet.http.HttpSession;

-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;

 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.messaging.Message;
@@ -43,7 +42,7 @@ import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -52,7 +51,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;

-@RunWith(MockitoJUnitRunner.class)
 public class SessionRepositoryMessageInterceptorTests {
 	@Mock
 	SessionRepository<Session> sessionRepository;
@@ -67,8 +65,9 @@ public class SessionRepositoryMessageInterceptorTests {

 	SessionRepositoryMessageInterceptor<Session> interceptor;

-	@Before
+	@BeforeEach
 	public void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.interceptor = new SessionRepositoryMessageInterceptor<>(
 				this.sessionRepository);
 		this.headers = SimpMessageHeaderAccessor.create();
@@ -82,7 +81,7 @@ public class SessionRepositoryMessageInterceptorTests {

 	@Test
 	public void preSendconstructorNullRepository() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new SessionRepositoryMessageInterceptor<>(null))
 				.withMessage("sessionRepository cannot be null");
 	}
@@ -134,14 +133,14 @@ public class SessionRepositoryMessageInterceptorTests {

 	@Test
 	public void setMatchingMessageTypesNull() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.interceptor.setMatchingMessageTypes(null))
 				.withMessage("matchingMessageTypes cannot be null or empty");
 	}

 	@Test
 	public void setMatchingMessageTypesEmpty() {
-		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+		assertThatIllegalArgumentException().isThrownBy(
 				() -> this.interceptor.setMatchingMessageTypes(Collections.emptySet()))
 				.withMessage("matchingMessageTypes cannot be null or empty");
 	}
--- a/spring-session-data-redis/spring-session-data-redis.gradle
+++ b/spring-session-data-redis/spring-session-data-redis.gradle
@@ -16,6 +16,8 @@ dependencies {
 	testCompile "javax.servlet:javax.servlet-api"
 	testCompile "org.springframework:spring-web"
 	testCompile "org.springframework.security:spring-security-core"
+	testCompile "org.junit.jupiter:junit-jupiter-api"
+	testRuntime "org.junit.jupiter:junit-jupiter-engine"

 	integrationTestCompile "io.lettuce:lettuce-core"
 	integrationTestCompile "org.testcontainers:testcontainers"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vedran Pavic	546febd959	Release 2.2.0.M2	2019-06-14 23:26:47 +02:00
Vedran Pavic	ea857025bc	Upgrade Spring Security to 5.2.0.M3 Resolves: #1437	2019-06-14 23:04:55 +02:00
Vedran Pavic	782167b306	Add SimpleRedisOperationsSessionRepository sample Resolves: #1408	2019-06-14 22:55:38 +02:00
Vedran Pavic	17005c51a7	Add simple Redis SessionRepository implementation See: #1408	2019-06-14 22:55:21 +02:00
Vedran Pavic	54859070f3	Extract RedisSessionMapper See: #1408	2019-06-14 22:55:11 +02:00
Vedran Pavic	3d03c02924	Upgrade Spring Data to Moore-RC1 Resolves: #1436	2019-06-14 15:38:52 +02:00
Vedran Pavic	4f9d55feec	Update integration tests	2019-06-13 18:36:49 +02:00
Vedran Pavic	7e7d08a99f	Upgrade test dependencies	2019-06-13 18:32:27 +02:00
Vedran Pavic	f6a5bdacb8	Upgrade Hazelcast to 3.12.1 Resolves: #1452	2019-06-13 18:17:59 +02:00
Vedran Pavic	79de4f9a0d	Upgrade Spring Framework to 5.2.0.M3 Resolves: #1414	2019-06-13 18:15:47 +02:00
Vedran Pavic	9a379fd5bc	Upgrade Reactor to Dysprosium-M2 Resolves: #1416	2019-06-11 11:25:10 +02:00
Vedran Pavic	be58c00838	Separate "filtered" attribute for ERROR dispatch Resolves: #1308 See: spring-projects/spring-framework#22989	2019-06-11 07:27:25 +02:00
Vedran Pavic	3475043bf0	Polish build See: spring-projects/spring-security#6200	2019-06-11 07:27:25 +02:00
Rob Winch	c6470c6f48	Jenkinsfile performs git clean	2019-06-10 16:50:35 -05:00
Rob Winch	6faa67a64e	Add nohttp	2019-06-10 14:55:06 -05:00
Vedran Pavic	340b614860	Upgrade samples to Spring Boot 2.2.0.M2 Resolves: #1445	2019-06-10 09:14:05 +02:00
Vedran Pavic	79b092d8f0	Align Selenium version used in samples with Spring Boot 2.2 See: #1445	2019-06-09 15:44:40 +02:00
Vedran Pavic	2e91024a56	Fix integration tests See: #1033	2019-06-09 10:54:28 +02:00
Vedran Pavic	e359468abc	Fix broken documentation links See: #1447	2019-06-09 10:52:45 +02:00
Vedran Pavic	4ec6a9a08b	Upgrade samples to Spring Boot 2.2.0.M3 Resolves: #1445	2019-06-06 21:55:07 +02:00
Vedran Pavic	084d1c7286	Simplify project structure - harmonize module and directory names - optimize Gradle settings - remove unused Grails sample Resolves: #1447	2019-06-06 21:12:30 +02:00
Vedran Pavic	a4ff3682f6	Migrate tests to JUnit 5 Resolves: #1033	2019-06-06 20:57:45 +02:00
Vedran Pavic	35f09d0da7	Start building against Reactor Dysprosium snapshots See: #1416	2019-06-04 21:56:29 +02:00
Vedran Pavic	566b388b2f	Align Checkstyle config with Spring Boot	2019-06-03 16:49:08 +02:00
Vedran Pavic	78b72f2d1b	Save reactive Redis session on subscribe This commit ensures ReactiveRedisOperationsSessionRepository#save does work only after subscribe. Without this, multiple invocations of #save over the course of same request can lead to race condition situations. Resolves: #1399	2019-06-02 19:02:13 +02:00
Vedran Pavic	52f59a83e4	Update integration tests	2019-05-31 23:31:01 +02:00
Vedran Pavic	6809168541	Upgrade test dependencies	2019-05-31 23:13:28 +02:00
Vedran Pavic	02bb998f97	Start building against Spring Security 5.2 snapshots See: #1437	2019-05-31 23:07:10 +02:00
Vedran Pavic	57ffb90a0c	Start building against Spring Data Moore snapshots See: #1436	2019-05-31 23:06:33 +02:00
Vedran Pavic	402272d5aa	Start building against Spring Framework 5.2 snapshots See: #1414	2019-05-31 23:05:38 +02:00
Vedran Pavic	1dbaffef5e	Update Jenkinsfile	2019-05-27 20:28:34 +02:00
Vedran Pavic	8ae0e0b314	Update Jenkinsfile to use explicit JAVA_HOME	2019-05-27 07:27:34 +02:00
Rob Winch	d94d58d96b	Redis save uses then We need to ensure that the session id is changed before we save the changes. Otherwise the rename of the session id will override the changes we just made. Fixes: gh-1428	2019-05-16 15:51:51 -05:00
Vedran Pavic	cc41ea5271	Ensure Redis session with immediate flush respects defaultMaxInactiveInterval Resolves: #1409	2019-05-13 19:08:03 +02:00
Vedran Pavic	e6a88ccf4c	Add Java 12 CI build Resolves: #1422	2019-05-10 22:18:59 +02:00
Vedran Pavic	36f1cd5302	Revert "Add Java 12 CI build" See: #1422	2019-05-10 09:39:24 +02:00
Vedran Pavic	3bd892ec16	Upgrade Gradle to 5.4.1	2019-05-10 09:25:46 +02:00
Vedran Pavic	dcd5342204	Add Java 12 CI build Resolves: #1422	2019-05-10 09:24:29 +02:00
Vedran Pavic	48c32228de	Upgrade Spring Framework to 5.2.0.M1 Resolves: #1414	2019-05-09 19:05:56 +02:00
Vedran Pavic	ec8ef595a2	Upgrade Reactor to Dysprosium-M1 Resolves: #1416	2019-05-09 18:49:24 +02:00
Vedran Pavic	b98c5216b4	Update configuration classes to use proxyBeanMethods=false Resolves: #1345	2019-05-09 18:10:57 +02:00
Vedran Pavic	eb0f89a18a	Start building against Spring Framework 5.2 snapshots See: #1414	2019-05-09 18:03:56 +02:00
Vedran Pavic	83e0f4f24a	Fix JdbcOperationsSessionRepository lazy deserialization Resolves: #1411	2019-05-06 23:37:08 +02:00
Vedran Pavic	397d4e5ca1	Next development version	2019-04-12 20:51:00 +02:00
Vedran Pavic	f7b7737896	Release 2.2.0.M1	2019-04-12 20:38:14 +02:00
Vedran Pavic	2a5b221d70	Update integration tests	2019-04-12 20:14:12 +02:00
Vedran Pavic	5a462b3594	Resolve indexes for Hazelcast session on write Resolves: #1145	2019-04-12 20:08:54 +02:00
Vedran Pavic	c252c00a85	Upgrade Spring Data to Moore-M3 Resolves: #1317	2019-04-11 15:49:31 +02:00
Vedran Pavic	2a7b6ec4f7	Upgrade Spring Security to 5.2.0.M1 Resolves: #1318	2019-04-11 07:39:26 +02:00
Vedran Pavic	044e5bbe3c	Upgrade Spring Framework to 5.2.0.M1 Resolves: #1348	2019-04-10 16:05:35 +02:00
Vedran Pavic	f247a78c32	Revert Derby dependency upgrade	2019-04-10 09:23:02 +02:00
Vedran Pavic	c0f708d0b3	Upgrade Reactor to Californium-SR6	2019-04-09 21:31:58 +02:00
Vedran Pavic	c2a3ffdb00	Upgrade Hazelcast to 3.12 Resolves: #1403	2019-04-09 21:28:45 +02:00
Vedran Pavic	856a9b2c51	Update integration tests	2019-04-09 21:24:55 +02:00
Vedran Pavic	0d24033749	Upgrade test dependencies	2019-04-09 21:19:01 +02:00
Vedran Pavic	7a5f9bc29e	Polish	2019-03-29 21:41:09 +01:00
Vedran Pavic	094ffe8a60	Avoid conflicts with user provided RedisMessageListenerContainer Resolves: #1252	2019-03-29 21:27:56 +01:00
Vedran Pavic	55102aa8bb	Update to latest Checkstyle DTDs	2019-03-29 21:27:56 +01:00
Vedran Pavic	f2e9634789	Fix Checkstyle config	2019-03-29 21:27:56 +01:00
Vedran Pavic	7dccade893	Upgrade spring-build-conventions to 0.0.25.RELEASE	2019-03-29 21:27:54 +01:00
Vedran Pavic	39408ff42a	Upgrade Gradle to 5.3.1	2019-03-29 17:54:09 +01:00
Spring Operator	a5a3bc5d0b	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://www.ultraq.net.nz/thymeleaf/layout (302) with 12 occurrences migrated to: https://github.com/ultraq/thymeleaf-layout-dialect ([https](https://www.ultraq.net.nz/thymeleaf/layout) result ConnectTimeoutException). * [ ] http://192.168.1.100:8080/ (AnnotatedConnectException) with 1 occurrences migrated to: https://192.168.1.100:8080/ ([https](https://192.168.1.100:8080/) result ConnectTimeoutException). These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://docs.hazelcast.org/docs/ with 8 occurrences migrated to: https://docs.hazelcast.org/docs/ ([https](https://docs.hazelcast.org/docs/) result 200). * [ ] http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/ with 1 occurrences migrated to: https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/ ([https](https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/) result 200). * [ ] http://docs.spring.io/spring-session/docs/current/reference/html5/ with 1 occurrences migrated to: https://docs.spring.io/spring-session/docs/current/reference/html5/ ([https](https://docs.spring.io/spring-session/docs/current/reference/html5/) result 200). * [ ] http://infinispan.org/docs/dev/user_guide/user_guide.html with 1 occurrences migrated to: https://infinispan.org/docs/dev/user_guide/user_guide.html ([https](https://infinispan.org/docs/dev/user_guide/user_guide.html) result 200). * [ ] http://logback.qos.ch/manual/groovy.html with 1 occurrences migrated to: https://logback.qos.ch/manual/groovy.html ([https](https://logback.qos.ch/manual/groovy.html) result 200). * [ ] http://projects.spring.io/spring-session/ with 1 occurrences migrated to: https://projects.spring.io/spring-session/ ([https](https://projects.spring.io/spring-session/) result 200). * [ ] http://redis.io/commands/expire with 1 occurrences migrated to: https://redis.io/commands/expire ([https](https://redis.io/commands/expire) result 200). * [ ] http://redis.io/commands/hmset with 1 occurrences migrated to: https://redis.io/commands/hmset ([https](https://redis.io/commands/hmset) result 200). * [ ] http://redis.io/topics/data-types with 1 occurrences migrated to: https://redis.io/topics/data-types ([https](https://redis.io/topics/data-types) result 200). * [ ] http://redis.io/topics/notifications with 2 occurrences migrated to: https://redis.io/topics/notifications ([https](https://redis.io/topics/notifications) result 200). * [ ] http://stackoverflow.com with 1 occurrences migrated to: https://stackoverflow.com ([https](https://stackoverflow.com) result 200). * [ ] http://stackoverflow.com/tags/spring-session with 1 occurrences migrated to: https://stackoverflow.com/tags/spring-session ([https](https://stackoverflow.com/tags/spring-session) result 200). * [ ] http://www.thymeleaf.org with 12 occurrences migrated to: https://www.thymeleaf.org ([https](https://www.thymeleaf.org) result 200). * [ ] http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd with 5 occurrences migrated to: https://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd ([https](https://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd) result 200). * [ ] http://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html with 2 occurrences migrated to: https://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html ([https](https://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html) result 301). * [ ] http://www.maxmind.com with 2 occurrences migrated to: https://www.maxmind.com ([https](https://www.maxmind.com) result 302). These URLs were intentionally ignored. * http://java.sun.com/jsp/jstl/core with 8 occurrences * http://localhost with 15 occurrences * http://localhost:8080/ with 31 occurrences * http://localhost:8080/h2-console/ with 3 occurrences * http://localhost:8080/logout with 1 occurrences * http://localhost:8080/test/index with 2 occurrences * http://localhost:xxxxx/hazelcast/rest/maps/spring:session:sessions/7e8383a4-082c-4ffe-a4bc-c40fd3363c5e with 1 occurrences * http://www.w3.org/1999/xhtml with 5 occurrences * http://www.webjars.org/tags with 8 occurrences Fixes gh-1375	2019-03-22 10:24:07 -04:00
Spring Operator	90c08340fa	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * http://www.puppycrawl.com/dtds/configuration_1_3.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/configuration_1_3.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_3.dtd) result 404). * http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd with 3 occurrences migrated to: https://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd ([https](https://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd) result 200). * http://www.springframework.org/schema/beans/spring-beans.xsd with 9 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200). * http://www.springframework.org/schema/context/spring-context.xsd with 7 occurrences migrated to: https://www.springframework.org/schema/context/spring-context.xsd ([https](https://www.springframework.org/schema/context/spring-context.xsd) result 200). * http://www.springframework.org/schema/jdbc/spring-jdbc.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc.xsd) result 200). * http://www.springframework.org/schema/security/spring-security.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/security/spring-security.xsd ([https](https://www.springframework.org/schema/security/spring-security.xsd) result 200). * http://www.springframework.org/schema/util/spring-util-4.1.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-4.1.xsd ([https](https://www.springframework.org/schema/util/spring-util-4.1.xsd) result 200). * http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd with 2 occurrences migrated to: https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd ([https](https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd) result 302). These URLs were intentionally ignored. * http://java.sun.com/xml/ns/javaee with 4 occurrences * http://www.hazelcast.com/schema/config with 6 occurrences * http://www.springframework.org/schema/beans with 18 occurrences * http://www.springframework.org/schema/context with 14 occurrences * http://www.springframework.org/schema/jdbc with 2 occurrences * http://www.springframework.org/schema/p with 5 occurrences * http://www.springframework.org/schema/security with 4 occurrences * http://www.springframework.org/schema/util with 4 occurrences * http://www.w3.org/2001/XMLSchema-instance with 14 occurrences Fixes gh-1374	2019-03-21 16:59:05 -04:00
Rob Winch	13208dd3b5	Update Checkstyle to https Apache 2 License Issue gh-1369	2019-03-14 22:27:27 -05:00
Spring Operator	0975d4d47e	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://www.apache.org/licenses/ with 1 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * http://www.apache.org/licenses/LICENSE-2.0 with 269 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). * http://www.apache.org/licenses/LICENSE-2.0.html with 1 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0.html ([https](https://www.apache.org/licenses/LICENSE-2.0.html) result 200).	2019-03-14 20:39:41 -05:00
Vedran Pavic	0c0bfa4414	Remove special handling for Servlet 3.0 and below Closes: #1363	2019-03-14 21:59:45 +01:00
Vedran Pavic	8b40e8cce8	Rework RedisHttpSessionConfiguration to bean method invocations Closes: #1362	2019-03-14 21:34:53 +01:00
Vedran Pavic	408f2da108	Start building against Spring Data Moore snapshots See: #1317	2019-03-13 18:18:16 +01:00
Vedran Pavic	3b7bb7ec12	Start building against Spring Framework 5.2 snapshots See: #1348	2019-03-13 18:18:16 +01:00
Vedran Pavic	4c849caccd	Next development version	2019-03-13 18:09:34 +01:00