Add finalizeDeployArtifacts

Adjust ClientRegistrationsTests
Closes gh-9748
2026-07-12 14:20:11 +00:00 · 2023-03-20 13:05:00 -06:00 · 2023-03-17 10:24:23 -06:00 · 2023-03-17 10:00:21 -06:00 · 2023-03-17 09:15:20 -06:00
3721 changed files with 145323 additions and 34280 deletions
@@ -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
@@ -0,0 +1,147 @@
+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_8:
+    name: Build JDK 8
+    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 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8'
+      - name: Setup gradle user name
+        run: |
+          mkdir -p ~/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.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"
+  deploy_artifacts:
+    name: Deploy Artifacts
+    needs: [build_jdk_8]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8'
+      - name: Setup gradle user name
+        run: |
+          mkdir -p ~/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.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 deployArtifacts finalizeDeployArtifacts -PossrhTokenUsername="$OSSRH_TOKEN_USERNAME" -PossrhTokenPassword="$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_8]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8'
+      - name: Setup gradle user name
+        run: |
+          mkdir -p ~/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.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_8]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8'
+      - name: Setup gradle user name
+        run: |
+          mkdir -p ~/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.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_8, 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'
@@ -0,0 +1,22 @@
+name: PR Build
+
+on: pull_request
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8'
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Build with Gradle
+        run: ./gradlew clean build --continue --scan
@@ -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>
@@ -1,6 +0,0 @@
-# Use sdkman to run "sdk env" to initialize with correct JDK version
-# Enable auto-env through the sdkman_auto_env config
-# See https://sdkman.io/usage#config
-# A summary is to add the following to ~/.sdkman/etc/config
-# sdkman_auto_env=true
-java=11.0.14-tem
@@ -4,7 +4,7 @@ _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

@@ -43,9 +43,9 @@ If you're considering anything more than correcting a typo or fixing a minor bug

 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

@@ -1,8 +1,10 @@
 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"]
+[NOTE]
+======
+This branch of Spring Security has reached its https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Versions#supported-versions[End of Life], meaning that there are no further maintenance releases or security patches planned.
+Please migrate to a supported branch as soon as possible.
+======

 = Spring Security

@@ -12,17 +14,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.
+See https://docs.spring.io/spring-security/site/docs/5.4.x/reference/html5/#servlet-hello[Hello Spring Security] to get started with a "Hello, World" application.

 == Building from Source
 Spring Security uses a https://gradle.org[Gradle]-based build system.
@@ -30,9 +32,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 +45,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 +62,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
@@ -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)
-
-
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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.9
+ch.qos.logback:logback-core:1.2.9
+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-SR25
+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.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jacoco:org.jacoco.agent:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jacoco:org.jacoco.agent:0.8.2
+org.jacoco:org.jacoco.ant:0.8.2
+org.jacoco:org.jacoco.core:0.8.2
+org.jacoco:org.jacoco.report:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+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-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+net.sf.ehcache:ehcache:2.10.9.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.slf4j:slf4j-api:1.7.32
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context-support:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context-support:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+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.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context-support:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+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.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context-support:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -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-SR25
+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.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context-support:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-jdbc:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
+org.springframework:spring-tx:5.2.19.RELEASE
@@ -1,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'
 }
@@ -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;
 		}
@@ -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 {

@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjtools:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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.9
+ch.qos.logback:logback-core:1.2.9
+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-SR25
+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.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jacoco:org.jacoco.agent:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jacoco:org.jacoco.agent:0.8.2
+org.jacoco:org.jacoco.ant:0.8.2
+org.jacoco:org.jacoco.core:0.8.2
+org.jacoco:org.jacoco.report:0.8.2
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+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-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
@@ -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-SR25
+org.aspectj:aspectjrt:1.9.6
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+org.jetbrains.kotlin:kotlin-bom:1.4.30
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-framework-bom:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
@@ -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-SR25
+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.30
+org.mockito:mockito-core:3.5.15
+org.objenesis:objenesis:3.1
+org.springframework.data:spring-data-releasetrain:Neumann-SR9
+org.springframework:spring-aop:5.2.19.RELEASE
+org.springframework:spring-beans:5.2.19.RELEASE
+org.springframework:spring-context:5.2.19.RELEASE
+org.springframework:spring-core:5.2.19.RELEASE
+org.springframework:spring-expression:5.2.19.RELEASE
+org.springframework:spring-framework-bom:5.2.19.RELEASE
+org.springframework:spring-jcl:5.2.19.RELEASE
+org.springframework:spring-test:5.2.19.RELEASE
@@ -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
 }

@@ -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)
 		}
 	}
 }
@@ -1,13 +1,28 @@
 buildscript {
+	configurations.all {
+		resolutionStrategy.dependencySubstitution {
+			substitute module('org.apache.xerces:xercesImpl') with module('xerces:xercesImpl:2.9.1')
+			substitute module('org.apache.xerces:resolver') with module('xerces:resolver:2.9.1')
+		}
+	}
 	dependencies {
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.38'
 		classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
-		classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
-		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' }
+		maven {
+			url = 'https://repo.spring.io/plugins-snapshot'
+			if (project.hasProperty('artifactoryUsername')) {
+				credentials {
+					username "$artifactoryUsername"
+					password "$artifactoryPassword"
+				}
+			}
+		}
 		maven { url 'https://plugins.gradle.org/m2/' }
 	}
 }
@@ -16,10 +31,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,90 +39,21 @@ 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'
 	}
 	tasks.withType(JavaCompile) {
 		options.encoding = "UTF-8"
-		options.compilerArgs.add("-parameters")
-		options.release = 8
 	}
 }

-
 allprojects {
 	if (!['spring-security-bom', 'spring-security-docs'].contains(project.name)) {
 		apply plugin: 'io.spring.javaformat'
@@ -147,6 +89,4 @@ if (hasProperty('buildScan')) {

 nohttp {
 	allowlistFile = project.file("etc/nohttp/allowlist.lines")
-	source.exclude "buildSrc/build/**"
-
 }
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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,72 +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 {
-	all {
-		resolutionStrategy.dependencySubstitution {
-			substitute(module("org.apache.xerces:xercesImpl"))
-					.using(module("xerces:xercesImpl:2.9.1"))
-			substitute(module("org.apache.xerces:resolver"))
-					.using(module("xerces:resolver:2.9.1"))
-		}
-	}
-	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.18'
-	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.10'
-	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'
+}
@@ -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
@@ -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
-        }
-    }
-}
@@ -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
-  }
-}
@@ -1,8 +0,0 @@
-query RateLimit {
-    rateLimit {
-        limit
-        cost
-        remaining
-        resetAt
-    }
-}
@@ -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);
-}
@@ -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')
-				}
-			}
-		}
-	}
-}
@@ -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.10')
-
-				project.checkstyle {
-					configDirectory = checkstyleDir
-					toolVersion = '8.21'
-				}
-			}
-		}
-	}
-
-}
@@ -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
-			}
-		}
-	}
-}
@@ -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"
-					}
-				}
-			}
-		}
-	}
-}
@@ -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
-	}
-}
@@ -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 ]
-			}
-		}
-	}
-}
@@ -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'
-			}
-		}
-	}
-}
@@ -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()));
-					}
-				});
-			}
-		});
-	}
-}
-
@@ -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')
-		}
-	}
-}
@@ -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);
-			}));
-		});
-	}
-}
-
@@ -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)
-	}
-}
@@ -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)
-						}
-					}
-				}
-			}
-		}
-	}
-}
@@ -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/'
-			}
-		}
-	}
-
-}
@@ -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
-		}
-	}
-
-}
@@ -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"
-					}
-				}
-			}
-		}
-	}
-}
@@ -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)
-	}
-}
@@ -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
-					}
-				}
-			}
-		}
-	}
-}
@@ -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);
-	}
-}
@@ -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
-		}
-	}
-
-}
@@ -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
-	}
-}
@@ -1,54 +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
-import org.gradle.jvm.tasks.Jar
-
-/**
- * Adds the ability to depends on the test jar within other projects using:
- *
- * <code>
- * testCompile project(path: ':foo', configuration: 'tests')
- * </code>
- *
- * @author Rob Winch
- */
-public class TestsConfigurationPlugin implements Plugin<Project> {
-	@Override
-	public void apply(Project project) {
-		project.plugins.withType(JavaPlugin) {
-			applyJavaProject(project)
-		}
-	}
-
-	private void applyJavaProject(Project project) {
-		project.configurations {
-			tests.extendsFrom testRuntime, testRuntimeClasspath
-		}
-
-		project.tasks.create('testJar', Jar) {
-			classifier = 'test'
-			from project.sourceSets.test.output
-		}
-
-		project.artifacts {
-			tests project.testJar
-		}
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Josh Cummings	c785be26c8	Add finalizeDeployArtifacts	2023-03-20 13:05:00 -06:00
Josh Cummings	7e50d2e058	Adjust ClientRegistrationsTests Closes gh-9748	2023-03-17 10:24:23 -06:00
Josh Cummings	82acbbc68e	Disable saml2Login Sample Test	2023-03-17 10:00:21 -06:00
Josh Cummings	f2440f819c	Remove snapshot_tests dependency	2023-03-17 09:15:20 -06:00