Release Spring Security 5.1.4.RELEASE

ServletOAuth2AuthorizedClientExchangeFilterFunction supports chaining
Fixes gh-6483
2026-07-13 14:45:10 +00:00 · 2019-02-13 10:36:08 -07:00 · 2019-02-13 12:17:05 -05:00 · 2019-02-13 10:13:49 -07:00 · 2019-02-13 10:13:49 -07:00 · 2019-02-13 09:41:18 -07:00
6123 changed files with 35412 additions and 222805 deletions
@@ -9,14 +9,14 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 120

-[*.{java,xml}]
+[*.java]
 indent_style = tab
 indent_size = 4
-charset = utf-8
+charset = latin1
 continuation_indent_size = 8

-ij_smart_tabs = false
-ij_java_align_multiline_parameters = false
-
-[*.gradle]
+[*.xml]
 indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8
@@ -1,10 +0,0 @@
-
-### Complete and Minimal Sample
-
-It would be very helpful if you could provide a complete and minimal sample that reproduces the issue and share it via a GitHub repository. This will allow us to efficiently troubleshoot and help resolve the issue. The sample should contain the minimum amount of code to reproduce the issue along with detailed steps on how to reproduce. Please see the following references for what a complete and minimal sample should consist of.
-
- https://stackoverflow.com/help/mcve
-
-### Post questions on StackOverflow not GitHub
-
-Thanks for getting in touch, but it feels like this is a question that would be better suited to [Stack Overflow](https://stackoverflow.com/). As mentioned in [the guidelines for contributing](https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md#using-github-issues), we prefer to use GitHub issues only for bugs and enhancements. Feel free to update this issue with a link to the re-posted question (so that other people can find it) or add some more details if you feel this is a genuine bug.
@@ -3,7 +3,5 @@ For Security Vulnerabilities, please use https://pivotal.io/security#reporting
 -->

 <!--
-Before creating new features, we recommend creating an issue to discuss the feature. This ensures that everyone is on the same page before extensive work is done.
-
-Thanks for contributing to Spring Security. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with gh-).
+Thanks for contributing to Spring Security. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
 -->
@@ -1,22 +0,0 @@
-name: PR Build
-
-on: pull_request
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '8'
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Build with Gradle
-        run: ./gradlew clean build --continue
@@ -8,7 +8,7 @@ target/
 .project
 .DS_Store
 .settings/
-.idea/*
+.idea/
 out/
 bin/
 intellij/
@@ -23,8 +23,3 @@ atlassian-ide-plugin.xml
 !etc/eclipse/.checkstyle
 .checkstyle
 s101plugin.state
-.attach_pid*
-.~lock.*#
-
-!.idea/checkstyle-idea.xml
-!.idea/externalDependencies.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/etc/checkstyle/checkstyle.xml:spring-security" />
-        <entry key="checkstyle-version" value="8.14" />
-        <entry key="copy-libs" value="false" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/etc/checkstyle/checkstyle.xml:spring-security" />
-        <entry key="property-2.config_loc" value="$PROJECT_DIR$/etc/checkstyle" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnlyWithTests" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalDependencies">
-    <plugin id="CheckStyle-IDEA" />
-    <plugin id="org.jetbrains.plugins.gradle" />
-  </component>
-</project>
@@ -0,0 +1,16 @@
+language: java
+
+jdk:
+  - oraclejdk8
+
+os:
+  - linux
+
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+script: ./gradlew build --refresh-dependencies --no-daemon --continue
@@ -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
-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/]
+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/]
@@ -12,7 +12,7 @@ Each Spring module is slightly different than another in terms of team size, num

 # Importing into IDE

-The following provides information on setting up a development environment that can run the sample in [Spring Tool Suite 3.6.0+](https://www.springsource.org/sts). Other IDE's should work using Gradle's IDE support, but have not been tested.
+The following provides information on setting up a development environment that can run the sample in [Spring Tool Suite 3.6.0+](http://www.springsource.org/sts). Other IDE's should work using Gradle's IDE support, but have not been tested.

 * IDE Setup
  * Install Spring Tool Suite 3.6.0+
@@ -25,7 +25,7 @@ The following provides information on setting up a development environment that
 As of new versions of Spring Tool Suite, you might need to install Groovy Eclipse pointing directly to the updates plugin location. To install Groovy Eclipse on Spring Tool Suite based on Eclipse Oxigen you must do the following steps:

 Help->Install New Software...->Add the following URL into _Work with_ field:
-https://dist.springsource.org/snapshot/GRECLIPSE/e4.7/
+http://dist.springsource.org/snapshot/GRECLIPSE/e4.7/

 # Understand the basics 
 Not sure what a pull request is, or how to submit one? Take a look at GitHub's excellent [help documentation first](https://help.github.com/articles/using-pull-requests).
@@ -33,18 +33,6 @@ Not sure what a pull request is, or how to submit one? Take a look at GitHub's e
 # Search GitHub issues; create an issue if necessary
 Is there already an issue that addresses your concern? Do a bit of searching in our [GitHub issues ](https://github.com/spring-projects/spring-security/issues) to see if you can find something similar. If not, please create a new issue before submitting a pull request unless the change is not a user facing issue.

-# Using GitHub Issues
-We use GitHub issues to track bugs and enhancements.
-If you have a general usage question please ask on [Stack Overflow](https://stackoverflow.com).
-The Spring Security team and the broader community monitor the [`spring-security`](https://stackoverflow.com/tags/spring-security) tag.
-
-If you are reporting a bug, please help to speed up problem diagnosis by providing as much
-information as possible. Ideally, that would include a small
-[sample project](https://github.com/spring-projects/spring-boot-issues) that reproduces the
-problem.
-
-
-
 # Discuss non-trivial contribution ideas with committers
 If you're considering anything more than correcting a typo or fixing a minor bug, please discuss it on the [Spring Security Gitter](https://gitter.im/spring-projects/spring-security) before submitting a pull request. We're happy to provide guidance but please spend an hour or two researching the subject on your own including searching the forums for prior discussions.

@@ -72,12 +60,12 @@ Please carefully follow the whitespace and formatting conventions already presen
 1. Aim to wrap code at 120 characters, but favor readability over wrapping
 1. Preserve existing formatting; i.e. do not reformat code for its own sake
 1. Search the codebase using git grep and other tools to discover common naming conventions, etc.
-1. UTF-8 encoding for Java sources
+1. Latin-1 (ISO-8859-1) encoding for Java sources; use native2ascii to convert if necessary

 Whitespace management tips

-1. You can use the [AnyEdit Eclipse plugin](https://marketplace.eclipse.org/content/anyedit-tools) to ensure spaces are used and to clean up trailing whitespaces.
-1. Use git's pre-commit.sample hook to prevent invalid whitespace from being pushed out. You can enable it by moving ~/spring-security/.git/hooks/pre-commit.sample to ~/spring-security/.git/hooks/pre-commit and ensuring it is executable. For more information on hooks refer to [Pro Git's Pre-Commit Hook's section](https://git-scm.com/book/cs/ch7-3.html)
+1. You can use the [AnyEdit Eclipse plugin](http://marketplace.eclipse.org/content/anyedit-tools) to ensure spaces are used and to clean up trailing whitespaces.
+1. Use git's pre-commit.sample hook to prevent invalid whitespace from being pushed out. You can enable it by moving ~/spring-security/.git/hooks/pre-commit.sample to ~/spring-security/.git/hooks/pre-commit and ensuring it is executable. For more information on hooks refer to [Pro Git's Pre-Commit Hook's section](http://git-scm.com/book/cs/ch7-3.html)

 # Add Apache license header to all new classes

@@ -89,7 +77,7 @@ Whitespace management tips
 * 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
+ *      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,
@@ -128,7 +116,7 @@ Search the codebase to find related unit tests and add additional `@Test` method
 2. New test methods should not start with test. This is an old JUnit3 convention and is not necessary since the method is annotated with @Test.

 # Update spring-security-x.y.rnc for schema changes
-Update the [RELAX NG](https://relaxng.org/) schema `spring-security-x.y.rnc` instead of `spring-security-x.y.xsd` if you contribute changes to supported XML configuration. The XML schema file can be generated the following Gradle task:
+Update the [RELAX NG](http://www.relaxng.org) schema `spring-security-x.y.rnc` instead of `spring-security-x.y.xsd` if you contribute changes to supported XML configuration. The XML schema file can be generated the following Gradle task:

 <pre>
 ./gradlew spring-security-config:rncToXsd
@@ -137,7 +125,7 @@ Update the [RELAX NG](https://relaxng.org/) schema `spring-security-x.y.rnc` ins
 Changes to the XML schema will be overwritten by the Gradle build task.

 # Squash commits
-Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here from the [Git SCM Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
+Use git rebase --interactive, git add --patch and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here is one: http://book.git-scm.com/4_interactive_rebasing.html.

 # Use real name in git commits
 Please configure git to use your real first and last name for any commits you intend to submit as pull requests. For example, this is not acceptable:
@@ -8,44 +8,18 @@ properties(projectProperties)
 def SUCCESS = hudson.model.Result.SUCCESS.toString()
 currentBuild.result = SUCCESS

-def GRADLE_ENTERPRISE_CACHE_USER = usernamePassword(credentialsId: 'gradle_enterprise_cache_user',
-		passwordVariable: 'GRADLE_ENTERPRISE_CACHE_PASSWORD',
-		usernameVariable: 'GRADLE_ENTERPRISE_CACHE_USERNAME')
-def GRADLE_ENTERPRISE_SECRET_ACCESS_KEY = string(credentialsId: 'gradle_enterprise_secret_access_key',
-		variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')
-def SPRING_SIGNING_SECRING = file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')
-def SPRING_GPG_PASSPHRASE = string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')
-def OSSRH_S01_CREDENTIALS = usernamePassword(credentialsId: 'oss-s01-token', passwordVariable: 'OSSRH_S01_TOKEN_PASSWORD', usernameVariable: 'OSSRH_S01_TOKEN_USERNAME')
-def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')
-def JENKINS_PRIVATE_SSH_KEY = file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')
-def SONAR_LOGIN_CREDENTIALS = string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')
-def JENKINS_USER='-Duser.name="spring-builds+jenkins"'
-
-def jdkEnv(String jdk = 'jdk8') {
-	def jdkTool = tool(jdk)
-	return "JAVA_HOME=${ jdkTool }"
-}
-
 try {
 	parallel check: {
 		stage('Check') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY,
-						 ARTIFACTORY_CREDENTIALS]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew check $JENKINS_USER -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace"
-						}
-					}
+					sh "./gradlew clean check  --refresh-dependencies --no-daemon --stacktrace"
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: check'
 					throw e
+				} finally {
+					junit '**/build/test-results/*/*.xml'
 				}
 			}
 		}
@@ -54,21 +28,12 @@ try {
 		stage('Sonar') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
-				withCredentials([SONAR_LOGIN_CREDENTIALS,
-					GRADLE_ENTERPRISE_CACHE_USER,
-					GRADLE_ENTERPRISE_SECRET_ACCESS_KEY,
-					ARTIFACTORY_CREDENTIALS]) {
+				withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
 					try {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							if ("master" == env.BRANCH_NAME) {
-								sh "./gradlew $JENKINS_USER sonarqube -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --stacktrace"
-							} else {
-								sh "./gradlew $JENKINS_USER sonarqube -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PexcludeProjects='**/samples/**' -Dsonar.projectKey='spring-security-${env.BRANCH_NAME}' -Dsonar.projectName='spring-security-${env.BRANCH_NAME}' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --stacktrace"
-							}
+						if ("master" == env.BRANCH_NAME) {
+							sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
+						} else {
+							sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.projectKey='spring-security-${env.BRANCH_NAME}' -Dsonar.projectName='spring-security-${env.BRANCH_NAME}' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
 						}
 					} catch(Exception e) {
 						currentBuild.result = 'FAILED: sonar'
@@ -82,18 +47,8 @@ try {
 		stage('Snapshot Tests') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY,
-						 ARTIFACTORY_CREDENTIALS]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER test -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PforceMavenRepositories=snapshot -PspringVersion='5.2.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT -PlocksDisabled --refresh-dependencies --no-daemon --stacktrace"
-						}
-					}
+					sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Californium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT --refresh-dependencies --no-daemon --stacktrace"
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: snapshots'
 					throw e
@@ -101,22 +56,43 @@ try {
 			}
 		}
 	},
+	jdk9: {
+		stage('JDK 9') {
+			node {
+				checkout scm
+				try {
+					withEnv(["JAVA_HOME=${ tool 'jdk9' }"]) {
+						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: jdk9'
+					throw e
+				}
+			}
+		}
+	},
+	jdk10: {
+		stage('JDK 10') {
+			node {
+				checkout scm
+				try {
+					withEnv(["JAVA_HOME=${ tool 'jdk10' }"]) {
+						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: jdk10'
+					throw e
+				}
+			}
+		}
+	},
 	jdk11: {
 		stage('JDK 11') {
 			node {
 				checkout scm
-				sh "git clean -dfx"
 				try {
-
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY,
-						 ARTIFACTORY_CREDENTIALS]) {
-						withEnv([jdkEnv("jdk11"),
-						 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-						 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-						 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER test -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace"
-						}
+					withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) {
+						sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace"
 					}
 				} catch(Exception e) {
 					currentBuild.result = 'FAILED: jdk11'
@@ -124,29 +100,6 @@ try {
 				}
 			}
 		}
-	},
-	jdk12: {
-		stage('JDK 12') {
-			node {
-				checkout scm
-				sh "git clean -dfx"
-				try {
-					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY,
-						 ARTIFACTORY_CREDENTIALS]) {
-						withEnv([jdkEnv("openjdk12"),
-						 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-						 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-						 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER test -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace"
-						}
-					}
-				} catch(Exception e) {
-					currentBuild.result = 'FAILED: jdk12'
-					throw e
-				}
-			}
-		}
 	}

 	if(currentBuild.result == 'SUCCESS') {
@@ -154,19 +107,13 @@ try {
 			stage('Deploy Artifacts') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([SPRING_SIGNING_SECRING,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_S01_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER deployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhTokenUsername=$OSSRH_S01_TOKEN_USERNAME -PossrhTokenPassword=$OSSRH_S01_TOKEN_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
-							sh "./gradlew $JENKINS_USER finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhTokenUsername=$OSSRH_S01_TOKEN_USERNAME -PossrhTokenPassword=$OSSRH_S01_TOKEN_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --stacktrace --no-parallel"
+					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 -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 --refresh-dependencies --no-daemon --stacktrace"
+								}
+							}
 						}
 					}
 				}
@@ -176,19 +123,8 @@ try {
 			stage('Deploy Docs') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([JENKINS_PRIVATE_SSH_KEY,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_S01_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER deployDocs -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
-						}
+					withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
+						sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
 					}
 				}
 			}
@@ -197,19 +133,8 @@ try {
 			stage('Deploy Schema') {
 				node {
 					checkout scm
-					sh "git clean -dfx"
-					withCredentials([JENKINS_PRIVATE_SSH_KEY,
-						 SPRING_GPG_PASSPHRASE,
-						 OSSRH_S01_CREDENTIALS,
-						 ARTIFACTORY_CREDENTIALS,
-						 GRADLE_ENTERPRISE_CACHE_USER,
-						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
-						withEnv([jdkEnv(),
-							 "GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USERNAME}",
-							 "GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PASSWORD}",
-							 "GRADLE_ENTERPRISE_ACCESS_KEY=${GRADLE_ENTERPRISE_ACCESS_KEY}"]) {
-							sh "./gradlew $JENKINS_USER deploySchema -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
-						}
+					withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
+						sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
 					}
 				}
 			}
@@ -232,12 +157,12 @@ try {
 				def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}"
 				def details = """The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}"""

- 				emailext (
- 					subject: subject,
- 					body: details,
- 					recipientProviders: RECIPIENTS,
- 					to: "$SPRING_SECURITY_TEAM_EMAILS"
- 				)
+				emailext (
+					subject: subject,
+					body: details,
+					recipientProviders: RECIPIENTS,
+					to: "$SPRING_SECURITY_TEAM_EMAILS"
+				)
 			}
 		}
 	}
@@ -1,11 +1,13 @@
 image::https://badges.gitter.im/Join%20Chat.svg[Gitter,link=https://gitter.im/spring-projects/spring-security?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]

+image:https://travis-ci.org/spring-projects/spring-security.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-security"]
+
 = Spring Security

-Spring Security provides security services for the https://docs.spring.io[Spring IO Platform]. Spring Security 5.0 requires Spring 5.0 as
+Spring Security provides security services for the http://docs.spring.io[Spring IO Platform]. Spring Security 5.0 requires Spring 5.0 as
 a minimum and also requires Java 8.

-For a detailed list of features and access to the latest release, please visit https://spring.io/projects[Spring projects].
+For a detailed list of features and access to the latest release, please visit http://spring.io/projects[Spring projects].

 == Code of Conduct
 This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
@@ -15,19 +17,19 @@ By participating, you  are expected to uphold this code. Please report unaccepta
 See https://github.com/spring-projects/spring-framework/wiki/Downloading-Spring-artifacts[downloading Spring artifacts] for Maven repository information.

 == Documentation
-Be sure to read the https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference].
-Extensive JavaDoc for the Spring Security code is also available in the https://docs.spring.io/spring-security/site/docs/current/api/[Spring Security API Documentation].
+Be sure to read the http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference].
+Extensive JavaDoc for the Spring Security code is also available in the http://docs.spring.io/spring-security/site/docs/current/apidocs/[Spring Security API Documentation].

 == Quick Start
-See https://docs.spring.io/spring-security/site/docs/5.3.x/reference/html5/#servlet-hello[Hello Spring Security] to get started with a "Hello, World" application.
+We recommend you visit http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/[Spring Security Reference] and read the "Getting Started" page.

 == Building from Source
-Spring Security uses a https://gradle.org[Gradle]-based build system.
-In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked from the root of the source tree and serves as
+Spring Security uses a http://gradle.org[Gradle]-based build system.
+In the instructions below, http://vimeo.com/34436402[`./gradlew`] is invoked from the root of the source tree and serves as
 a cross-platform, self-contained bootstrap mechanism for the build.

 === Prerequisites
-https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
+http://help.github.com/set-up-git-redirect[Git] and the http://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].

 Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download.

@@ -53,12 +55,12 @@ Discover more commands with `./gradlew tasks`.
 See also the https://github.com/spring-projects/spring-framework/wiki/Gradle-build-and-release-FAQ[Gradle build and release FAQ].

 == Getting Support
-Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
-https://spring.io/services[Commercial support] is available too.
+Check out the http://stackoverflow.com/questions/tagged/spring-security[Spring Security tags on Stack Overflow].
+http://spring.io/services[Commercial support] is available too.

 == Contributing
-https://help.github.com/articles/creating-a-pull-request[Pull requests] are welcome; see the https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md[contributor guidelines] for details.
+http://help.github.com/send-pull-requests[Pull requests] are welcome; see the https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md[contributor guidelines] for details.

 == License
 Spring Security is Open Source software released under the
-https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
+http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,27 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-antlr:antlr:2.7.7
-ch.qos.logback:logback-classic:1.2.9
-ch.qos.logback:logback-core:1.2.9
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.1-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.22
-commons-beanutils:commons-beanutils:1.9.3
-commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.6
-io.projectreactor:reactor-bom:Dysprosium-SR25
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.15
-io.spring.nohttp:nohttp-checkstyle:0.0.3.RELEASE
-io.spring.nohttp:nohttp:0.0.3.RELEASE
-net.sf.saxon:Saxon-HE:9.9.1-3
-org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,8 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jacoco:org.jacoco.agent:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jacoco:org.jacoco.agent:0.8.2
-org.jacoco:org.jacoco.ant:0.8.2
-org.jacoco:org.jacoco.core:0.8.2
-org.jacoco:org.jacoco.report:0.8.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.ow2.asm:asm-analysis:6.2.1
-org.ow2.asm:asm-commons:6.2.1
-org.ow2.asm:asm-tree:6.2.1
-org.ow2.asm:asm:6.2.1
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,9 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-net.sf.ehcache:ehcache:2.10.9.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.slf4j:slf4j-api:1.7.32
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,15 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context-support:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-test:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context-support:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-test:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,7 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context-support:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-test:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context-support:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-test:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,25 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-io.projectreactor:reactor-bom:Dysprosium-SR25
-junit:junit:4.12
-net.bytebuddy:byte-buddy-agent:1.10.5
-net.bytebuddy:byte-buddy:1.10.5
-org.assertj:assertj-core:3.15.0
-org.hamcrest:hamcrest-core:1.3
-org.hsqldb:hsqldb:2.5.2
-org.jetbrains.kotlin:kotlin-bom:1.3.72
-org.mockito:mockito-core:3.3.3
-org.objenesis:objenesis:2.6
-org.springframework.data:spring-data-releasetrain:Moore-SR12
-org.springframework:spring-aop:5.2.19.RELEASE
-org.springframework:spring-beans:5.2.19.RELEASE
-org.springframework:spring-context-support:5.2.19.RELEASE
-org.springframework:spring-context:5.2.19.RELEASE
-org.springframework:spring-core:5.2.19.RELEASE
-org.springframework:spring-expression:5.2.19.RELEASE
-org.springframework:spring-framework-bom:5.2.19.RELEASE
-org.springframework:spring-jcl:5.2.19.RELEASE
-org.springframework:spring-jdbc:5.2.19.RELEASE
-org.springframework:spring-test:5.2.19.RELEASE
-org.springframework:spring-tx:5.2.19.RELEASE
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -127,7 +127,8 @@ public class AclPermissionEvaluator implements PermissionEvaluator {

 	List<Permission> resolvePermission(Object permission) {
 		if (permission instanceof Integer) {
-			return Arrays.asList(permissionFactory.buildFromMask((Integer) permission));
+			return Arrays.asList(permissionFactory.buildFromMask(((Integer) permission)
+					.intValue()));
 		}

 		if (permission instanceof Permission) {
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
 *
 * 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
+ *      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,
@@ -131,9 +131,10 @@ public class AccessControlEntryImpl implements AccessControlEntry,

 	@Override
 	public int hashCode() {
-		int result = this.permission.hashCode();
+		int result = this.acl.hashCode();
+		result = 31 * result + this.permission.hashCode();
 		result = 31 * result + (this.id != null ? this.id.hashCode() : 0);
-		result = 31 * result + (this.sid.hashCode());
+		result = 31 * result + this.sid.hashCode();
 		result = 31 * result + (this.auditFailure ? 1 : 0);
 		result = 31 * result + (this.auditSuccess ? 1 : 0);
 		result = 31 * result + (this.granting ? 1 : 0);
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -100,7 +100,7 @@ public class DefaultPermissionFactory implements PermissionFactory {
 		Assert.notNull(perm, "Permission required");
 		Assert.hasText(permissionName, "Permission name required");

-		Integer mask = perm.getMask();
+		Integer mask = Integer.valueOf(perm.getMask());

 		// Ensure no existing Permission uses this integer or code
 		Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask),
@@ -114,10 +114,10 @@ public class DefaultPermissionFactory implements PermissionFactory {
 	}

 	public Permission buildFromMask(int mask) {
-		if (registeredPermissionsByInteger.containsKey(mask)) {
+		if (registeredPermissionsByInteger.containsKey(Integer.valueOf(mask))) {
 			// The requested mask has an exact match against a statically-defined
 			// Permission, so return it
-			return registeredPermissionsByInteger.get(mask);
+			return registeredPermissionsByInteger.get(Integer.valueOf(mask));
 		}

 		// To get this far, we have to use a CumulativePermission
@@ -127,7 +127,8 @@ public class DefaultPermissionFactory implements PermissionFactory {
 			int permissionToCheck = 1 << i;

 			if ((mask & permissionToCheck) == permissionToCheck) {
-				Permission p = registeredPermissionsByInteger.get(permissionToCheck);
+				Permission p = registeredPermissionsByInteger.get(Integer
+						.valueOf(permissionToCheck));

 				if (p == null) {
 					throw new IllegalStateException("Mask '" + permissionToCheck
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -87,7 +87,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra

 				for (AccessControlEntry ace : aces) {

-					if (isGranted(ace, p)
+					if ((ace.getPermission().getMask() == p.getMask())
 							&& ace.getSid().equals(sid)) {
 						// Found a matching ACE, so its authorization decision will
 						// prevail
@@ -142,25 +142,4 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra
 		}
 	}

-	/**
-	 * Compares an ACE Permission to the given Permission.
-	 * By default, we compare the Permission masks for exact match.
-	 * Subclasses of this strategy can override this behavior and implement
-	 * more sophisticated comparisons, e.g. a bitwise comparison for ACEs that grant access.
-	 * <pre>{@code
-	 * if (ace.isGranting() && p.getMask() != 0) {
-	 *    return (ace.getPermission().getMask() & p.getMask()) != 0;
-	 * } else {
-	 *    return ace.getPermission().getMask() == p.getMask();
-	 * }
-	 * }</pre>
-	 *
-	 * @param ace the ACE from the Acl holding the mask.
-	 * @param p the Permission we are checking against.
-	 * @return true, if the respective masks are considered to be equal.
-	 */
-	protected boolean isGranted(AccessControlEntry ace, Permission p) {
-		return ace.getPermission().getMask() == p.getMask();
-	}
-
 }
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -152,9 +152,11 @@ public class ObjectIdentityImpl implements ObjectIdentity {
 	 */
 	@Override
 	public int hashCode() {
-		int result = this.type.hashCode();
-		result = 31 * result + this.identifier.hashCode();
-		return result;
+		int code = 31;
+		code ^= this.type.hashCode();
+		code ^= this.identifier.hashCode();
+
+		return code;
 	}

 	@Override
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,6 +17,7 @@ package org.springframework.security.acls.domain;

 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;

 import org.springframework.util.Assert;

@@ -48,7 +49,12 @@ public class PrincipalSid implements Sid {
 		Assert.notNull(authentication, "Authentication required");
 		Assert.notNull(authentication.getPrincipal(), "Principal required");

-		this.principal = authentication.getName();
+		if (authentication.getPrincipal() instanceof UserDetails) {
+			this.principal = ((UserDetails) authentication.getPrincipal()).getUsername();
+		}
+		else {
+			this.principal = authentication.getPrincipal().toString();
+		}
 	}

 	// ~ Methods
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -18,17 +18,11 @@ package org.springframework.security.acls.jdbc;
 import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.UUID;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.util.Assert;

 /**
 * Utility class for helping convert database representations of {@link ObjectIdentity#getIdentifier()} into
@@ -41,16 +35,7 @@ class AclClassIdUtils {

 	private ConversionService conversionService;

-	AclClassIdUtils() {
-		GenericConversionService genericConversionService = new GenericConversionService();
-		genericConversionService.addConverter(String.class, Long.class, new StringToLongConverter());
-		genericConversionService.addConverter(String.class, UUID.class, new StringToUUIDConverter());
-		this.conversionService = genericConversionService;
-	}
-
-	AclClassIdUtils(ConversionService conversionService) {
-		Assert.notNull(conversionService, "conversionService must not be null");
-		this.conversionService = conversionService;
+	public AclClassIdUtils() {
 	}

 	/**
@@ -74,7 +59,7 @@ class AclClassIdUtils {
 		return identifier;
 	}

-	private boolean hasValidClassIdType(ResultSet resultSet) {
+	private boolean hasValidClassIdType(ResultSet resultSet) throws SQLException {
 		boolean hasClassIdType = false;
 		try {
 			hasClassIdType = classIdTypeFrom(resultSet) != null;
@@ -101,13 +86,17 @@ class AclClassIdUtils {
 	}

 	private <T> boolean canConvertFromStringTo(Class<T> targetType) {
-		return conversionService.canConvert(String.class, targetType);
+		return hasConversionService() && conversionService.canConvert(String.class, targetType);
 	}

 	private <T extends Serializable> T convertFromStringTo(String identifier, Class<T> targetType) {
 		return conversionService.convert(identifier, targetType);
 	}

+	private boolean hasConversionService() {
+		return conversionService != null;
+	}
+
 	/**
 	 * Converts to a {@link Long}, attempting to use the {@link ConversionService} if available.
 	 * @param identifier    The identifier
@@ -118,7 +107,7 @@ class AclClassIdUtils {
 	 */
 	private Long convertToLong(Serializable identifier) {
 		Long idAsLong;
-		if (conversionService.canConvert(identifier.getClass(), Long.class)) {
+		if (hasConversionService()) {
 			idAsLong = conversionService.convert(identifier, Long.class);
 		} else {
 			idAsLong = Long.valueOf(identifier.toString());
@@ -131,31 +120,6 @@ class AclClassIdUtils {
 	}

 	public void setConversionService(ConversionService conversionService) {
-		Assert.notNull(conversionService, "conversionService must not be null");
 		this.conversionService = conversionService;
 	}
-
-	private static class StringToLongConverter implements Converter<String, Long> {
-		@Override
-		public Long convert(String identifierAsString) {
-			if (identifierAsString == null) {
-				throw new ConversionFailedException(TypeDescriptor.valueOf(String.class),
-						TypeDescriptor.valueOf(Long.class), null, null);
-
-			}
-			return Long.parseLong(identifierAsString);
-		}
-	}
-
-	private static class StringToUUIDConverter implements Converter<String, UUID> {
-		@Override
-		public UUID convert(String identifierAsString) {
-			if (identifierAsString == null) {
-				throw new ConversionFailedException(TypeDescriptor.valueOf(String.class),
-						TypeDescriptor.valueOf(UUID.class), null, null);
-
-			}
-			return UUID.fromString(identifierAsString);
-		}
-	}
 }
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,6 +17,7 @@ package org.springframework.security.acls.jdbc;

 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -30,8 +31,8 @@ import java.util.Set;
 import javax.sql.DataSource;

 import org.springframework.core.convert.ConversionException;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.security.acls.domain.AccessControlEntryImpl;
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
@@ -246,12 +247,14 @@ public class BasicLookupStrategy implements LookupStrategy {
 		String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size());

 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				ps -> {
-					int i = 0;
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;

-					for (Long toFind : findNow) {
-						i++;
-						ps.setLong(i, toFind);
+						for (Long toFind : findNow) {
+							i++;
+							ps.setLong(i, toFind);
+						}
 					}
 				}, new ProcessResultSet(acls, sids));

@@ -379,20 +382,22 @@ public class BasicLookupStrategy implements LookupStrategy {
 				objectIdentities.size());

 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				ps -> {
-					int i = 0;
-					for (ObjectIdentity oid : objectIdentities) {
-						// Determine prepared statement values for this iteration
-						String type = oid.getType();
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;
+						for (ObjectIdentity oid : objectIdentities) {
+							// Determine prepared statement values for this iteration
+							String type = oid.getType();

-						// No need to check for nulls, as guaranteed non-null by
-						// ObjectIdentity.getIdentifier() interface contract
-						String identifier = oid.getIdentifier().toString();
+							// No need to check for nulls, as guaranteed non-null by
+							// ObjectIdentity.getIdentifier() interface contract
+							String identifier = oid.getIdentifier().toString();

-						// Inject values
-						ps.setString((2 * i) + 1, identifier);
-						ps.setString((2 * i) + 2, type);
-						i++;
+							// Inject values
+							ps.setString((2 * i) + 1, identifier);
+							ps.setString((2 * i) + 2, type);
+							i++;
+						}
 					}
 				}, new ProcessResultSet(acls, sids));

@@ -449,7 +454,7 @@ public class BasicLookupStrategy implements LookupStrategy {

 		// Now we have the parent (if there is one), create the true AclImpl
 		AclImpl result = new AclImpl(inputAcl.getObjectIdentity(),
-				inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
+				(Long) inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
 				parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner());

 		// Copy the "aces" from the input to the destination
@@ -548,8 +553,8 @@ public class BasicLookupStrategy implements LookupStrategy {
 		}
 	}

-	public final void setConversionService(ConversionService conversionService) {
-		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
+	public final void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
+		this.aclClassIdUtils = aclClassIdUtils;
 	}

 	// ~ Inner Classes
@@ -559,7 +564,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 		private final Map<Serializable, Acl> acls;
 		private final List<Sid> sids;

-		ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
+		public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
 			Assert.notNull(acls, "ACLs cannot be null");
 			this.acls = acls;
 			this.sids = sids; // can be null
@@ -587,15 +592,15 @@ public class BasicLookupStrategy implements LookupStrategy {

 				if (parentId != 0) {
 					// See if it's already in the "acls"
-					if (acls.containsKey(parentId)) {
+					if (acls.containsKey(new Long(parentId))) {
 						continue; // skip this while iteration
 					}

 					// Now try to find it in the cache
-					MutableAcl cached = aclCache.getFromCache(parentId);
+					MutableAcl cached = aclCache.getFromCache(new Long(parentId));

 					if ((cached == null) || !cached.isSidLoaded(sids)) {
-						parentIdsToLookup.add(parentId);
+						parentIdsToLookup.add(new Long(parentId));
 					}
 					else {
 						// Pop into the acls map, so our convert method doesn't
@@ -621,7 +626,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 		 */
 		private void convertCurrentResultIntoObject(Map<Serializable, Acl> acls,
 				ResultSet rs) throws SQLException {
-			Long id = rs.getLong("acl_id");
+			Long id = new Long(rs.getLong("acl_id"));

 			// If we already have an ACL for this ID, just create the ACE
 			Acl acl = acls.get(id);
@@ -639,7 +644,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 				long parentAclId = rs.getLong("parent_object");

 				if (parentAclId != 0) {
-					parentAcl = new StubAclParent(parentAclId);
+					parentAcl = new StubAclParent(Long.valueOf(parentAclId));
 				}

 				boolean entriesInheriting = rs.getBoolean("entries_inheriting");
@@ -656,7 +661,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 			// It is permissible to have no ACEs in an ACL (which is detected by a null
 			// ACE_SID)
 			if (rs.getString("ace_sid") != null) {
-				Long aceId = rs.getLong("ace_id");
+				Long aceId = new Long(rs.getLong("ace_id"));
 				Sid recipient = createSid(rs.getBoolean("ace_principal"),
 						rs.getString("ace_sid"));

@@ -683,7 +688,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 	private static class StubAclParent implements Acl {
 		private final Long id;

-		StubAclParent(Long id) {
+		public StubAclParent(Long id) {
 			this.id = id;
 		}

@@ -1,11 +1,11 @@
 /*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+ * Copyright 2004, 2005, 2006, 2017 Acegi Technology Pty Limited
 *
 * 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
+ *      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,
@@ -16,6 +16,8 @@
 package org.springframework.security.acls.jdbc;

 import java.io.Serializable;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -24,9 +26,8 @@ import javax.sql.DataSource;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
@@ -65,7 +66,7 @@ public class JdbcAclService implements AclService {
 	// ~ Instance fields
 	// ================================================================================================

-	protected final JdbcOperations jdbcOperations;
+	protected final JdbcTemplate jdbcTemplate;
 	private final LookupStrategy lookupStrategy;
 	private boolean aclClassIdSupported;
 	private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
@@ -75,13 +76,9 @@ public class JdbcAclService implements AclService {
 	// ===================================================================================================

 	public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
-		this(new JdbcTemplate(dataSource), lookupStrategy);
-	}
-
-	public JdbcAclService(JdbcOperations jdbcOperations, LookupStrategy lookupStrategy) {
-		Assert.notNull(jdbcOperations, "JdbcOperations required");
+		Assert.notNull(dataSource, "DataSource required");
 		Assert.notNull(lookupStrategy, "LookupStrategy required");
-		this.jdbcOperations = jdbcOperations;
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
 		this.lookupStrategy = lookupStrategy;
 		this.aclClassIdUtils = new AclClassIdUtils();
 	}
@@ -90,13 +87,17 @@ public class JdbcAclService implements AclService {
 	// ========================================================================================================

 	public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
-		Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() };
-		List<ObjectIdentity> objects = jdbcOperations.query(findChildrenSql, args,
-				(rs, rowNum) -> {
-					String javaType = rs.getString("class");
-					Serializable identifier = (Serializable) rs.getObject("obj_id");
-					identifier = aclClassIdUtils.identifierFrom(identifier, rs);
-					return new ObjectIdentityImpl(javaType, identifier);
+		Object[] args = { parentIdentity.getIdentifier(), parentIdentity.getType() };
+		List<ObjectIdentity> objects = jdbcTemplate.query(findChildrenSql, args,
+				new RowMapper<ObjectIdentity>() {
+					public ObjectIdentity mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String javaType = rs.getString("class");
+						Serializable identifier = (Serializable) rs.getObject("obj_id");
+						identifier = aclClassIdUtils.identifierFrom(identifier, rs);
+
+						return new ObjectIdentityImpl(javaType, identifier);
+					}
 				});

 		if (objects.size() == 0) {
@@ -112,7 +113,7 @@ public class JdbcAclService implements AclService {
 		Assert.isTrue(map.containsKey(object),
 				() -> "There should have been an Acl entry for ObjectIdentity " + object);

-		return map.get(object);
+		return (Acl) map.get(object);
 	}

 	public Acl readAclById(ObjectIdentity object) throws NotFoundException {
@@ -153,7 +154,7 @@ public class JdbcAclService implements AclService {
 	public void setAclClassIdSupported(boolean aclClassIdSupported) {
 		this.aclClassIdSupported = aclClassIdSupported;
 		if (aclClassIdSupported) {
-			// Change the default children select if it hasn't been overridden
+			// Change the default insert if it hasn't been overridden
 			if (this.findChildrenSql.equals(DEFAULT_SELECT_ACL_WITH_PARENT_SQL)) {
 				this.findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL_WITH_CLASS_ID_TYPE;
 			} else {
@@ -162,8 +163,8 @@ public class JdbcAclService implements AclService {
 		}
 	}

-	public void setConversionService(ConversionService conversionService) {
-		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
+	public void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
+		this.aclClassIdUtils = aclClassIdUtils;
 	}

 	protected boolean isAclClassIdSupported() {
@@ -1,11 +1,11 @@
 /*
- * Copyright 2004, 2005, 2006, 2017, 2018 Acegi Technology Pty Limited
+ * Copyright 2004, 2005, 2006, 2017 Acegi Technology Pty Limited
 *
 * 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
+ *      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,
@@ -135,7 +135,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 		if (acl.getEntries().isEmpty()) {
 			return;
 		}
-		jdbcOperations.batchUpdate(insertEntry, new BatchPreparedStatementSetter() {
+		jdbcTemplate.batchUpdate(insertEntry, new BatchPreparedStatementSetter() {
 			public int getBatchSize() {
 				return acl.getEntries().size();
 			}
@@ -146,9 +146,10 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 						"Unknown ACE class");
 				AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;

-				stmt.setLong(1, (Long) acl.getId());
+				stmt.setLong(1, ((Long) acl.getId()).longValue());
 				stmt.setInt(2, i);
-				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true));
+				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true)
+						.longValue());
 				stmt.setInt(4, entry.getPermission().getMask());
 				stmt.setBoolean(5, entry.isGranting());
 				stmt.setBoolean(6, entry.isAuditSuccess());
@@ -169,7 +170,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
 		Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
 		Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true, object.getIdentifier().getClass());
-		jdbcOperations.update(insertObjectIdentity, classId, object.getIdentifier().toString(), sidId,
+		jdbcTemplate.update(insertObjectIdentity, classId, object.getIdentifier(), sidId,
 				Boolean.TRUE);
 	}

@@ -183,7 +184,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 * @return the primary key or null if not found
 	 */
 	protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate, Class idType) {
-		List<Long> classIds = jdbcOperations.queryForList(selectClassPrimaryKey,
+		List<Long> classIds = jdbcTemplate.queryForList(selectClassPrimaryKey,
 				new Object[] { type }, Long.class);

 		if (!classIds.isEmpty()) {
@@ -192,13 +193,13 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS

 		if (allowCreate) {
 			if (!isAclClassIdSupported()) {
-				jdbcOperations.update(insertClass, type);
+				jdbcTemplate.update(insertClass, type);
 			} else {
-				jdbcOperations.update(insertClass, type, idType.getCanonicalName());
+				jdbcTemplate.update(insertClass, type, idType.getCanonicalName());
 			}
 			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
 					"Transaction must be running");
-			return jdbcOperations.queryForObject(classIdentityQuery, Long.class);
+			return jdbcTemplate.queryForObject(classIdentityQuery, Long.class);
 		}

 		return null;
@@ -247,18 +248,18 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal,
 			boolean allowCreate) {

-		List<Long> sidIds = jdbcOperations.queryForList(selectSidPrimaryKey, new Object[] {
-				sidIsPrincipal, sidName }, Long.class);
+		List<Long> sidIds = jdbcTemplate.queryForList(selectSidPrimaryKey, new Object[] {
+				Boolean.valueOf(sidIsPrincipal), sidName }, Long.class);

 		if (!sidIds.isEmpty()) {
 			return sidIds.get(0);
 		}

 		if (allowCreate) {
-			jdbcOperations.update(insertSid, sidIsPrincipal, sidName);
+			jdbcTemplate.update(insertSid, Boolean.valueOf(sidIsPrincipal), sidName);
 			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
 					"Transaction must be running");
-			return jdbcOperations.queryForObject(sidIdentityQuery, Long.class);
+			return jdbcTemplate.queryForObject(sidIdentityQuery, Long.class);
 		}

 		return null;
@@ -310,7 +311,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 * @param oidPrimaryKey the rows in acl_entry to delete
 	 */
 	protected void deleteEntries(Long oidPrimaryKey) {
-		jdbcOperations.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
+		jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
 	}

 	/**
@@ -324,7 +325,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 */
 	protected void deleteObjectIdentity(Long oidPrimaryKey) {
 		// Delete the acl_object_identity row
-		jdbcOperations.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
+		jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
 	}

 	/**
@@ -338,8 +339,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 	 */
 	protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
 		try {
-			return jdbcOperations.queryForObject(selectObjectIdentityPrimaryKey, Long.class,
-					oid.getType(), oid.getIdentifier().toString());
+			return jdbcTemplate.queryForObject(selectObjectIdentityPrimaryKey, Long.class,
+					oid.getType(), oid.getIdentifier());
 		}
 		catch (DataAccessException notFound) {
 			return null;
@@ -408,8 +409,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
 		Assert.notNull(acl.getOwner(), "Owner is required in this implementation");

 		Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
-		int count = jdbcOperations.update(updateObjectIdentity, parentId, ownerSid,
-				acl.isEntriesInheriting(), acl.getId());
+		int count = jdbcTemplate.update(updateObjectIdentity, parentId, ownerSid,
+				Boolean.valueOf(acl.isEntriesInheriting()), acl.getId());

 		if (count != 1) {
 			throw new NotFoundException("Unable to locate ACL to update");
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -32,7 +32,7 @@ public class AclFormattingUtilsTests {
 	// ~ Methods
 	// ========================================================================================================
 	@Test
-	public final void testDemergePatternsParametersConstraints() {
+	public final void testDemergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.demergePatterns(null, "SOME STRING");
 			fail("It should have thrown IllegalArgumentException");
@@ -63,7 +63,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testDemergePatterns() {
+	public final void testDemergePatterns() throws Exception {
 		String original = "...........................A...R";
 		String removeBits = "...............................R";
 		assertThat(AclFormattingUtils.demergePatterns(original, removeBits)).isEqualTo(
@@ -76,7 +76,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testMergePatternsParametersConstraints() {
+	public final void testMergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.mergePatterns(null, "SOME STRING");
 			fail("It should have thrown IllegalArgumentException");
@@ -106,7 +106,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testMergePatterns() {
+	public final void testMergePatterns() throws Exception {
 		String original = "...............................R";
 		String extraBits = "...........................A....";
 		assertThat(AclFormattingUtils.mergePatterns(original, extraBits)).isEqualTo(
@@ -119,7 +119,7 @@ public class AclFormattingUtilsTests {
 	}

 	@Test
-	public final void testBinaryPrints() {
+	public final void testBinaryPrints() throws Exception {
 		assertThat(AclFormattingUtils.printBinary(15)).isEqualTo(
 				"............................****");

@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -36,7 +36,7 @@ import java.util.List;
 public class AclPermissionCacheOptimizerTests {

 	@Test
-	public void eagerlyLoadsRequiredAcls() {
+	public void eagerlyLoadsRequiredAcls() throws Exception {
 		AclService service = mock(AclService.class);
 		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
 		ObjectIdentityRetrievalStrategy oidStrat = mock(ObjectIdentityRetrievalStrategy.class);
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -26,6 +26,8 @@ import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;

@@ -37,18 +39,18 @@ import org.springframework.security.core.Authentication;
 public class AclPermissionEvaluatorTests {

 	@Test
-	public void hasPermissionReturnsTrueIfAclGrantsPermission() {
+	public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
 		AclService service = mock(AclService.class);
 		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
 		ObjectIdentity oid = mock(ObjectIdentity.class);
 		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		when(oidStrategy.getObjectIdentity(any(Object.class))).thenReturn(oid);
+		when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
 		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);

-		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
-		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
+		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);

 		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "READ")).isTrue();
 	}
@@ -62,13 +64,13 @@ public class AclPermissionEvaluatorTests {
 		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
 		ObjectIdentity oid = mock(ObjectIdentity.class);
 		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-		when(oidStrategy.getObjectIdentity(any(Object.class))).thenReturn(oid);
+		when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
 		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);

-		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
-		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
+		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);

 		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "write")).isTrue();

@@ -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
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Josh Cummings	3c95c08106	Release Spring Security 5.1.4.RELEASE	2019-02-13 10:36:08 -07:00
Joe Grandja	091cbe5458	ServletOAuth2AuthorizedClientExchangeFilterFunction supports chaining Fixes gh-6483	2019-02-13 12:17:05 -05:00
Josh Cummings	04f8a7974e	Update to org.jasig.cas.client:cas-client-core 3.5.1 Fixes: gh-6537	2019-02-13 10:13:49 -07:00
Josh Cummings	66f30cf606	Update to org.bouncycastle:bcpkix-jdk15on 1.61 Fixes: gh-6536	2019-02-13 10:13:49 -07:00
Josh Cummings	e23e738cfe	Update to httpclient 4.5.7 Fixes: gh-6534	2019-02-13 09:41:18 -07:00
Josh Cummings	54e7aace6d	Update to Spring Boot 2.1.2 Fixes: gh-6533	2019-02-13 09:23:09 -07:00
Josh Cummings	4c1fdbf290	Update to appengine 1.9.71 Fixes: gh-6532	2019-02-13 09:19:40 -07:00
Josh Cummings	759c378eeb	Update to Spring Reactor Californium-SR5 Fixes: gh-6531	2019-02-13 09:11:44 -07:00
Josh Cummings	9f514753d5	Update to Spring Data Lovelace-SR5 Fixes: gh-6529	2019-02-13 09:11:01 -07:00
Josh Cummings	16d5566cd6	Update to Spring Framework 5.1.5 Fixes: gh-6528	2019-02-13 09:10:22 -07:00
Stephen Doxsee	7633fbfd8a	Client OAuth2 properties to use scope not scopes OAuth2ClientProperties.Registration (which captures .properties and .yml for OAuth2 Client) has a member `scope` but not `scopes`. Samples and documentation were using `scopes` and have now been updated to use `scope`. Fixes gh-6510	2019-02-08 12:02:04 -05:00
Fabien Arrault	51f905cb89	Preserve existing refresh token if new refresh token not returned During an oauth2 refresh if the authorization server doesn't return a new refresh token, preserve the existing one. Fixes: gh-6503	2019-02-07 15:40:44 -05:00
Bryan Kelly	007ee7652b	Missing spring: prefix on jwk-set-uri example	2019-01-25 08:31:41 -06:00
Ankur Pathak	0aaaaf9f2f	Improve CsrfBeanDefinitionParser xml parsing 1. CsrfBeanDefinitionParser registers requestDataValueProcessor if not already registered 2. Created Tests in CsrfBeanDefinitionParserTests Fixes: gh-6423	2019-01-22 14:02:30 -06:00
Ankur Pathak	be7d2a3c41	HTML markup fixed in DefaultLoginPageGeneratingFilter Ending div moved out of condition. Fixes: gh-6417	2019-01-22 13:26:15 -06:00
Josh Cummings	e6aa141260	authorization_uri Uses UriComponentsBuilder Because of this, authorization_uri can now be a fully-qualified url. Fixes: gh-5760	2019-01-19 07:51:03 -05:00
Andy Wilkinson	e6bb9bfdca	Fix formatting in Implicit OAuth2AuthorizedClient section	2019-01-18 10:27:54 -07:00
Denis Washington	548dc4496c	Save query parameters in WebSessionServerRequestCache Previously, URL query parameters were lost when saving a request in WebSessionServerRequestCache. Now it is properly saved and restored. Fixes: gh-6421	2019-01-15 13:46:09 -06:00
Mohammad Sadeq Dousti	7f2f12c428	hasRole should not be called on a string with "ROLE_" prefix (#6353 ) Removed "ROLE_" from UrlAuthorizationConfigurer This fixes IllegalArgumentException: ROLE_ANONYMOUS should not start with ROLE_ since ROLE_	2019-01-15 09:00:29 -06:00
Josh Cummings	6dfad970d4	Next Development Version	2019-01-10 16:54:39 -07:00
Josh Cummings	114e00f1dd	Release 5.1.3.RELEASE	2019-01-10 15:40:02 -07:00
Joe Grandja	a0e541eb70	Update to Spring Boot 2.1.1.RELEASE Fixes gh-6405	2019-01-10 14:55:31 -05:00
Joe Grandja	477a5a7cd3	Update to org.powermock 2.0.0 Fixes gh-6404	2019-01-10 14:52:57 -05:00
Joe Grandja	8918a7e693	Update to ehcache 2.10.6 Fixes gh-6403	2019-01-10 14:50:11 -05:00
Joe Grandja	bf33f9acef	Update to com.squareup.okhttp3 3.12.1 Fixes gh-6402	2019-01-10 14:48:30 -05:00
Joe Grandja	f1598b985c	Update to com.fasterxml.jackson.core 2.9.8 Fixes gh-6401	2019-01-10 14:44:56 -05:00
Joe Grandja	cc1ab2c368	Update to cglib-nodep 3.2.10 Fixes gh-6400	2019-01-10 14:42:47 -05:00
Joe Grandja	aac4525737	Update to spring-build-conventions:0.0.23.RELEASE Fixes gh-6389	2019-01-10 12:28:48 -05:00
Joe Grandja	eeb099a04f	Update to Reactor Californium-SR4 Fixes gh-6387	2019-01-10 12:05:35 -05:00
Joe Grandja	3e90c7663f	Update to Spring Framework 5.1.4 Fixes gh-6386	2019-01-10 12:03:24 -05:00
Joe Grandja	cfec514082	Update to Spring Data Lovelace-SR4 Fixes gh-6385	2019-01-10 12:01:24 -05:00
Ankur Pathak	80b123bf36	fixes setting paramName only when it is not null Fixes: gh-6223	2019-01-10 10:26:49 -06:00
Rafael Renan Pacheco	ee6f9e0b92	cconfigured -> configured	2019-01-08 13:19:08 -06:00
Ankur Pathak	2625de9c23	Fixes typo in x,rnc files 1. Fixes type ammount to amount in .rnc files 2. Regenerates .xsd files from *.rnc files Fixes: gh-6325	2019-01-08 11:33:46 -07:00
Onur Kagan Ozcan	a145653030	Fix UsernamePasswordAuthenticationTokenDeserializer to handle customized object mapper inclusion settings Resolves #4698	2019-01-07 14:23:53 -06:00
Slava Semushin	8bc0ef86da	LazyCsrfTokenRepository: fix a typo in javadoc.	2019-01-07 13:36:17 -06:00
Joe Grandja	a02d6ad2a4	AuthenticationFailureEvent should publish once Fixes gh-6281	2018-12-21 07:55:24 -05:00
Josh Cummings	acdd9ba1db	Split Branches Into Multiple Sonarqube Projects Eliminate analysis collisions and simplify application of analysis quite periods. Fixes: gh-6091	2018-12-18 14:42:45 -07:00
finke-ba	e218ac2e40	Add conditionally servlet based support for spring security web jackson module.	2018-12-18 14:22:48 -06:00
Rob Winch	dd859c4a6e	Fix LoginPageGeneratingWebFilter Markup Fixes: gh-6295	2018-12-17 11:18:40 -06:00
Ian He	5d85a1c9d8	Fix DefaultLoginPageGeneratingFilter Markup the `</h3>` should be `</h2>`.	2018-12-17 10:50:23 -06:00
Zhanwei Wang	49167458d2	Improve error message for Chinese.	2018-12-06 11:59:35 -06:00
Robbie Martinus	6b4edacde2	SessionRegistryImpl uses computeIfAbsent Fixes: gh-5834	2018-12-05 10:28:30 -06:00
lmagyar	b7cebee89e	SecurityContextCallableProcessingInterceptor thread visibility fix Within class SecurityContextCallableProcessingInterceptor field securityContext should volatile. Fixes gh-6143	2018-12-03 15:46:20 -06:00
Rafael Dominguez	01787ea168	Restored Jacoco default task dependence This commit ensures that the jacoco plugin is applied when calling check and test tasks. Also remoed the clean task that prevented sonarqube using coverage data Fixes: gh-6199	2018-11-30 14:26:36 -06:00
Rob Winch	e3e9758da7	Fix Generics in ReactorContextTestExecutionListenerTests for JDK 9+ Issue: gh-6075	2018-11-30 12:08:50 -06:00
Aanuoluwapo Otitoola	46012d62af	ReactorContextTestExecutionListener should use named hooks Fixes: gh-6075	2018-11-30 11:16:47 -06:00
Rob Winch	6eb8129173	Next Snapshot	2018-11-28 08:45:53 -06:00
Rob Winch	55dd732443	Release 5.1.2.RELEASE	2018-11-28 08:44:40 -06:00
Rob Winch	45cbdc03ba	Remove Thymeleaf dependency management Fixes: gh-6161	2018-11-28 08:20:09 -06:00
Rob Winch	d99c7dbfd1	Update to GAE 1.9.68 Fixes: gh-6160	2018-11-28 08:19:56 -06:00
Rob Winch	d8de4d06f7	Update to Mockito 2.23.4 Fixes: gh-6159	2018-11-28 08:19:41 -06:00
Rob Winch	be2f0f0fae	Update to AspectJ 1.9.2 Fixes: gh-6158	2018-11-28 08:19:33 -06:00
Rob Winch	920d5ca6ad	Update to unboundid 4.0.9 Fixes: gh-6157	2018-11-28 08:19:20 -06:00
Rob Winch	6dcf5a27b1	Update to Powermock 2.0.0-RC.4 Fixes: gh-6156	2018-11-28 08:19:13 -06:00
Rob Winch	c2166c4207	Update to cglib-nodep:3.2.9 Fixes: gh-6155	2018-11-28 08:18:57 -06:00
Rob Winch	1542835268	Update to Spring Data Lovelace-SR3 Fixes: gh-6154	2018-11-28 08:18:40 -06:00
Rob Winch	ae471e1456	Update to Spring 5.1.3 Fixes: gh-6153	2018-11-28 08:18:31 -06:00
Rob Winch	853c54eecb	Update to Reactor Californium-SR3 Fixes: gh-6152	2018-11-28 08:18:18 -06:00
Joe Grandja	10f6d10f81	Update com.squareup.okhttp3 deps to 3.12.0 Fixes gh-5570	2018-11-26 12:44:30 -05:00
Rafael Dominguez	02d844d528	Enable Code Coverage Reports in Sonar This commit ensures that jacocoTestReport task is called when running the Sonar stage. Additionally, a variable is passed instructing Sonar where to find the test result data. Fixes: gh-6092	2018-11-26 09:29:21 -07:00
Rafael Dominguez	c0849ba891	Update to Gradle 4.10.2 Fixes gh-6106	2018-11-21 09:59:12 -06:00
Josh Cummings	db145fa03f	Register NullRequestCache When Disabled Fixes: gh-6102	2018-11-20 07:39:54 -07:00
Josh Cummings	42b8b794a8	RequestCacheConfigurerTests groovy->java Issue: gh-4939	2018-11-20 07:37:54 -07:00
dperezcabrera	8014114225	Make InMemory*ClientRegistrationRepository Consistent The previous builders with the list argument were inconsistent with their respective builders of var args.	2018-11-19 11:12:37 -06:00
Rafael Dominguez	a742c0c3f2	WebClientReactiveClientCredentialsTokenResponseClient.getTokenResponse expects 2xx http status code This ensures that token response is only extracted when ClientResponse has a successful status Fixes: gh-6089	2018-11-19 10:51:33 -06:00
Rafael Dominguez	1cec4fe3ac	OAuth2AccessTokenResponseBodyExtractor supports Object values This commit ensures the token response is parsed correctly if the values are not a String. Fixes: gh-6087	2018-11-15 13:24:48 -06:00
Daniel Bustamante Ospina	8655caa2de	Update webflux-form sample to use Built in CSRF Support Remove the CsrfControllerAdvice class and update dependencies to add org.thymeleaf.extras:thymeleaf-extras-springsecurity5 Issue: gh-6061	2018-11-14 17:19:06 -06:00
Dongmin Shin	dc5f5f348d	Fix Typo in Reference Docs Fixes gh-6076	2018-11-14 11:37:22 -06:00
Rafael Dominguez	35e05780ea	Updated Spring Boot version from 2.1.0.M4 to 2.1.0.RELEASE	2018-11-14 10:55:26 -06:00
Gunnar Hillert	a461abcf32	Docs: Fix Maven Property example `spring-security.version`	2018-11-13 15:09:46 -06:00
Josh Cummings	ba1f5f3873	Leave Issuer As String - Documentation Update documentation that indicated the iss claim is proactively coerced into a URL. Issue: gh-6073	2018-11-13 12:35:08 -07:00
Josh Cummings	5478b74116	Leave Issuer As String Since StringOrURI is a valid issuer, MappedJwtClaimSetConverter and JwtIssuerValidator no longer assume it. Issue: gh-6073	2018-11-13 10:43:36 -07:00
Josh Cummings	dc4aa3d017	Favor URL.toExternalForm Converts URLs to Strings before comparing them. Uses toString(), which delegates to toExternalForm(). Fixes: gh-6073	2018-11-13 07:39:24 -07:00
Josh Cummings	2bc156ed19	Update to spring-build-conventions:0.0.22.RELEASE Fixes: gh-6064	2018-11-12 09:31:51 -07:00
dperezcabrera	0270994340	InMemoryUserDetailsManager.updatePassword case-insenstive Previously updatePassword was case sensitive which was inconsistent with the rest of the class. This commit updates updatePassword to be case insensitive. Fixes: gh-6039	2018-11-09 11:41:44 -06:00
Erik van Paassen	a557a324c0	Fix csrf:token-repository-ref XSD documentation The documentation of the token-repository-ref attribute of the csrf element in the schema has been updated to make clear the default repository is lazy. Targets versions 4.2, 5.0 and 5.1. Fixes gh-6037	2018-11-08 10:22:07 -06:00
Josh Cummings	73022059d4	Update Reactive Resource Server Docs Resource Server documentation for both Servlet and Reactive now have a similar feel and offer deeper exposure to common use cases. Fixes: gh-6054	2018-11-07 12:10:33 -07:00
Josh Cummings	165cbcb723	Write Security Headers Before Servlet Include HeaderWriterFilter wraps request dispatcher so it can write security headers before the include occurs. Fixes: gh-5499	2018-10-31 09:32:40 -06:00
Josh Cummings	d99ecc2a7b	Add JDK 11 to Jenkins Fixes: gh-5860	2018-10-26 07:38:55 -06:00
Josh Cummings	ccd2664e6c	JDK 11 Compatibility Upgraded dependencies and removed a test in the Java Config LDAP sample which is arguably an integration test since it starts up an LDAP container. This test also isn't JDK 11 compatible and the remaining integration tests in the sample cover the same material. Issue: gh-5860	2018-10-26 07:38:31 -06:00
Joe Grandja	b87ff3c00f	Remove charset from Accept header in UserInfo request Fixes gh-6017	2018-10-25 14:10:41 -04:00
Joe Grandja	8971777908	Set AuthenticationEventPublisher on each AuthenticationManagerBuilder Fixes gh-6009	2018-10-23 14:41:26 -04:00
Drummond Dawson	3d618d78ac	Remove unnecessary concatenation of sql in JdbcUserDetailsManager	2018-10-19 15:30:24 -05:00
Drummond Dawson	697b8cd734	Add missing space to heading for it to render properly	2018-10-19 15:27:35 -05:00
Rob Winch	cf03faf58e	Update to spring-build-conventions:0.0.20.RELEASE Fixes: gh-5998	2018-10-18 16:14:59 -05:00
Rob Winch	13159e9f88	Fail the build if deploy fails Fixes: gh-5997	2018-10-18 16:14:59 -05:00
Brian Demers	41b7c74928	Fixing IllegalStateException message in OAuth2ResourceServerConfigurer Updated message to include `http.oauth2ResourceServer()`	2018-10-17 15:14:49 -05:00
Josh Cummings	0a4ac4dbfc	Add JDK 10 to Jenkins Fixes: gh-5860	2018-10-17 15:06:14 -05:00
Josh Cummings	1eb56f46a5	JDK 10 Compatibility Upgrading dependencies and reconfiguring PowerMock Issue: gh-5860	2018-10-17 15:06:14 -05:00
Josh Cummings	cfc3c25304	Update to Spring Build Conventions 0.0.19 Fixes: gh-5981	2018-10-17 15:06:14 -05:00
sunflower-seed	03a3a3b770	Update SubjectDnX509PrincipalExtractor.java Added missing asterisk	2018-10-17 14:58:31 -05:00