Release 5.4.1

.gitattributes

@@ -1,16 +0,0 @@
-# Normalize line endings to auto.
-* text auto
-
-# Ensure that line endings for DOS batch files are not modified.
-*.bat -text
-
-# Ensure the following are treated as binary.
-*.cer      binary
-*.graffle  binary
-*.jar      binary
-*.jpeg     binary
-*.jpg      binary
-*.keystore binary
-*.odg      binary
-*.otg      binary
-*.png      binary

.github/workflows/clean_build_artifacts.yml

@@ -1,17 +0,0 @@
-name: Clean build artifacts
-on:
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Delete artifacts in cron job
-        env:
-          GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-        run: |
-          echo "Running clean build artifacts logic"
-          output=$(curl -X GET -H "Authorization: token $GH_ACTIONS_REPO_TOKEN" https://api.github.com/repos/spring-projects/spring-security/actions/artifacts | grep '"id"' | cut -d : -f2 | sed 's/,*$//g')
-          echo Output is $output
-          for id in $output; do curl -X DELETE -H "Authorization: token $GH_ACTIONS_REPO_TOKEN" https://api.github.com/repos/spring-projects/spring-security/actions/artifacts/$id; done;

.github/workflows/continuous-integration-workflow.yml

@@ -1,201 +0,0 @@
-name: CI
-
-on:
-  push:
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch: # Manual trigger
-
-env:
-  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-  COMMIT_OWNER: ${{ github.event.pusher.name }}
-  COMMIT_SHA: ${{ github.sha }}
-  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-  RUN_JOBS: ${{ github.repository == 'spring-projects/spring-security' }}
-
-jobs:
-  prerequisites:
-    name: Pre-requisites for building
-    runs-on: ubuntu-latest
-    outputs:
-      runjobs: ${{ steps.continue.outputs.runjobs }}
-    steps:
-      - id: continue
-        name: Determine if should continue
-        if: env.RUN_JOBS == 'true'
-        run: echo "::set-output name=runjobs::true"
-  build_jdk_11:
-    name: Build JDK 11
-    needs: [prerequisites]
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Build with Gradle
-        env:
-          GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-          GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew clean build --continue -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"
-  snapshot_tests:
-    name: Test against snapshots
-    needs: [prerequisites]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Snapshot Tests
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace
-  sonar_analysis:
-    name: Static Code Analysis
-    needs: [prerequisites]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    env:
-      SONAR_URL: ${{ secrets.SONAR_URL }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Run Sonar on given (non-main) branch
-        if: ${{ github.ref != 'refs/heads/main' }}
-        run: |
-          export BRANCH=${GITHUB_REF#refs/heads/}
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew sonarqube -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PexcludeProjects='**/samples/**' -Dsonar.projectKey="spring-security-${GITHUB_REF#refs/heads/}" -Dsonar.projectName="spring-security-${GITHUB_REF#refs/heads/}" -Dsonar.host.url="$SONAR_URL" -Dsonar.login="$SONAR_TOKEN" --stacktrace
-      - name: Run Sonar on main
-        if: ${{ github.ref == 'refs/heads/main' }}
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew sonarqube -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PexcludeProjects='**/samples/**' -Dsonar.host.url="$SONAR_URL" -Dsonar.login="$SONAR_TOKEN" --stacktrace
-  deploy_artifacts:
-    name: Deploy Artifacts
-    needs: [build_jdk_11, snapshot_tests, sonar_analysis]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Deploy artifacts
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
-        env:
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-          OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-          OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-  deploy_docs:
-    name: Deploy Docs
-    needs: [build_jdk_11, snapshot_tests, sonar_analysis]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Deploy Docs
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew deployDocs -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace
-        env:
-          DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
-          DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
-          DOCS_HOST: ${{ secrets.DOCS_HOST }}
-  deploy_schema:
-    name: Deploy Schema
-    needs: [build_jdk_11, snapshot_tests, sonar_analysis]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
-      - name: Deploy Schema
-        run: |
-          export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
-          export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
-          export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew deploySchema -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace --info
-        env:
-          DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }}
-          DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }}
-          DOCS_HOST: ${{ secrets.DOCS_HOST }}
-  notify_result:
-    name: Check for failures
-    needs: [build_jdk_11, snapshot_tests, sonar_analysis, deploy_artifacts, deploy_docs, deploy_schema]
-    if: failure()
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Slack message
-        uses: Gamesight/slack-workflow-status@v1.0.1
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          channel: '#spring-security-ci'
-          name: 'CI Notifier'

.github/workflows/pr-build-workflow.yml

@@ -2,27 +2,21 @@ name: PR Build
 
 on: pull_request
 
-env:
-  RUN_JOBS: ${{ github.repository == 'spring-projects/spring-security' }}
-
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+
     steps:
-      - if: env.RUN_JOBS == 'true'
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
       - name: Set up JDK
-        if: env.RUN_JOBS == 'true'
         uses: actions/setup-java@v1
         with:
-          java-version: '11'
+          java-version: '8'
       - name: Cache Gradle packages
-        if: env.RUN_JOBS == 'true'
         uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
       - name: Build with Gradle
-        if: env.RUN_JOBS == 'true'
         run: ./gradlew clean build --continue --scan

.idea/checkstyle-idea.xml

@@ -3,14 +3,17 @@
   <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>
+</project>

CONTRIBUTING.adoc

@@ -4,27 +4,27 @@ _Please refer back to this document as a checklist before issuing any pull reque
 
 = Code of Conduct
 
-Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct].
+Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]
 
 = Similar but different
 
-Each Spring module is slightly different from one another in terms of team size, number of issues, etc. Therefore, each project is managed slightly different. You will notice that this document is very similar to the https://github.com/spring-projects/spring-framework/wiki/Contributor-guidelines[Spring Framework Contributor guidelines]. However, there are some subtle differences between the two documents, so please be sure to read this document thoroughly.
+Each Spring module is slightly different than another in terms of team size, number of issues, etc. Therefore each project is managed slightly different. You will notice that this document is very similar to the https://github.com/spring-projects/spring-framework/wiki/Contributor-guidelines[Spring Framework Contributor guidelines]. However, there are some subtle differences between the two documents, so please be sure to read this document thoroughly.
 
 = Importing into IDE
 
 The following provides information on setting up a development environment that can run the sample in https://www.springsource.org/sts[Spring Tool Suite 3.6.0+]. Other IDE's should work using Gradle's IDE support, but have not been tested.
 
 * IDE Setup
-** Install Spring Tool Suite 3.6.0+
-** You will need the following plugins installed (can be found on the Extensions Page)
-*** Gradle Eclipse
-*** Groovy Eclipse
+* Install Spring Tool Suite 3.6.0+
+* You will need the following plugins installed (can be found on the Extensions Page)
+ * Gradle Eclipse
+ * Groovy Eclipse
 * Importing the project into Spring Tool Suite
-** File -> Import… -> Gradle Project
+* File->Import…->Gradle Project
 
-As of new versions of Spring Tool Suite, you might need to install Groovy Eclipse pointing directly to the updated plugin location. To install Groovy Eclipse on Spring Tool Suite based on Eclipse Oxigen you must do the following steps:
+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:
+Help->Install New Software…->Add the following URL into _Work with_ field:
 https://dist.springsource.org/snapshot/GRECLIPSE/e4.7/[https://dist.springsource.org/snapshot/GRECLIPSE/e4.7/]
 
 = Understand the basics
@@ -33,7 +33,7 @@ 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 https://github.com/spring-projects/spring-security/issues[GitHub 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.
+Is there already an issue that addresses your concern? Do a bit of searching in our https://github.com/spring-projects/spring-security/issues[GitHub 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.
 
 = Discuss non-trivial contribution ideas with committers
 
@@ -41,15 +41,16 @@ If you're considering anything more than correcting a typo or fixing a minor bug
 
 = Sign the Contributor License Agreement
 
-If you have not previously done so, please fill out and submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+If you have not previously done so, please fill out and
+submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
 
-= Create your branch from main
+= Create your branch from master
 
-Create your topic branch to be submitted as a pull request from main. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.
+Create your topic branch to be submitted as a pull request from master. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.
 
 = Use short branch names
 
-Branches used when submitting pull requests should preferably be named according to GitHub issues, e.g. `gh-1234` or `gh-1234-fix-npe`. Otherwise, use succinct, lower-case, dash (`-`) delimited names, such as `fix-warnings` or `fix-typo`. This is important, because branch names show up in the merge commits that result from accepting pull requests, and should be as expressive and concise as possible.
+Branches used when submitting pull requests should preferably be named according to GitHub issues, e.g. 'gh-1234' or 'gh-1234-fix-npe'. Otherwise, use succinct, lower-case, dash (-) delimited names, such as 'fix-warnings', 'fix-typo', etc. This is important, because branch names show up in the merge commits that result from accepting pull requests, and should be as expressive and concise as possible.
 
 = Keep commits focused
 
@@ -57,77 +58,53 @@ Remember each ticket should be focused on a single item of interest since the ti
 
 = Mind the whitespace
 
-Please carefully follow the whitespace and formatting conventions already present in the framework.
+Please carefully follow the whitespace and formatting conventions already present in the framework. 
 
 . Tabs, not spaces
 . Unix (LF), not dos (CRLF) line endings
 . Eliminate all trailing whitespace
 . Aim to wrap code at 120 characters, but favor readability over wrapping
 . Preserve existing formatting; i.e. do not reformat code for its own sake
-. Search the codebase using `git grep` and other tools to discover common naming conventions, etc.
+. Search the codebase using git grep and other tools to discover common naming conventions, etc.
 . UTF-8 encoding for Java sources and XML files
 
 Whitespace management tips
 
 . You can use the https://marketplace.eclipse.org/content/anyedit-tools[AnyEdit Eclipse plugin] to ensure spaces are used and to clean up trailing whitespaces.
-. Use Git's `pre-commit.sample` hook to prevent invalid whitespace from being pushed out. You can enable it by moving `.git/hooks/pre-commit.sample` to `.git/hooks/pre-commit` and ensuring it is executable. For more information on hooks refer to https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks[https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks].
+. 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 https://git-scm.com/book/cs/ch7-3.html[Pro Git's Pre-Commit Hook's section]
 
 = Add Apache license header to all new classes
 
-----
-/*
- * Copyright 2002-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ...;
-----
-
 = Update Apache license header to modified files as necessary
 
-Always check the date range in the license header. For example, if you've modified a file in 2020 whose header still reads
-
-----
+Always check the date range in the license header. For example, if you've modified a file in 2012 whose header still reads
+<pre>
+ * Copyright 2002-2011 the original author or authors.
+</pre>
+then be sure to update it to 2012 appropriately
+<pre>
  * Copyright 2002-2012 the original author or authors.
-----
-
-then be sure to update it to the current year appropriately (e.g. 2020)
-
-----
- * Copyright 2002-2020 the original author or authors.
-----
+</pre>
 
 = Use @since tags for newly-added public API types and methods
 
-Example:
-
-----
+e.g.
+<pre>
 /**
  * …
  *
  * @author First Last
- * @since 5.4
+ * @since 3.2
  * @see …
  */
-----
+</pre>
 
 = Submit JUnit test cases for all behavior changes
 
-Search the codebase to find related unit tests and add additional `@Test` methods within.
+Search the codebase to find related unit tests and add additional `@Test` methods within. 
 
-. Any new tests should end in the name `Tests` (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`.
-. 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`.
+. Any new tests should end in the name Tests (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`.
+. 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
 
@@ -137,76 +114,44 @@ 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 https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History[many resources online] to help you understand how these tools work.
+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: https://book.git-scm.com/4_interactive_rebasing.html[https://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. Make sure the name is properly capitalized as submitted to the https://cla.pivotal.io[Pivotal Contributor License Agreement]:
+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:
 
-----
-First Last <user@mail.com>
-----
+Rather, please include your first and last name, properly capitalized, as submitted against the SpringSource contributor license agreement:
+<pre>
+Author: First Last &lt;link:mailto:&#x75;&#115;&#101;&#114;&#64;&#109;&#x61;&#x69;&#108;&#46;&#99;&#111;&#x6d;&#38;&#103;&#116;[&#x75;&#115;&#101;&#114;&#64;&#109;&#x61;&#x69;&#108;&#46;&#99;&#111;&#x6d;&#38;&#103;&#116;];
+</pre>
+This helps ensure traceability against the CLA, and also goes a long way to ensuring useful output from tools like git shortlog and others.
 
-This helps ensure traceability against the CLA, and also goes a long way to ensuring useful output from tools like Git shortlog and others.
+You can configure this globally via the account admin area GitHub (useful for fork-and-edit cases); globally with
 
-You can configure this globally:
-
-----
-git config --global user.name "First Last"
-git config --global user.email user@example.com
-----
-
-or locally for the current repository by omitting the `--global` flag:
-
-----
+or locally for the spring-security repository only by omitting the '–global' flag:
+<pre>
+cd spring-security
 git config user.name "First Last"
-git config user.email user@example.com
-----
+git config user.email link:mailto:&#x75;&#115;&#101;&#x72;&#64;&#x6d;&#x61;&#x69;&#x6c;&#46;&#x63;&#111;&#109;[&#x75;&#115;&#101;&#x72;&#64;&#x6d;&#x61;&#x69;&#x6c;&#46;&#x63;&#111;&#109;]
+</pre>
 
 = Format commit messages
 
 . Keep the subject line to 50 characters or less if possible
 . Do not end the subject line with a period
 . In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now
-. Include `Closes gh-<issue-number>` at the end if this fixes a GitHub issue
+. Include Closes gh-<issue-number> at the end if this fixes a GitHub issue
 . Avoid markdown, including back-ticks identifying code
 
-Example:
-
-----
-Short (50 chars or less) summary of changes
-
-More detailed explanatory text, if necessary.  Wrap it to about 72
-characters or so.  In some contexts, the first line is treated as the
-subject of an email and the rest of the text as the body. The blank
-line separating the summary from the body is critical (unless you omit
-the body entirely); tools like rebase can get confused if you run the
-two together.
-
-Further paragraphs come after blank lines.
-
- - Bullet points are okay, too
-
- - Typically a hyphen or asterisk is used for the bullet, preceded by a
-   single space, with blank lines in between, but conventions vary here
-
-Closes gh-123
-----
-
-
 = Run all tests prior to submission
 
-----
-./gradlew clean build integrationTest
-----
-
 = Submit your pull request
 
-*Subject line:*
+Subject line:
 
 Follow the same conventions for pull request subject lines as mentioned above for commit message subject lines.
 
-*In the body:*
+In the body:
 
 . Explain your use case. What led you to submit this change? Why were existing mechanisms in the framework insufficient? Make a case that this is a general-purpose problem and that yours is a general-purpose solution, etc
 . Add any additional information and ask questions; start a conversation, or continue one from GitHub Issues
@@ -222,4 +167,4 @@ Add a comment to the associated GitHub issue(s) linking to your new pull request
 
 The Spring team takes a very conservative approach to accepting contributions to the framework. This is to keep code quality and stability as high as possible, and to keep complexity at a minimum. Your changes, if accepted, may be heavily modified prior to merging. You will retain "Author:" attribution for your Git commits granted that the bulk of your changes remain intact. You may be asked to rework the submission for style (as explained above) and/or substance. Again, we strongly recommend discussing any serious submissions with the Spring Framework team prior to engaging in serious development work.
 
-Note that you can always force push (`git push -f`) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes.
+Note that you can always force push (git push -f) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes.

Jenkinsfile

@@ -0,0 +1,240 @@
+def projectProperties = [
+	[$class: 'BuildDiscarderProperty',
+		strategy: [$class: 'LogRotator', numToKeepStr: '5']],
+	pipelineTriggers([cron('@daily')])
+]
+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_CREDENTIALS = usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_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 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]) {
+						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 --stacktrace"
+						}
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: check'
+					throw e
+				} finally {
+					junit '**/build/test-results/*/*.xml'
+				}
+			}
+		}
+	},
+	sonar: {
+		stage('Sonar') {
+			node {
+				checkout scm
+				sh "git clean -dfx"
+				withCredentials([SONAR_LOGIN_CREDENTIALS,
+					GRADLE_ENTERPRISE_CACHE_USER,
+					GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
+					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 sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --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 --stacktrace"
+							}
+						}
+					} catch(Exception e) {
+						currentBuild.result = 'FAILED: sonar'
+						throw e
+					}
+				}
+			}
+		}
+	},
+	snapshots: {
+		stage('Snapshot Tests') {
+			node {
+				checkout scm
+				sh "git clean -dfx"
+				try {
+					withCredentials([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 test --refresh-dependencies -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Lovelace-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PkotlinVersion=1.4.0 -PlocksDisabled --stacktrace"
+						}
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: snapshots'
+					throw e
+				}
+			}
+		}
+	},
+	jdk11: {
+		stage('JDK 11') {
+			node {
+				checkout scm
+				sh "git clean -dfx"
+				try {
+
+					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
+						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
+						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 test --stacktrace"
+						}
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: jdk11'
+					throw e
+				}
+			}
+		}
+	},
+	jdk12: {
+		stage('JDK 12') {
+			node {
+				checkout scm
+				sh "git clean -dfx"
+				try {
+					withCredentials([GRADLE_ENTERPRISE_CACHE_USER,
+						 GRADLE_ENTERPRISE_SECRET_ACCESS_KEY]) {
+						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 test --stacktrace"
+						}
+					}
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: jdk12'
+					throw e
+				}
+			}
+		}
+	}
+
+	if(currentBuild.result == 'SUCCESS') {
+		parallel artifacts: {
+			stage('Deploy Artifacts') {
+				node {
+					checkout scm
+					sh "git clean -dfx"
+					withCredentials([SPRING_SIGNING_SECRING,
+						 SPRING_GPG_PASSPHRASE,
+						 OSSRH_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 deployArtifacts -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 --stacktrace --no-parallel"
+							sh "./gradlew 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 --stacktrace --no-parallel"
+						}
+					}
+				}
+			}
+		},
+		docs: {
+			stage('Deploy Docs') {
+				node {
+					checkout scm
+					sh "git clean -dfx"
+					withCredentials([JENKINS_PRIVATE_SSH_KEY,
+						 SPRING_GPG_PASSPHRASE,
+						 OSSRH_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 deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
+						}
+					}
+				}
+			}
+		},
+		schema: {
+			stage('Deploy Schema') {
+				node {
+					checkout scm
+					sh "git clean -dfx"
+					withCredentials([JENKINS_PRIVATE_SSH_KEY,
+						 SPRING_GPG_PASSPHRASE,
+						 OSSRH_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 deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --stacktrace"
+						}
+					}
+				}
+			}
+		}
+	}
+} catch(Exception e) {
+	currentBuild.result = 'FAILED: deploys'
+	throw e
+} finally {
+	def buildStatus = currentBuild.result
+	def buildNotSuccess =  !SUCCESS.equals(buildStatus)
+	def lastBuildNotSuccess = !SUCCESS.equals(currentBuild.previousBuild?.result)
+
+	if(buildNotSuccess || lastBuildNotSuccess) {
+
+		stage('Notifiy') {
+			node {
+				final def RECIPIENTS = [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']]
+
+				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"
+ 				)
+			}
+		}
+	}
+}

README.adoc

@@ -1,9 +1,5 @@
 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://github.com/spring-projects/spring-security/workflows/CI/badge.svg?branch=main["Build Status", link="https://github.com/spring-projects/spring-security/actions?query=workflow%3ACI"]
-
-image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=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
@@ -12,17 +8,17 @@ 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].
 
 == Code of Conduct
-Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct]
+Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]
 
 == Downloading Artifacts
-See https://docs.spring.io/spring-security/site/docs/current/reference/html5/#getting[Getting Spring Security] for how to obtain Spring Security.
+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].
 
 == Quick Start
-See https://docs.spring.io/spring-security/site/docs/5.5.x/reference/html5/#servlet-hello[Hello Spring Security] to get started with a "Hello, World" application.
+We recommend you visit https://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.
@@ -30,9 +26,9 @@ In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked fr
 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[JDK11 build].
+https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
 
-Be sure that your `JAVA_HOME` environment variable points to the `jdk-11` folder extracted from the JDK download.
+Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download.
 
 === Check out sources
 [indent=0]
@@ -43,7 +39,7 @@ git clone git@github.com:spring-projects/spring-security.git
 === Install all spring-\* jars into your local Maven cache
 [indent=0]
 ----
-./gradlew publishToMavenLocal
+./gradlew install
 ----
 
 === Compile and test; build all jars, distribution zips, and docs
@@ -60,7 +56,7 @@ Check out the https://stackoverflow.com/questions/tagged/spring-security[Spring
 https://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/main/CONTRIBUTING.adoc[contributor guidelines] for details.
+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.adoc[contributor guidelines] for details.
 
 == License
 Spring Security is Open Source software released under the

RELEASE.adoc

@@ -1,174 +0,0 @@
-= Update Dependencies
-
-Ensure you have no changes in your local repository.
-Change to a new branch.
-For example:
-
-[source,bash]
-----
-$ git checkout -b 5.5.0-RC1-dependencies
-----
-
-Review the rules in build.gradle to ensure the rules make sense.
-For example, we should not allow major version updates in a patch release.
-Also ensure that all of the exclusions still make sense.
-
-The following Gradle command will update your dependencies creating a commit for each dependency update.
-The first invocation of the command will take quite a while (~20 minutes depending on internet speed) to run because it is indexing all the versions of all the dependencies.
-
-[source,bash]
-----
-$ ./gradlew updateDependencies
-----
-
-Review the commits to ensure that the updated dependency versions make sense for this release. For example, we should not perform a major version update for a patch release.
-
-[source,bash]
-----
-$ git log
-----
-
-If any of the versions don’t make sense, update `build.gradle` to ensure that the version is excluded.
-
-Run all the checks:
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-If they don’t work, you can run a git bisect to discover what broke the build.
-Fix any commits that broke the build.
-
-Check out the original brach:
-
-[source,bash]
-----
-$ git checkout -
-----
-
-The following command will update the dependencies again but this time creating a ticket for each update and placing `Closes gh-<number>` in the commit. Replacing the following values:
-
-* <github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `public_repo`
-* <next-version> - Replace with the title of the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-[source,bash]
-----
-$ ./gradlew updateDependencies -PupdateMode=GITHUB_ISSUE -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version>
-----
-
-Apply any fixes from your previous branch that were necessary.
-
-= Check All Issues are Closed
-
-The following command will check if there are any open issues for the ticket.
-Before running the command, replace the following values:
-
-* <github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `public_repo`. This is optional since you are unlikely to reach the rate limit for such a simple check.
-* <next-version> - Replace with the title of the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-[source,bash]
-----
-$ ./gradlew gitHubCheckMilestoneHasNoOpenIssues -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version>
-----
-
-Alternatively, you can manually check using https://github.com/spring-projects/spring-security/milestones
-
-= Update Release Version
-
-Update the version number in `gradle.properties` for the release, for example `5.5.0-M1`, `5.5.0-RC1`, `5.5.0`
-
-= Build Locally
-
-Run the build using
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-= Push the Release Commit
-
-Push the commit and GitHub actions will build and deploy the artifacts
-If you are pushing to Maven Central, then you can get notified when it’s uploaded by running the following:
-
-[source,bash]
-----
-$ ./scripts/release/wait-for-done.sh 5.5.0
-----
-
-= Announce the release on Slack
-
-* Announce via Slack on
-https://pivotal.slack.com/messages/spring-release[#spring-release],
-including the keyword `+spring-security-announcing+` in the message.
-Something like:
-
-....
-spring-security-announcing 5.5.0 is available.
-....
-
-= Tag the release
-
-* Tag the release and then push the tag
-
-....
-git tag 5.4.0-RC1
-git push origin 5.4.0-RC1
-....
-
-== 7. Update to Next Development Version
-
-* Update `gradle.properties` version to next `+SNAPSHOT+` version and then push
-
-== 8. Update version on project page
-
-The following command will update https://spring.io/projects/spring-security#learn with the new release version using the following parameters
-
-<github-personal-access-token> - Replace with a https://github.com/settings/tokens[GitHub personal access token] that has a scope of `public_repo`
-<next-version> - Replace with the milestone you are releasing now (i.e. 5.5.0-RC1)
-<previous-version> - Replace with the previous release which will be removed from the listed versions (i.e. 5.5.0-M3)
-
-[source,bash]
-----
-$ ./gradlew saganCreateRelease saganDeleteRelease -PgitHubAccessToken=<github-personal-access-token> -PnextVersion=<next-version> -PpreviousVersion=<previous-version>
-----
-
-
-
-== 9. Update Release Notes on GitHub
-
-Generate the Release Notes replacing:
-
-* <next-version> - Replace with the milestone you are releasing now (i.e. 5.5.0-RC1)
-
-----
-$ ./gradlew generateChangelog -PnextVersion=<next-version>
-----
-
-* Copy the release notes to your clipboard (your mileage may vary with
-the following command)
-
-....
-cat build/changelog/release-notes.md | xclip -selection clipboard
-....
-
-* Create the
-https://github.com/spring-projects/spring-security/releases[release on
-GitHub], associate it with the tag, and paste the generated notes
-
-== 10. Close / Create Milestone
-
-* In
-https://github.com/spring-projects/spring-security/milestones[GitHub
-Milestones], create a new milestone for the next release version
-* Move any open issues from the existing milestone you just released to
-the new milestone
-* Close the milestone for the release.
-
-== 11. Announce the release on other channels
-
-* Create a https://spring.io/admin/blog[Blog]
-* Tweet from [@SpringSecurity](https://twitter.com/springsecurity)
-
-

acl/gradle/dependency-locks/annotationProcessor.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/archives.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/checkstyle.lockfile

@@ -0,0 +1,26 @@
+# 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.3
+ch.qos.logback:logback-core:1.2.3
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:29.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.32
+commons-beanutils:commons-beanutils:1.9.4
+commons-collections:commons-collections:3.2.2
+info.picocli:picocli:4.2.0
+io.projectreactor:reactor-bom:Dysprosium-SR12
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.25
+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-7
+org.antlr:antlr4-runtime:4.8-1
+org.checkerframework:checker-qual:2.11.1
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/compile.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/compileClasspath.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/compileOnly.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/default.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/jacocoAgent.lockfile

@@ -0,0 +1,8 @@
+# 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-SR12
+org.jacoco:org.jacoco.agent:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/jacocoAnt.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+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.4.10
+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:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/merging.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/optional.lockfile

@@ -0,0 +1,9 @@
+# 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-SR12
+net.sf.ehcache:ehcache:2.10.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.slf4j:slf4j-api:1.7.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/provided.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/runtime.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/runtimeMerge.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/signatures.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/testCompile.lockfile

@@ -0,0 +1,24 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context-support:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -0,0 +1,24 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context-support:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/testCompileOnly.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

acl/gradle/dependency-locks/testRuntime.lockfile

@@ -0,0 +1,25 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.hsqldb:hsqldb:2.5.1
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context-support:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -0,0 +1,25 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.hsqldb:hsqldb:2.5.1
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context-support:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/gradle/dependency-locks/tests.lockfile

@@ -0,0 +1,25 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.hsqldb:hsqldb:2.5.1
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context-support:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-jdbc:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE
+org.springframework:spring-tx:5.2.9.RELEASE

acl/spring-security-acl.gradle

@@ -1,19 +1,18 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
-	management platform(project(":spring-security-dependencies"))
-	api project(':spring-security-core')
-	api 'org.springframework:spring-aop'
-	api 'org.springframework:spring-context'
-	api 'org.springframework:spring-core'
-	api 'org.springframework:spring-jdbc'
-	api 'org.springframework:spring-tx'
+	compile project(':spring-security-core')
+	compile 'org.springframework:spring-aop'
+	compile 'org.springframework:spring-context'
+	compile 'org.springframework:spring-core'
+	compile 'org.springframework:spring-jdbc'
+	compile 'org.springframework:spring-tx'
 
 	optional 'net.sf.ehcache:ehcache'
 
-	testImplementation 'org.springframework:spring-beans'
-	testImplementation 'org.springframework:spring-context-support'
-	testImplementation 'org.springframework:spring-test'
+	testCompile 'org.springframework:spring-beans'
+	testCompile 'org.springframework:spring-context-support'
+	testCompile 'org.springframework:spring-test'
 
-	testRuntimeOnly 'org.hsqldb:hsqldb'
+	testRuntime 'org.hsqldb:hsqldb'
 }

acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java

@@ -93,17 +93,11 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
 				&& ((changeType == CHANGE_GENERAL) || (changeType == CHANGE_OWNERSHIP))) {
 			return;
 		}
-
-		// Iterate this principal's authorities to determine right
-		Set<String> authorities = AuthorityUtils.authorityListToSet(authentication.getAuthorities());
-		if (acl.getOwner() instanceof GrantedAuthoritySid
-				&& authorities.contains(((GrantedAuthoritySid) acl.getOwner()).getGrantedAuthority())) {
-			return;
-		}
-
 		// Not authorized by ACL ownership; try via adminstrative permissions
 		GrantedAuthority requiredAuthority = getRequiredAuthority(changeType);
 
+		// Iterate this principal's authorities to determine right
+		Set<String> authorities = AuthorityUtils.authorityListToSet(authentication.getAuthorities());
 		if (authorities.contains(requiredAuthority.getAuthority())) {
 			return;
 		}

acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java

@@ -31,8 +31,6 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import static org.mockito.BDDMockito.given;
-
 /**
  * @author Rob Winch
  *
@@ -68,14 +66,6 @@ public class AclAuthorizationStrategyImplTests {
 		this.strategy.securityCheck(this.acl, AclAuthorizationStrategy.CHANGE_GENERAL);
 	}
 
-	// gh-9425
-	@Test
-	public void securityCheckWhenAclOwnedByGrantedAuthority() {
-		given(this.acl.getOwner()).willReturn(new GrantedAuthoritySid("ROLE_AUTH"));
-		this.strategy = new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_SYSTEM_ADMIN"));
-		this.strategy.securityCheck(this.acl, AclAuthorizationStrategy.CHANGE_GENERAL);
-	}
-
 	@SuppressWarnings("serial")
 	class CustomAuthority implements GrantedAuthority {
 

aspects/gradle/dependency-locks/annotationProcessor.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/archives.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/aspect.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/aspectj.lockfile

@@ -0,0 +1,8 @@
+# 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-SR12
+org.aspectj:aspectjtools:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/checkstyle.lockfile

@@ -0,0 +1,26 @@
+# 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.3
+ch.qos.logback:logback-core:1.2.3
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:29.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.32
+commons-beanutils:commons-beanutils:1.9.4
+commons-collections:commons-collections:3.2.2
+info.picocli:picocli:4.2.0
+io.projectreactor:reactor-bom:Dysprosium-SR12
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.25
+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-7
+org.antlr:antlr4-runtime:4.8-1
+org.checkerframework:checker-qual:2.11.1
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/compile.lockfile

@@ -0,0 +1,14 @@
+# 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-SR12
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE

aspects/gradle/dependency-locks/compileClasspath.lockfile

@@ -0,0 +1,14 @@
+# 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-SR12
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE

aspects/gradle/dependency-locks/compileOnly.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/default.lockfile

@@ -0,0 +1,14 @@
+# 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-SR12
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE

aspects/gradle/dependency-locks/inpath.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/jacocoAgent.lockfile

@@ -0,0 +1,8 @@
+# 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-SR12
+org.jacoco:org.jacoco.agent:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/jacocoAnt.lockfile

@@ -0,0 +1,15 @@
+# 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-SR12
+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.4.10
+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:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/merging.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/optional.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/provided.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/runtime.lockfile

@@ -0,0 +1,14 @@
+# 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-SR12
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE

aspects/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -0,0 +1,14 @@
+# 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-SR12
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE

aspects/gradle/dependency-locks/runtimeMerge.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/signatures.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/testAspect.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/testCompile.lockfile

@@ -0,0 +1,22 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.aspectj:aspectjrt:1.9.6
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE

aspects/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -0,0 +1,22 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.aspectj:aspectjrt:1.9.6
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE

aspects/gradle/dependency-locks/testCompileOnly.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/testInpath.lockfile

@@ -0,0 +1,7 @@
+# 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-SR12
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-framework-bom:5.2.9.RELEASE

aspects/gradle/dependency-locks/testRuntime.lockfile

@@ -0,0 +1,22 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.aspectj:aspectjrt:1.9.6
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE

aspects/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -0,0 +1,22 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.aspectj:aspectjrt:1.9.6
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE

aspects/gradle/dependency-locks/tests.lockfile

@@ -0,0 +1,22 @@
+# 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-SR12
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.10.15
+net.bytebuddy:byte-buddy:1.10.15
+org.aspectj:aspectjrt:1.9.6
+org.assertj:assertj-core:3.17.2
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-bom:1.4.10
+org.mockito:mockito-core:3.5.13
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR4
+org.springframework:spring-aop:5.2.9.RELEASE
+org.springframework:spring-beans:5.2.9.RELEASE
+org.springframework:spring-context:5.2.9.RELEASE
+org.springframework:spring-core:5.2.9.RELEASE
+org.springframework:spring-expression:5.2.9.RELEASE
+org.springframework:spring-framework-bom:5.2.9.RELEASE
+org.springframework:spring-jcl:5.2.9.RELEASE
+org.springframework:spring-test:5.2.9.RELEASE

aspects/spring-security-aspects.gradle

@@ -2,14 +2,13 @@ apply plugin: 'io.spring.convention.spring-module'
 apply plugin: 'io.freefair.aspectj'
 
 dependencies {
-	management platform(project(":spring-security-dependencies"))
-	api "org.aspectj:aspectjrt"
-	api project(':spring-security-core')
-	api 'org.springframework:spring-beans'
-	api 'org.springframework:spring-context'
-	api 'org.springframework:spring-core'
+	compile "org.aspectj:aspectjrt"
+	compile project(':spring-security-core')
+	compile 'org.springframework:spring-beans'
+	compile 'org.springframework:spring-context'
+	compile 'org.springframework:spring-core'
 
-	testImplementation 'org.springframework:spring-aop'
+	testCompile 'org.springframework:spring-aop'
 	testAspect sourceSets.main.output
 }
 

bom/spring-security-bom.gradle

@@ -1,13 +1,11 @@
-import io.spring.gradle.convention.SpringModulePlugin
-
 apply plugin: 'io.spring.convention.bom'
 
-dependencies {
-	constraints {
-		project.rootProject.allprojects { p ->
-			p.plugins.withType(SpringModulePlugin) {
-				api p
-			}
+sonarqube.skipProject = true
+
+project.rootProject.allprojects.each { p ->
+	p.plugins.withType(io.spring.gradle.convention.SpringMavenPlugin) {
+		if (!project.name.equals(p.name)) {
+			project.mavenBom.projects.add(p)
 		}
 	}
 }

build.gradle

@@ -1,10 +1,11 @@
 buildscript {
 	dependencies {
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.33.RELEASE'
 		classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
-		classpath 'io.spring.nohttp:nohttp-gradle:0.0.8'
-		classpath "io.freefair.gradle:aspectj-plugin:5.3.3.3"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+		classpath 'io.spring.nohttp:nohttp-gradle:0.0.5.RELEASE'
+		classpath "io.freefair.gradle:aspectj-plugin:5.0.1"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-		classpath "com.netflix.nebula:nebula-project-plugin:8.0.0"
 	}
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-snapshot' }
@@ -16,10 +17,6 @@ apply plugin: 'io.spring.nohttp'
 apply plugin: 'locks'
 apply plugin: 'io.spring.convention.root'
 apply plugin: 'org.jetbrains.kotlin.jvm'
-apply plugin: 'org.springframework.security.update-dependencies'
-apply plugin: 'org.springframework.security.sagan'
-apply plugin: 'org.springframework.github.milestone'
-apply plugin: 'org.springframework.github.changelog'
 
 group = 'org.springframework.security'
 description = 'Spring Security'
@@ -28,78 +25,12 @@ ext.snapshotBuild = version.contains("SNAPSHOT")
 ext.releaseBuild = version.contains("SNAPSHOT")
 ext.milestoneBuild = !(snapshotBuild || releaseBuild)
 
+dependencyManagementExport.projects = subprojects.findAll { !it.name.contains('-boot') }
+
 repositories {
 	mavenCentral()
 }
 
-tasks.named("saganCreateRelease") {
-	referenceDocUrl = "https://docs.spring.io/spring-security/site/docs/{version}/reference/html5/"
-	apiDocUrl = "https://docs.spring.io/spring-security/site/docs/{version}/api/"
-}
-
-tasks.named("gitHubCheckMilestoneHasNoOpenIssues") {
-	repository {
-		owner = "spring-projects"
-		name = "spring-security"
-	}
-}
-
-tasks.named("updateDependencies") {
-	// we aren't Gradle 7 compatible yet
-	checkForGradleUpdate = false
-}
-
-updateDependenciesSettings {
-	gitHub {
-		organization = "spring-projects"
-		repository = "spring-security"
-	}
-	addFiles({
-		return [
-				project.file("buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java"),
-				project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")
-		]
-	})
-	dependencyExcludes {
-		majorVersionBump()
-		minorVersionBump()
-		alphaBetaVersions()
-		releaseCandidatesVersions()
-		milestoneVersions()
-		snapshotVersions()
-		addRule { components ->
-			components.withModule("org.python:jython") { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
-					selection.reject("jython updates break integration tests");
-				}
-			}
-			components.withModule("com.nimbusds:nimbus-jose-jwt") { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
-					selection.reject("nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency");
-				}
-			}
-			components.all { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				// Do not compare version due to multiple versions existing
-				// will cause opensaml 3.x to be updated to 4.x
-				if (candidate.getGroup().equals("org.opensaml")) {
-					selection.reject("org.opensaml maintains two different versions, so it must be updated manually");
-				}
-				if (candidate.getGroup().equals("org.jetbrains.kotlin")) {
-					if (candidate.getVersion().endsWith("-RC")) {
-						selection.reject("On a maintenance branch, we should not take RC versions")
-					}
-					if (candidate.getVersion().contains("-M")) {
-						selection.reject("On a maintenance branch, we should not take milestone versions")
-					}
-				}
-			}
-		}
-	}
-}
-
 subprojects {
 	plugins.withType(JavaPlugin) {
 		project.sourceCompatibility='1.8'
@@ -109,7 +40,6 @@ subprojects {
 	}
 }
 
-
 allprojects {
 	if (!['spring-security-bom', 'spring-security-docs'].contains(project.name)) {
 		apply plugin: 'io.spring.javaformat'
@@ -145,6 +75,4 @@ if (hasProperty('buildScan')) {
 
 nohttp {
 	allowlistFile = project.file("etc/nohttp/allowlist.lines")
-	source.exclude "buildSrc/build/**"
-
 }

buildSrc/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>

buildSrc/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" />
-        <option name="gradleJvm" value="11.0.9.hs-adpt" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

buildSrc/.idea/jarRepositories.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Gradle Central Plugin Repository" />
-      <option name="name" value="Gradle Central Plugin Repository" />
-      <option name="url" value="https://plugins.gradle.org/m2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://repo.spring.io/plugins-release/" />
-    </remote-repository>
-  </component>
-</project>

buildSrc/.idea/misc.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK" />
-</project>

buildSrc/.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

buildSrc/.idea/workspace.xml

@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="1650039e-90b3-4603-bb34-47f415f4e67a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/gradlew" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradlew.bat" beforeDir="false" afterPath="$PROJECT_DIR$/gradlew.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <task path="$PROJECT_DIR$">
-          <activation />
-        </task>
-        <projects_view>
-          <tree_state>
-            <expand>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="buildSrc" type="f1a62948:ProjectNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="buildSrc" type="f1a62948:ProjectNode" />
-                <item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
-              </path>
-            </expand>
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="ProjectId" id="1qXvSePBfcQC8Y4nOwtetSNoy4Q" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-  </component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name="org.springframework.security.convention" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Gradle.DocsPluginITest.build triggers docs">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="DocsPluginITest.build triggers docs" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="--tests &quot;io.spring.gradle.convention.DocsPluginITest.build triggers docs&quot;" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value=":test" />
-          </list>
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
-      <method v="2" />
-    </configuration>
-    <configuration name="GitHubApiTests.findCreateIssueInput" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="--tests &quot;org.springframework.security.convention.versions.GitHubApiTests.findCreateIssueInput&quot;" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value=":test" />
-          </list>
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
-      <method v="2" />
-    </configuration>
-    <configuration name="GitHubApiTests.findRepositoryId" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="--tests &quot;org.springframework.security.convention.versions.GitHubApiTests.findRepositoryId&quot;" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value=":test" />
-          </list>
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Gradle.DocsPluginITest.build triggers docs" />
-        <item itemvalue="Gradle.GitHubApiTests.findCreateIssueInput" />
-        <item itemvalue="Gradle.GitHubApiTests.findRepositoryId" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="1650039e-90b3-4603-bb34-47f415f4e67a" name="Default Changelist" comment="" />
-      <created>1617238749852</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1617238749852</updated>
-      <workItem from="1617238751049" duration="982000" />
-      <workItem from="1617239768987" duration="22510000" />
-      <workItem from="1617314253813" duration="9753000" />
-      <workItem from="1617372923830" duration="9278000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-</project>

buildSrc/build.gradle

@@ -1,29 +1,7 @@
-plugins {
-	id "java-gradle-plugin"
-	id "java"
-	id "groovy"
-	id 'com.apollographql.apollo' version '2.4.5'
-}
-
-
-sourceCompatibility = 1.8
+apply plugin: "java-gradle-plugin"
 
 repositories {
-	jcenter()
-	gradlePluginPortal()
 	mavenCentral()
-	maven { url 'https://repo.spring.io/plugins-release/' }
-}
-
-sourceSets {
-	main {
-		java {
-			srcDirs = []
-		}
-		groovy {
-			srcDirs += ["src/main/java"]
-		}
-	}
 }
 
 gradlePlugin {
@@ -36,64 +14,15 @@ gradlePlugin {
 			id = "locks"
 			implementationClass = "lock.GlobalLockPlugin"
 		}
-		managementConfiguration {
-			id = "io.spring.convention.management-configuration"
-			implementationClass = "io.spring.gradle.convention.ManagementConfigurationPlugin"
-		}
-		updateDependencies {
-			id = "org.springframework.security.update-dependencies"
-			implementationClass = "org.springframework.security.convention.versions.UpdateDependenciesPlugin"
-		}
-		sagan {
-			id = "org.springframework.security.sagan"
-			implementationClass = "org.springframework.gradle.sagan.SaganPlugin"
-		}
-		githubMilestone {
-			id = "org.springframework.github.milestone"
-			implementationClass = "org.springframework.gradle.github.milestones.GitHubMilestonePlugin"
-		}
-		githubChangelog {
-			id = "org.springframework.github.changelog"
-			implementationClass = "org.springframework.gradle.github.changelog.GitHubChangelogPlugin"
-		}
-	}
-}
-
-configurations {
-	implementation {
-		exclude module: 'groovy-all'
 	}
 }
 
 dependencies {
-	implementation 'com.google.code.gson:gson:2.8.6'
-	implementation 'com.thaiopensource:trang:20091111'
-	implementation 'net.sourceforge.saxon:saxon:9.1.0.8'
-	implementation localGroovy()
-
-	implementation 'io.github.gradle-nexus:publish-plugin:1.1.0'
-	implementation 'io.projectreactor:reactor-core:3.4.9'
-	implementation 'gradle.plugin.org.gretty:gretty:3.0.1'
-	implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
-	implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
-	implementation 'io.spring.gradle:docbook-reference-plugin:0.3.1'
-	implementation 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
-	implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'
-	implementation 'io.spring.nohttp:nohttp-gradle:0.0.8'
-	implementation 'org.aim42:htmlSanityCheck:1.1.6'
-	implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.1.0'
-	implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.1.0'
-	implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
-	implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.10'
-	implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
-
-	testImplementation 'junit:junit:4.12'
-	testImplementation 'org.apache.commons:commons-io:1.3.2'
-	testImplementation 'org.assertj:assertj-core:3.13.2'
-	testImplementation 'org.mockito:mockito-core:3.0.0'
-	testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
-	testImplementation "com.squareup.okhttp3:mockwebserver:3.14.9"
+	compile 'com.thaiopensource:trang:20091111'
+	compile 'net.sourceforge.saxon:saxon:9.1.0.8'
 }
 
-
-test.onlyIf { !project.hasProperty("buildSrc.skipTests") }
+task ide(type: Copy)  {
+	from configurations.runtime
+	into 'ide'
+}

buildSrc/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

buildSrc/src/main/graphql/org/springframework/security/convention/versions/CreateIssue.graphql

@@ -1,7 +0,0 @@
-mutation CreateIssueInput($assigneeId: ID!, $labelIds: [ID!], $milestoneId: ID!, $repositoryId: ID!, $title: String!) {
-    createIssue(input: {assigneeIds: [$assigneeId], labelIds: $labelIds, milestoneId: $milestoneId, projectIds: [], repositoryId: $repositoryId, title: $title}) {
-        issue {
-            number
-        }
-    }
-}

buildSrc/src/main/graphql/org/springframework/security/convention/versions/FindCreateIssueInput.graphql

@@ -1,20 +0,0 @@
-query FindCreateIssueInput($owner: String!, $name: String!, $labelQuery: String, $milestoneName: String) {
-  repository(owner: $owner, name: $name) {
-      id
-      labels(query: $labelQuery, first: 1) {
-          nodes {
-              id
-              name
-          }
-      }
-      milestones(query: $milestoneName, states: [OPEN], first: 1) {
-          nodes {
-              id
-              title
-          }
-      }
-  }
-  viewer {
-      id
-  }
-}

buildSrc/src/main/graphql/org/springframework/security/convention/versions/RateLimit.graphql

@@ -1,8 +0,0 @@
-query RateLimit {
-    rateLimit {
-        limit
-        cost
-        remaining
-        resetAt
-    }
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy

@@ -1,76 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention;
-
-import io.spring.gradle.propdeps.PropDepsMavenPlugin;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.GroovyPlugin;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.MavenPlugin;
-import org.gradle.api.plugins.PluginManager;
-import org.gradle.internal.impldep.org.apache.maven.Maven;
-import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin;
-import org.gradle.plugins.ide.idea.IdeaPlugin;
-import io.spring.gradle.propdeps.PropDepsEclipsePlugin;
-import io.spring.gradle.propdeps.PropDepsIdeaPlugin;
-import io.spring.gradle.propdeps.PropDepsPlugin
-import org.springframework.gradle.CopyPropertiesPlugin;
-
-/**
- * @author Rob Winch
- */
-public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
-
-	@Override
-	public final void apply(Project project) {
-		PluginManager pluginManager = project.getPluginManager();
-		pluginManager.apply(JavaPlugin.class);
-		pluginManager.apply(ManagementConfigurationPlugin.class);
-		if (project.file("src/main/groovy").exists()
-				|| project.file("src/test/groovy").exists()
-				|| project.file("src/integration-test/groovy").exists()) {
-			pluginManager.apply(GroovyPlugin.class);
-		}
-		pluginManager.apply("io.spring.convention.repository");
-		pluginManager.apply(EclipseWtpPlugin);
-		pluginManager.apply(IdeaPlugin);
-		pluginManager.apply(PropDepsPlugin);
-		pluginManager.apply(PropDepsEclipsePlugin);
-		pluginManager.apply(PropDepsIdeaPlugin);
-		project.getPlugins().withType(MavenPlugin) {
-			pluginManager.apply(PropDepsMavenPlugin);
-		}
-		pluginManager.apply("io.spring.convention.tests-configuration");
-		pluginManager.apply("io.spring.convention.integration-test");
-		pluginManager.apply("io.spring.convention.dependency-set");
-		pluginManager.apply("io.spring.convention.javadoc-options");
-		pluginManager.apply("io.spring.convention.checkstyle");
-		pluginManager.apply(CopyPropertiesPlugin);
-
-		project.jar {
-			manifest.attributes["Created-By"] =
-					"${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})"
-			manifest.attributes["Implementation-Title"] = project.name
-			manifest.attributes["Implementation-Version"] = project.version
-			manifest.attributes["Automatic-Module-Name"] = project.name.replace('-', '.')
-		}
-		additionalPlugins(project);
-	}
-
-	protected abstract void additionalPlugins(Project project);
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy

@@ -1,45 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class ArtifactoryPlugin implements Plugin<Project> {
-
-	@Override
-	void apply(Project project) {
-		project.plugins.apply('com.jfrog.artifactory')
-		String name = Utils.getProjectName(project);
-		boolean isSnapshot = Utils.isSnapshot(project);
-		boolean isMilestone = Utils.isMilestone(project);
-		project.artifactory {
-			contextUrl = 'https://repo.spring.io'
-			publish {
-				repository {
-					repoKey = isSnapshot ? 'libs-snapshot-local' : isMilestone ? 'libs-milestone-local' : 'libs-release-local'
-					if(project.hasProperty('artifactoryUsername')) {
-						username = artifactoryUsername
-						password = artifactoryPassword
-					}
-				}
-				defaults {
-					publications('mavenJava')
-				}
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy

@@ -1,49 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
-
-/**
- * Adds and configures Checkstyle plugin.
- *
- * @author Vedran Pavic
- */
-class CheckstylePlugin implements Plugin<Project> {
-
-	final CHECKSTYLE_DIR = 'etc/checkstyle'
-
-	@Override
-	void apply(Project project) {
-		project.plugins.withType(JavaPlugin) {
-			def checkstyleDir = project.rootProject.file(CHECKSTYLE_DIR)
-			if (checkstyleDir.exists() && checkstyleDir.directory) {
-				project.getPluginManager().apply('checkstyle')
-				project.dependencies.add('checkstyle', 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.15')
-				project.dependencies.add('checkstyle', 'io.spring.nohttp:nohttp-checkstyle:0.0.8')
-
-				project.checkstyle {
-					configDirectory = checkstyleDir
-					toolVersion = '8.21'
-				}
-			}
-		}
-	}
-
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy

@@ -1,126 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package io.spring.gradle.convention;
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
-
-/**
- * Adds sets of dependencies to make it easy to add a grouping of dependencies. The
- * dependencies added are:
- *
- * <ul>
- * <li>sockDependencies</li>
- * <li>seleniumDependencies</li>
- * <li>gebDependencies</li>
- * <li>powerMockDependencies</li>
- * <li>slf4jDependencies</li>
- * <li>jstlDependencies</li>
- * <li>apachedsDependencies</li>
- * </ul>
- *
- * @author Rob Winch
- */
-public class DependencySetPlugin implements Plugin<Project> {
-	@Override
-	public void apply(Project project) {
-
-		project.ext.spockDependencies = [
-			project.dependencies.create("org.spockframework:spock-spring") {
-				exclude group: 'junit', module: 'junit-dep'
-			},
-			project.dependencies.create("org.spockframework:spock-core") {
-				exclude group: 'junit', module: 'junit-dep'
-			}
-		]
-
-		project.ext.seleniumDependencies = [
-				"org.seleniumhq.selenium:htmlunit-driver",
-				"org.seleniumhq.selenium:selenium-support"
-		]
-
-		project.ext.gebDependencies = project.spockDependencies +
-			project.seleniumDependencies + [
-			"org.gebish:geb-spock",
-			'commons-httpclient:commons-httpclient',
-			"org.codehaus.groovy:groovy",
-			"org.codehaus.groovy:groovy-all"
-		]
-
-		project.ext.powerMockDependencies = [
-				"org.powermock:powermock-core",
-				"org.powermock:powermock-api-support",
-				"org.powermock:powermock-module-junit4-common",
-				"org.powermock:powermock-module-junit4",
-				project.dependencies.create("org.powermock:powermock-api-mockito") {
-					exclude group: 'org.mockito', module: 'mockito-all'
-				},
-				"org.powermock:powermock-reflect"
-		]
-
-		project.ext.powerMock2Dependencies = [
-				"org.powermock:powermock-core",
-				"org.powermock:powermock-api-support",
-				"org.powermock:powermock-module-junit4-common",
-				"org.powermock:powermock-module-junit4",
-				project.dependencies.create("org.powermock:powermock-api-mockito2") {
-					exclude group: 'org.mockito', module: 'mockito-all'
-				},
-				"org.powermock:powermock-reflect"
-		]
-
-		project.ext.slf4jDependencies = [
-			"org.slf4j:slf4j-api",
-			"org.slf4j:jcl-over-slf4j",
-			"org.slf4j:log4j-over-slf4j",
-			"ch.qos.logback:logback-classic"
-		]
-
-		project.ext.springCoreDependency = [
-			project.dependencies.create("org.springframework:spring-core") {
-				exclude(group: 'commons-logging', module: 'commons-logging')
-			}
-		]
-
-		project.ext.testDependencies = [
-			"junit:junit",
-			"org.mockito:mockito-core",
-			"org.springframework:spring-test",
-			"org.assertj:assertj-core"
-		]
-
-		project.ext.jstlDependencies = [
-				"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api",
-				"org.apache.taglibs:taglibs-standard-jstlel"
-		]
-
-		project.ext.apachedsDependencies = [
-				"org.apache.directory.server:apacheds-core",
-				"org.apache.directory.server:apacheds-core-entry",
-				"org.apache.directory.server:apacheds-protocol-shared",
-				"org.apache.directory.server:apacheds-protocol-ldap",
-				"org.apache.directory.server:apacheds-server-jndi",
-				'org.apache.directory.shared:shared-ldap'
-		]
-
-		project.plugins.withType(JavaPlugin) {
-			project.dependencies {
-				testImplementation project.testDependencies
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy

@@ -1,82 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package io.spring.gradle.convention
-
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-public class DeployDocsPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getPluginManager().apply('org.hidetake.ssh')
-
-		project.ssh.settings {
-			knownHosts = allowAnyHosts
-		}
-		project.remotes {
-			docs {
-				role 'docs'
-				if (project.hasProperty('deployDocsHost')) {
-					host = project.findProperty('deployDocsHost')
-				} else {
-					host = 'docs.af.pivotal.io'
-				}
-				retryCount = 5 // retry 5 times (default is 0)
-				retryWaitSec = 10 // wait 10 seconds between retries (default is 0)
-				user = project.findProperty('deployDocsSshUsername')
-				if (project.hasProperty('deployDocsSshKeyPath')) {
-					identity = project.file(project.findProperty('deployDocsSshKeyPath'))
-				} else if (project.hasProperty('deployDocsSshKey')) {
-					identity = project.findProperty('deployDocsSshKey')
-				}
-				if(project.hasProperty('deployDocsSshPassphrase')) {
-					passphrase = project.findProperty('deployDocsSshPassphrase')
-				}
-			}
-		}
-
-		project.task('deployDocs') {
-			dependsOn 'docsZip'
-			doFirst {
-				project.ssh.run {
-					session(project.remotes.docs) {
-						def now = System.currentTimeMillis()
-						def name = project.rootProject.name
-						def version = project.rootProject.version
-						def tempPath = "/tmp/${name}-${now}-docs/".replaceAll(' ', '_')
-						execute "mkdir -p $tempPath"
-
-						project.tasks.docsZip.outputs.each { o ->
-							put from: o.files, into: tempPath
-						}
-
-						execute "unzip $tempPath*.zip -d $tempPath"
-
-						def extractPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/docs/${name}/${version}/"
-
-						execute "rm -rf $extractPath"
-						execute "mkdir -p $extractPath"
-						execute "mv $tempPath/docs/* $extractPath"
-						execute "chmod -R g+w $extractPath"
-					}
-				}
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/DocsPlugin.groovy

@@ -1,84 +0,0 @@
-package io.spring.gradle.convention
-
-import org.aim42.htmlsanitycheck.HtmlSanityCheckPlugin
-import org.aim42.htmlsanitycheck.HtmlSanityCheckTask
-import org.aim42.htmlsanitycheck.check.BrokenHttpLinksChecker
-import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.plugins.PluginManager
-import org.gradle.api.tasks.bundling.Zip
-
-/**
- * Aggregates asciidoc, javadoc, and deploying of the docs into a single plugin
- */
-public class DocsPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-
-		PluginManager pluginManager = project.getPluginManager();
-		pluginManager.apply("org.asciidoctor.jvm.convert");
-		pluginManager.apply("org.asciidoctor.jvm.pdf");
-		pluginManager.apply(AsciidoctorConventionPlugin);
-		pluginManager.apply(DeployDocsPlugin);
-		pluginManager.apply(JavadocApiPlugin);
-		pluginManager.apply(HtmlSanityCheckPlugin)
-
-		String projectName = Utils.getProjectName(project);
-		String pdfFilename = projectName + "-reference.pdf";
-
-		project.tasks.withType(AbstractAsciidoctorTask) { t ->
-			project.configure(t) {
-				sources {
-					include "**/*.adoc"
-					exclude '_*/**'
-				}
-			}
-		}
-
-		project.tasks.withType(HtmlSanityCheckTask) { HtmlSanityCheckTask t ->
-			project.configure(t) {
-				t.dependsOn 'asciidoctor'
-				t.checkerClasses = [BrokenHttpLinksChecker]
-				t.checkingResultsDir = new File(project.getBuildDir(), "/report/htmlchecks")
-				t.failOnErrors = false
-				t.httpConnectionTimeout = 3000
-				t.sourceDir = new File(project.getBuildDir(), "/docs/asciidoc/")
-				t.sourceDocuments = project.files(new File(project.getBuildDir(), "/docs/asciidoc/index.html"))
-			}
-		}
-
-		Task docsZip = project.tasks.create('docsZip', Zip) {
-			dependsOn 'api', 'asciidoctor'
-			group = 'Distribution'
-			archiveBaseName = project.rootProject.name
-			archiveClassifier = 'docs'
-			description = "Builds -${classifier} archive containing all " +
-				"Docs for deployment at docs.spring.io"
-
-			from(project.tasks.asciidoctor.outputs) {
-				into 'reference/html5'
-				include '**'
-			}
-			from(project.tasks.asciidoctorPdf.outputs) {
-				into 'reference/pdf'
-				include '**'
-				rename "index.pdf", pdfFilename
-			}
-			from(project.tasks.api.outputs) {
-				into 'api'
-			}
-			into 'docs'
-			duplicatesStrategy 'exclude'
-		}
-
-		Task docs = project.tasks.create("docs") {
-			group = 'Documentation'
-			description 'An aggregator task to generate all the documentation'
-			dependsOn docsZip
-		}
-		project.tasks.assemble.dependsOn docs
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/IntegrationTestPlugin.groovy

@@ -1,121 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package io.spring.gradle.convention
-
-import io.spring.gradle.propdeps.PropDepsPlugin
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.plugins.GroovyPlugin
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.testing.Test
-import org.gradle.plugins.ide.eclipse.EclipsePlugin
-import org.gradle.plugins.ide.idea.IdeaPlugin
-
-/**
- *
- * Adds support for integration tests to java projects.
- *
- * <ul>
- * <li>Adds integrationTestCompile and integrationTestRuntime configurations</li>
- * <li>A new source test folder of src/integration-test/java has been added</li>
- * <li>A task to run integration tests named integrationTest is added</li>
- * <li>If Groovy plugin is added a new source test folder src/integration-test/groovy is added</li>
- * </ul>
- *
- * @author Rob Winch
- */
-public class IntegrationTestPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.plugins.withType(JavaPlugin.class) {
-			applyJava(project)
-		}
-	}
-
-	private applyJava(Project project) {
-		if(!project.file('src/integration-test/').exists()) {
-			// ensure we don't add if no tests to avoid adding Gretty
-			return
-		}
-		project.configurations {
-			integrationTestCompile {
-				extendsFrom testCompile, testImplementation
-			}
-			integrationTestRuntime {
-				extendsFrom integrationTestCompile, testRuntime, testRuntimeOnly
-			}
-		}
-
-		project.sourceSets {
-			integrationTest {
-				java.srcDir project.file('src/integration-test/java')
-				resources.srcDir project.file('src/integration-test/resources')
-				compileClasspath = project.sourceSets.main.output + project.sourceSets.test.output + project.configurations.integrationTestCompile
-				runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntime
-			}
-		}
-
-		Task integrationTestTask = project.tasks.create("integrationTest", Test) {
-			group = 'Verification'
-			description = 'Runs the integration tests.'
-			dependsOn 'jar'
-			testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
-			classpath = project.sourceSets.integrationTest.runtimeClasspath
-			shouldRunAfter project.tasks.test
-		}
-		project.tasks.check.dependsOn integrationTestTask
-
-		project.plugins.withType(IdeaPlugin) {
-			project.idea {
-				module {
-					testSourceDirs += project.file('src/integration-test/java')
-					scopes.TEST.plus += [ project.configurations.integrationTestCompile ]
-				}
-			}
-		}
-
-		project.plugins.withType(GroovyPlugin) {
-			project.sourceSets {
-				integrationTest {
-					groovy.srcDirs project.file('src/integration-test/groovy')
-				}
-			}
-			project.plugins.withType(IdeaPlugin) {
-				project.idea {
-					module {
-						testSourceDirs += project.file('src/integration-test/groovy')
-					}
-				}
-			}
-		}
-
-		project.plugins.withType(PropDepsPlugin) {
-			project.configurations {
-				integrationTestCompile {
-					extendsFrom optional, provided
-				}
-			}
-		}
-
-		project.plugins.withType(EclipsePlugin) {
-			project.eclipse.classpath {
-				plusConfigurations += [ project.configurations.integrationTestCompile ]
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy

@@ -1,41 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
-
-/**
- * Adds a version of jacoco to use and makes check depend on jacocoTestReport.
- *
- * @author Rob Winch
- */
-class JacocoPlugin implements Plugin<Project> {
-
-	@Override
-	void apply(Project project) {
-		project.plugins.withType(JavaPlugin) {
-			project.getPluginManager().apply("jacoco")
-			project.tasks.check.dependsOn project.tasks.jacocoTestReport
-
-			project.jacoco {
-				toolVersion = '0.8.2'
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy

@@ -1,116 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.gradle.api.Action;
-import org.gradle.api.JavaVersion
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.javadoc.Javadoc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Rob Winch
- */
-public class JavadocApiPlugin implements Plugin<Project> {
-	Logger logger = LoggerFactory.getLogger(getClass());
-	Set<Pattern> excludes = Collections.singleton(Pattern.compile("test"));
-
-	@Override
-	public void apply(Project project) {
-		logger.info("Applied");
-		Project rootProject = project.getRootProject();
-
-
-		//Task docs = project.getTasks().findByPath("docs") ?: project.getTasks().create("docs");
-		Javadoc api = project.getTasks().create("api", Javadoc);
-
-		api.setGroup("Documentation");
-		api.setDescription("Generates aggregated Javadoc API documentation.");
-		api.doLast {
-			if (JavaVersion.current().isJava11Compatible()) {
-				project.copy({ copy -> copy
-					.from(api.destinationDir)
-					.into(api.destinationDir)
-					.include("element-list")
-					.rename("element-list", "package-list")
-				});
-			}
-		}
-
-		Set<Project> subprojects = rootProject.getSubprojects();
-		for (Project subproject : subprojects) {
-			addProject(api, subproject);
-		}
-
-		if (subprojects.isEmpty()) {
-			addProject(api, project);
-		}
-
-		api.setMaxMemory("1024m");
-		api.setDestinationDir(new File(project.getBuildDir(), "api"));
-
-		project.getPluginManager().apply("io.spring.convention.javadoc-options");
-	}
-
-	public void setExcludes(String... excludes) {
-		if(excludes == null) {
-			this.excludes = Collections.emptySet();
-		}
-		this.excludes = new HashSet<Pattern>(excludes.length);
-		for(String exclude : excludes) {
-			this.excludes.add(Pattern.compile(exclude));
-		}
-	}
-
-	private void addProject(final Javadoc api, final Project project) {
-		for(Pattern exclude : excludes) {
-			if(exclude.matcher(project.getName()).matches()) {
-				logger.info("Skipping {} because it is excluded by {}", project, exclude);
-				return;
-			}
-		}
-		logger.info("Try add sources for {}", project);
-		project.getPlugins().withType(SpringModulePlugin.class).all(new Action<SpringModulePlugin>() {
-			@Override
-			public void execute(SpringModulePlugin plugin) {
-				logger.info("Added sources for {}", project);
-
-				JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class);
-				SourceSet mainSourceSet = java.getSourceSets().getByName("main");
-
-				api.setSource(api.getSource().plus(mainSourceSet.getAllJava()));
-				project.getTasks().withType(Javadoc.class).all(new Action<Javadoc>() {
-					@Override
-					public void execute(Javadoc projectJavadoc) {
-						api.setClasspath(api.getClasspath().plus(projectJavadoc.getClasspath()));
-					}
-				});
-			}
-		});
-	}
-}
-

buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy

@@ -1,15 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.tasks.javadoc.Javadoc
-
-public class JavadocOptionsPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getTasks().withType(Javadoc).all { t->
-			t.options.addStringOption('Xdoclint:none', '-quiet')
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/ManagementConfigurationPlugin.java

@@ -1,59 +0,0 @@
-package io.spring.gradle.convention;
-
-
-import io.spring.gradle.propdeps.PropDepsPlugin;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaTestFixturesPlugin;
-import org.gradle.api.plugins.PluginContainer;
-import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.maven.MavenPublication;
-import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
-
-/**
- * Creates a Management configuration that is appropriate for adding a platform to that is not exposed externally. If
- * the JavaPlugin is applied, the compileClasspath, runtimeClasspath, testCompileClasspath, and testRuntimeClasspath
- * will extend from it.
- * @author Rob Winch
- */
-public class ManagementConfigurationPlugin implements Plugin<Project> {
-
-	public static final String MANAGEMENT_CONFIGURATION_NAME = "management";
-
-	@Override
-	public void apply(Project project) {
-		ConfigurationContainer configurations = project.getConfigurations();
-		configurations.create(MANAGEMENT_CONFIGURATION_NAME, (management) -> {
-			management.setVisible(false);
-			management.setCanBeConsumed(false);
-			management.setCanBeResolved(false);
-
-			PluginContainer plugins = project.getPlugins();
-			plugins.withType(JavaPlugin.class, (javaPlugin) -> {
-				configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-				configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME).extendsFrom(management);
-			});
-			plugins.withType(JavaTestFixturesPlugin.class, (javaTestFixturesPlugin) -> {
-				configurations.getByName("testFixturesCompileClasspath").extendsFrom(management);
-				configurations.getByName("testFixturesRuntimeClasspath").extendsFrom(management);
-			});
-			plugins.withType(MavenPublishPlugin.class, (mavenPublish) -> {
-				PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
-				publishing.getPublications().withType(MavenPublication.class, (mavenPublication -> {
-					mavenPublication.versionMapping((versions) ->
-							versions.allVariants(versionMapping -> versionMapping.fromResolutionResult())
-					);
-				}));
-			});
-			plugins.withType(PropDepsPlugin.class, (propDepsPlugin -> {
-				configurations.getByName("optional").extendsFrom(management);
-				configurations.getByName("provided").extendsFrom(management);
-			}));
-		});
-	}
-}
-

buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy

@@ -1,18 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlatformPlugin
-import org.sonarqube.gradle.SonarQubePlugin
-import org.springframework.gradle.CopyPropertiesPlugin
-import org.springframework.gradle.maven.SpringMavenPlugin
-
-public class MavenBomPlugin implements Plugin<Project> {
-	static String MAVEN_BOM_TASK_NAME = "mavenBom"
-
-	public void apply(Project project) {
-		project.plugins.apply(JavaPlatformPlugin)
-		project.plugins.apply(SpringMavenPlugin)
-		project.plugins.apply(CopyPropertiesPlugin)
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/OssrhPlugin.groovy

@@ -1,26 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-public class OssrhPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		if(project.hasProperty('ossrhUsername')) {
-			project.uploadArchives {
-				repositories {
-					mavenDeployer {
-						repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-							authentication(userName: project.ossrhUsername, password: project.ossrhPassword)
-						}
-
-						snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-							authentication(userName: project.ossrhUsername, password: project.ossrhPassword)
-						}
-					}
-				}
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy

@@ -1,84 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention;
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class RepositoryConventionPlugin implements Plugin<Project> {
-
-	@Override
-	void apply(Project project) {
-		String[] forceMavenRepositories = ((String) project.findProperty("forceMavenRepositories"))?.split(',')
-		boolean isImplicitSnapshotRepository = forceMavenRepositories == null && Utils.isSnapshot(project)
-		boolean isImplicitMilestoneRepository = forceMavenRepositories == null && Utils.isMilestone(project)
-
-		boolean isSnapshot = isImplicitSnapshotRepository || forceMavenRepositories?.contains('snapshot')
-		boolean isMilestone = isImplicitMilestoneRepository || forceMavenRepositories?.contains('milestone')
-
-		project.repositories {
-			if (forceMavenRepositories?.contains('local')) {
-				mavenLocal()
-			}
-			mavenCentral()
-			jcenter() {
-				content {
-					includeGroup "org.gretty"
-				}
-			}
-			if (isSnapshot) {
-				maven {
-					name = 'artifactory-snapshot'
-					if (project.hasProperty('artifactoryUsername')) {
-						credentials {
-							username project.artifactoryUsername
-							password project.artifactoryPassword
-						}
-					}
-					url = 'https://repo.spring.io/snapshot/'
-				}
-			}
-			if (isSnapshot || isMilestone) {
-				maven {
-					name = 'artifactory-milestone'
-					if (project.hasProperty('artifactoryUsername')) {
-						credentials {
-							username project.artifactoryUsername
-							password project.artifactoryPassword
-						}
-					}
-					url = 'https://repo.spring.io/milestone/'
-				}
-			}
-			maven {
-				name = 'artifactory-release'
-				if (project.hasProperty('artifactoryUsername')) {
-					credentials {
-						username project.artifactoryUsername
-						password project.artifactoryPassword
-					}
-				}
-				url = 'https://repo.spring.io/release/'
-			}
-			maven {
-				name = 'shibboleth'
-				url = 'https://build.shibboleth.net/nexus/content/repositories/releases/'
-			}
-		}
-	}
-
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy

@@ -1,59 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention
-
-import io.spring.nohttp.gradle.NoHttpPlugin
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.BasePlugin
-import org.gradle.api.plugins.PluginManager
-import org.springframework.gradle.maven.SpringNexusPublishPlugin
-
-class RootProjectPlugin implements Plugin<Project> {
-
-	@Override
-	void apply(Project project) {
-		PluginManager pluginManager = project.getPluginManager()
-		pluginManager.apply(BasePlugin)
-		pluginManager.apply(SchemaPlugin)
-		pluginManager.apply(NoHttpPlugin)
-		pluginManager.apply(SpringNexusPublishPlugin)
-		pluginManager.apply("org.sonarqube")
-
-		project.repositories.mavenCentral()
-
-		String projectName = Utils.getProjectName(project)
-		project.sonarqube {
-			properties {
-				property "sonar.java.coveragePlugin", "jacoco"
-				property "sonar.projectName", projectName
-				property "sonar.jacoco.reportPath", "${project.buildDir.name}/jacoco.exec"
-				property "sonar.links.homepage", "https://spring.io/${projectName}"
-				property "sonar.links.ci", "https://jenkins.spring.io/job/${projectName}/"
-				property "sonar.links.issue", "https://github.com/spring-projects/${projectName}/issues"
-				property "sonar.links.scm", "https://github.com/spring-projects/${projectName}"
-				property "sonar.links.scm_dev", "https://github.com/spring-projects/${projectName}.git"
-			}
-		}
-
-		def finalizeDeployArtifacts = project.task("finalizeDeployArtifacts")
-		if (Utils.isRelease(project) && project.hasProperty("ossrhUsername")) {
-			finalizeDeployArtifacts.dependsOn project.tasks.closeAndReleaseOssrhStagingRepository
-		}
-	}
-
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy

@@ -1,71 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-public class SchemaDeployPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getPluginManager().apply('org.hidetake.ssh')
-
-		project.ssh.settings {
-			knownHosts = allowAnyHosts
-		}
-		project.remotes {
-			docs {
-				role 'docs'
-				if (project.hasProperty('deployDocsHost')) {
-					host = project.findProperty('deployDocsHost')
-				} else {
-					host = 'docs.af.pivotal.io'
-				}
-				retryCount = 5 // retry 5 times (default is 0)
-				retryWaitSec = 10 // wait 10 seconds between retries (default is 0)
-				user = project.findProperty('deployDocsSshUsername')
-				if(project.hasProperty('deployDocsSshKeyPath')) {
-					identity = project.file(project.findProperty('deployDocsSshKeyPath'))
-				} else if (project.hasProperty('deployDocsSshKey')) {
-					identity = project.findProperty('deployDocsSshKey')
-				}
-				if(project.hasProperty('deployDocsSshPassphrase')) {
-					passphrase = project.findProperty('deployDocsSshPassphrase')
-				}
-			}
-		}
-
-		project.task('deploySchema') {
-			dependsOn 'schemaZip'
-			doFirst {
-				project.ssh.run {
-					session(project.remotes.docs) {
-						def now = System.currentTimeMillis()
-						def name = project.rootProject.name
-						def version = project.rootProject.version
-						def tempPath = "/tmp/${name}-${now}-schema/".replaceAll(' ', '_')
-
-						execute "mkdir -p $tempPath"
-
-						project.tasks.schemaZip.outputs.each { o ->
-							println "Putting $o.files"
-							put from: o.files, into: tempPath
-						}
-
-						execute "unzip $tempPath*.zip -d $tempPath"
-
-						def extractPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/schema/${name}/${version}/"
-
-						execute "rm -rf $extractPath"
-						execute "mkdir -p $extractPath"
-						execute "rm -f $tempPath*.zip"
-						execute "rm -rf $extractPath*"
-						execute "mv $tempPath/* $extractPath"
-						execute "chmod -R g+w $extractPath"
-					}
-				}
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy

@@ -1,15 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-public class SchemaPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getPluginManager().apply(SchemaZipPlugin)
-		project.getPluginManager().apply(SchemaDeployPlugin)
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy

@@ -1,43 +0,0 @@
-package io.spring.gradle.convention
-
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-public class SchemaZipPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		Zip schemaZip = project.tasks.create('schemaZip', Zip)
-		schemaZip.group = 'Distribution'
-		schemaZip.archiveBaseName = project.rootProject.name
-		schemaZip.archiveClassifier = 'schema'
-		schemaZip.description = "Builds -${schemaZip.archiveClassifier} archive containing all " +
-			"XSDs for deployment at static.springframework.org/schema."
-
-		project.rootProject.subprojects.each { module ->
-
-			module.getPlugins().withType(JavaPlugin.class).all {
-				def Properties schemas = new Properties();
-
-				module.sourceSets.main.resources.find {
-					it.path.endsWith('META-INF/spring.schemas')
-				}?.withInputStream { schemas.load(it) }
-
-				for (def key : schemas.keySet()) {
-					def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')
-					assert shortName != key
-					File xsdFile = module.sourceSets.main.resources.find {
-						it.path.endsWith(schemas.get(key))
-					}
-					assert xsdFile != null
-					schemaZip.into (shortName) {
-						duplicatesStrategy 'exclude'
-						from xsdFile.path
-					}
-				}
-			}
-		}
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy

@@ -1,52 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.spring.gradle.convention;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * A Properties which sorts they keys so that they can be written to a File with
- * the keys sorted.
- *
- * @author Rob Winch
- *
- */
-class SortedProperties extends Properties {
-	private static final long serialVersionUID = -6199017589626540836L;
-
-	public Enumeration<Object> keys() {
-		Enumeration<Object> keysEnum = super.keys();
-		List<Object> keyList = new ArrayList<Object>();
-
-		while (keysEnum.hasMoreElements()) {
-			keyList.add(keysEnum.nextElement());
-		}
-
-		Collections.sort(keyList, new Comparator<Object>() {
-			@Override
-			public int compare(Object o1, Object o2) {
-				return o1.toString().compareTo(o2.toString());
-			}
-		});
-
-		return Collections.enumeration(keyList);
-	}
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy

@@ -1,48 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention;
-
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaLibraryPlugin;
-import org.gradle.api.plugins.MavenPlugin;
-import org.gradle.api.plugins.PluginManager
-import org.springframework.gradle.maven.SpringMavenPlugin;
-
-/**
- * @author Rob Winch
- */
-class SpringModulePlugin extends AbstractSpringJavaPlugin {
-
-	@Override
-	void additionalPlugins(Project project) {
-		PluginManager pluginManager = project.getPluginManager();
-		pluginManager.apply(JavaLibraryPlugin.class)
-		pluginManager.apply(SpringMavenPlugin.class);
-		pluginManager.apply("io.spring.convention.jacoco");
-
-		def deployArtifacts = project.task("deployArtifacts")
-		deployArtifacts.group = 'Deploy tasks'
-		deployArtifacts.description = "Deploys the artifacts to either Artifactory or Maven Central"
-		if (Utils.isRelease(project)) {
-			deployArtifacts.dependsOn project.tasks.uploadArchives
-		}
-		else {
-			deployArtifacts.dependsOn project.tasks.artifactoryPublish
-		}
-	}
-
-}

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy

@@ -1,30 +0,0 @@
-/*
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package io.spring.gradle.convention;
-
-import org.gradle.api.Project;
-
-/**
- * @author Rob Winch
- */
-public class SpringTestPlugin extends AbstractSpringJavaPlugin {
-
-	@Override
-	public void additionalPlugins(Project project) {
-		project.sonarqube.skipProject = true
-	}
-}