Release 5.5.6

Closes gh-11139

.gitattributes

@@ -14,4 +14,3 @@
 *.odg      binary
 *.otg      binary
 *.png      binary
-*.hsx      binary

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!--
-For Security Vulnerabilities, please use https://spring.io/security-policy
+For Security Vulnerabilities, please use https://pivotal.io/security#reporting
 -->
 
 ### Summary

.github/actions/algolia-config.json

@@ -1,20 +0,0 @@
-{
-  "index_name": "security-docs",
-  "start_urls": [
-    "https://docs.spring.io/spring-security/reference/"
-  ],
-  "selectors": {
-    "lvl0": {
-      "selector": "//nav[@class='crumbs']//li[@class='crumb'][last()-1]",
-      "type": "xpath",
-      "global": true,
-      "default_value": "Home"
-    },
-    "lvl1": ".doc h1",
-    "lvl2": ".doc h2",
-    "lvl3": ".doc h3",
-    "lvl4": ".doc h4",
-    "text": ".doc p, .doc td.content, .doc th.tableblock"
-  }
-}
-

.github/actions/algolia-deploy.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-HOST="$1"
-HOST_PATH="$2"
-SSH_PRIVATE_KEY="$3"
-SSH_KNOWN_HOST="$4"
-
-
-if [ "$#" -ne 4 ]; then
-  echo -e "not enough arguments USAGE:\n\n$0 \$HOST \$HOST_PATH \$SSH_PRIVATE_KEY \$SSH_KNOWN_HOSTS \n\n" >&2
-  exit 1
-fi
-
-# Use a non-default path to avoid overriding when testing locally
-SSH_PRIVATE_KEY_PATH=~/.ssh/github-actions-docs
-install -m 600 -D /dev/null "$SSH_PRIVATE_KEY_PATH"
-echo "$SSH_PRIVATE_KEY" > "$SSH_PRIVATE_KEY_PATH"
-echo "$SSH_KNOWN_HOST" > ~/.ssh/known_hosts
-rsync --delete -avze "ssh -i $SSH_PRIVATE_KEY_PATH" docs/build/site/ "$HOST:$HOST_PATH"
-rm -f "$SSH_PRIVATE_KEY_PATH"

.github/actions/algolia-docsearch-scraper.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-###
-# Docs
-# config.json https://docsearch.algolia.com/docs/config-file
-# Run the crawler https://docsearch.algolia.com/docs/run-your-own/#run-the-crawl-from-the-docker-image
-
-### USAGE
-if [ "$#" -ne 3 ]; then
-  echo -e "not enough arguments USAGE:\n\n$0 \$ALGOLIA_APPLICATION_ID \$ALGOLIA_API_KEY \$CONFIG_FILE\n\n" >&2
-  exit 1
-fi
-
-# Script Parameters
-APPLICATION_ID=$1
-API_KEY=$2
-CONFIG_FILE=$3
-
-#### Script
-script_dir=$(dirname $0)
-docker run -e "APPLICATION_ID=$APPLICATION_ID" -e "API_KEY=$API_KEY" -e "CONFIG=$(cat $CONFIG_FILE | jq -r tostring)" algolia/docsearch-scraper

.github/actions/dispatch.sh

@@ -1,5 +0,0 @@
-REPOSITORY_REF="$1"
-TOKEN="$2"
-
-curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${TOKEN}" --request POST  --data '{"event_type": "request-build-reference"}' https://api.github.com/repos/${REPOSITORY_REF}/dispatches
-echo "Requested Build for $REPOSITORY_REF"

.github/workflows/algolia-index.yml

@@ -1,16 +0,0 @@
-name: Update Algolia Index
-
-on:
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch: # Manual trigger
-
-jobs:
-  update:
-    name: Update Algolia Index
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v2
-      - name: Update Index
-        run: ${GITHUB_WORKSPACE}/.github/actions/algolia-docsearch-scraper.sh "${{ secrets.ALGOLIA_APPLICATION_ID }}" "${{ secrets.ALGOLIA_WRITE_API_KEY }}" "${GITHUB_WORKSPACE}/.github/actions/algolia-config.json"

.github/workflows/antora-generate.yml

@@ -1,32 +0,0 @@
-name: Generate Antora Files and Request Build
-
-on:
-  workflow_dispatch:
-  push:
-    branches-ignore:
-      - 'gh-pages'
-    tags: '**'
-
-env:
-  GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v2
-      - name: Generate antora.yml
-        run: ./gradlew :spring-security-docs:generateAntora
-      - name: Extract Branch Name
-        id: extract_branch_name
-        run: echo "##[set-output name=generated_branch_name;]$(echo ${GITHUB_REPOSITORY}/${GITHUB_REF##*/})"
-      - name: Push generated antora files to the spring-generated-docs
-        uses: JamesIves/github-pages-deploy-action@4.1.4
-        with:
-          branch:  ${{ steps.extract_branch_name.outputs.generated_branch_name }} # The branch the action should deploy to.
-          folder: "docs/build/generateAntora" # The folder the action should deploy.
-          repository-name: "spring-io/spring-generated-docs"
-          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      - name: Dispatch Build Request
-        run: ${GITHUB_WORKSPACE}/.github/actions/dispatch.sh 'spring-projects/spring-security' "$GH_ACTIONS_REPO_TOKEN"

.github/workflows/backport-bot.yml

@@ -1,26 +0,0 @@
-name: Backport Bot
-
-on:
-  issues:
-    types: [labeled]
-  pull_request:
-    types: [labeled]
-  push:
-    branches:
-      - '*.x'
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Download BackportBot
-        run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
-      - name: Backport
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_EVENT: ${{ toJSON(github.event) }}
-        run: java -jar backport-bot-0.0.1-SNAPSHOT.jar --github.accessToken="$GITHUB_TOKEN" --github.event_name "$GITHUB_EVENT_NAME" --github.event "$GITHUB_EVENT"

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

@@ -13,7 +13,6 @@ env:
   GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
   COMMIT_OWNER: ${{ github.event.pusher.name }}
   COMMIT_SHA: ${{ github.sha }}
-  STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }}
   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
   RUN_JOBS: ${{ github.repository == 'spring-projects/spring-security' }}
@@ -79,55 +78,9 @@ jobs:
           export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
           export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
           ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace
-  check_samples:
-    name: Check Samples project
-    needs: [prerequisites]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
-      - name: Check samples project
-        env:
-          LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
-          SAMPLES_INIT_SCRIPT: ${{ github.workspace }}/build/includeRepo/spring-security-ci.gradle
-        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 publishMavenJavaPublicationToLocalRepository
-          ./gradlew checkSamples -PsamplesInitScript="$SAMPLES_INIT_SCRIPT" -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" --stacktrace
-  check_tangles:
-    name: Check for Package Tangles
-    needs: [ prerequisites ]
-    runs-on: ubuntu-latest
-    if: needs.prerequisites.outputs.runjobs
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Setup gradle user name
-        run: |
-          mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
-      - name: Check for package tangles
-        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 check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
   deploy_artifacts:
     name: Deploy Artifacts
-    needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
+    needs: [build_jdk_11, snapshot_tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -154,7 +107,7 @@ jobs:
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
   deploy_docs:
     name: Deploy Docs
-    needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
+    needs: [build_jdk_11, snapshot_tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -178,7 +131,7 @@ jobs:
           DOCS_HOST: ${{ secrets.DOCS_HOST }}
   deploy_schema:
     name: Deploy Schema
-    needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
+    needs: [build_jdk_11, snapshot_tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -202,7 +155,7 @@ jobs:
           DOCS_HOST: ${{ secrets.DOCS_HOST }}
   notify_result:
     name: Check for failures
-    needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles, deploy_artifacts, deploy_docs, deploy_schema]
+    needs: [build_jdk_11, snapshot_tests, deploy_artifacts, deploy_docs, deploy_schema]
     if: failure()
     runs-on: ubuntu-latest
     steps:

.github/workflows/deploy-reference.yml

@@ -1,33 +0,0 @@
-name: Build & Deploy Reference
-
-on:
-  repository_dispatch:
-    types: request-build-reference
-  schedule:
-    - cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch: # Manual trigger
-
-jobs:
-  deploy:
-    name: deploy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        run: ./gradlew :spring-security-docs:antora --stacktrace
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
-      - name: Deploy
-        run: ${GITHUB_WORKSPACE}/.github/actions/algolia-deploy.sh "${{ secrets.DOCS_USERNAME }}@${{ secrets.DOCS_HOST }}" "/opt/www/domains/spring.io/docs/htdocs/spring-security/reference/" "${{ secrets.DOCS_SSH_KEY }}" "${{ secrets.DOCS_SSH_HOST_KEY }}"

.github/workflows/milestone-spring-releasetrain.yml

@@ -1,33 +0,0 @@
-name: Check Milestone
-on:
-  milestone:
-    types: [created, opened, edited]
-env:
-  DUE_ON: ${{ github.event.milestone.due_on }}
-  TITLE: ${{ github.event.milestone.title }}
-jobs:
-  spring-releasetrain-checks:    
-    name: Check DueOn is on a Release Date
-    runs-on: ubuntu-latest
-    steps:
-    - name: Print Milestone Being Checked
-      run: echo "Validating DueOn '$DUE_ON' for milestone '$TITLE'"
-    - name: Validate DueOn
-      if: env.DUE_ON != ''
-      run: |
-        export TOOL_VERSION=0.1.1
-        wget "https://repo.maven.apache.org/maven2/io/spring/releasetrain/spring-release-train-tools/$TOOL_VERSION/spring-release-train-tools-$TOOL_VERSION.jar"
-        java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3
-  notify_result:
-    name: Check for failures
-    needs: [spring-releasetrain-checks]
-    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'

README.adoc

@@ -22,7 +22,7 @@ Be sure to read the https://docs.spring.io/spring-security/site/docs/current/ref
 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/current/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.5.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.

RELEASE.adoc

@@ -78,16 +78,6 @@ Alternatively, you can manually check using https://github.com/spring-projects/s
 
 Update the version number in `gradle.properties` for the release, for example `5.5.0-M1`, `5.5.0-RC1`, `5.5.0`
 
-= Update Antora Version
-
-You will need to update the antora.yml version.
-If you are unsure of what the values should be, the following task will instruct you what the expected values are:
-
-[source,bash]
-----
-./gradlew :spring-security-docs:antoraCheckVersion
-----
-
 = Build Locally
 
 Run the build using
@@ -129,7 +119,7 @@ git push origin 5.4.0-RC1
 
 == 7. Update to Next Development Version
 
-* Update `gradle.properties` version to next `+SNAPSHOT+` version, update antora.yml, and then push
+* Update `gradle.properties` version to next `+SNAPSHOT+` version and then push
 
 == 8. Update version on project page
 

acl/spring-security-acl.gradle

@@ -11,15 +11,9 @@ dependencies {
 
 	optional 'net.sf.ehcache:ehcache'
 
-	testImplementation "org.assertj:assertj-core"
-	testImplementation "org.junit.jupiter:junit-jupiter-api"
-	testImplementation "org.junit.jupiter:junit-jupiter-params"
-	testImplementation "org.junit.jupiter:junit-jupiter-engine"
-	testImplementation "org.mockito:mockito-core"
-	testImplementation "org.mockito:mockito-junit-jupiter"
 	testImplementation 'org.springframework:spring-beans'
 	testImplementation 'org.springframework:spring-context-support'
-	testImplementation "org.springframework:spring-test"
+	testImplementation 'org.springframework:spring-test'
 
 	testRuntimeOnly 'org.hsqldb:hsqldb'
 }

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

@@ -37,9 +37,7 @@ import org.springframework.util.Assert;
  * {@link PermissionGrantingStrategy} and {@link AclAuthorizationStrategy} instances.
  *
  * @author Ben Alex
- * @deprecated since 5.6. In favor of JCache based implementations
  */
-@Deprecated
 public class EhCacheBasedAclCache implements AclCache {
 
 	private final Ehcache cache;

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -42,7 +42,7 @@ import org.springframework.security.acls.domain.AuditLogger;
 import org.springframework.security.acls.domain.DefaultPermissionFactory;
 import org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy;
 import org.springframework.security.acls.domain.GrantedAuthoritySid;
-import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.domain.PermissionFactory;
 import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.acls.model.AccessControlEntry;
@@ -51,7 +51,6 @@ import org.springframework.security.acls.model.AclCache;
 import org.springframework.security.acls.model.MutableAcl;
 import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.security.acls.model.ObjectIdentityGenerator;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.security.acls.model.PermissionGrantingStrategy;
 import org.springframework.security.acls.model.Sid;
@@ -74,8 +73,8 @@ import org.springframework.util.Assert;
  * one in <tt>lookupObjectIdentities</tt>. These are built from the same select and "order
  * by" clause, using a different where clause in each case. In order to use custom schema
  * or column names, each of these SQL clauses can be customized, but they must be
- * consistent with each other and with the expected result set generated by the default
- * values.
+ * consistent with each other and with the expected result set generated by the the
+ * default values.
  *
  * @author Ben Alex
  */
@@ -110,8 +109,6 @@ public class BasicLookupStrategy implements LookupStrategy {
 
 	private final AclAuthorizationStrategy aclAuthorizationStrategy;
 
-	private ObjectIdentityGenerator objectIdentityGenerator;
-
 	private PermissionFactory permissionFactory = new DefaultPermissionFactory();
 
 	private final AclCache aclCache;
@@ -165,7 +162,6 @@ public class BasicLookupStrategy implements LookupStrategy {
 		this.aclCache = aclCache;
 		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
 		this.grantingStrategy = grantingStrategy;
-		this.objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
 		this.aclClassIdUtils = new AclClassIdUtils();
 		this.fieldAces.setAccessible(true);
 		this.fieldAcl.setAccessible(true);
@@ -492,11 +488,6 @@ public class BasicLookupStrategy implements LookupStrategy {
 		}
 	}
 
-	public final void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
-		Assert.notNull(objectIdentityGenerator, "objectIdentityGenerator cannot be null");
-		this.objectIdentityGenerator = objectIdentityGenerator;
-	}
-
 	public final void setConversionService(ConversionService conversionService) {
 		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
 	}
@@ -578,8 +569,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 				// target id type, e.g. UUID.
 				Serializable identifier = (Serializable) rs.getObject("object_id_identity");
 				identifier = BasicLookupStrategy.this.aclClassIdUtils.identifierFrom(identifier, rs);
-				ObjectIdentity objectIdentity = BasicLookupStrategy.this.objectIdentityGenerator
-						.createObjectIdentity(identifier, rs.getString("class"));
+				ObjectIdentity objectIdentity = new ObjectIdentityImpl(rs.getString("class"), identifier);
 
 				Acl parentAcl = null;
 				long parentAclId = rs.getLong("parent_object");

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java

@@ -31,12 +31,11 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.NotFoundException;
 import org.springframework.security.acls.model.ObjectIdentity;
-import org.springframework.security.acls.model.ObjectIdentityGenerator;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.util.Assert;
 
@@ -82,8 +81,6 @@ public class JdbcAclService implements AclService {
 
 	private AclClassIdUtils aclClassIdUtils;
 
-	private ObjectIdentityGenerator objectIdentityGenerator;
-
 	public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
 		this(new JdbcTemplate(dataSource), lookupStrategy);
 	}
@@ -94,7 +91,6 @@ public class JdbcAclService implements AclService {
 		this.jdbcOperations = jdbcOperations;
 		this.lookupStrategy = lookupStrategy;
 		this.aclClassIdUtils = new AclClassIdUtils();
-		this.objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
 	}
 
 	@Override
@@ -109,7 +105,7 @@ public class JdbcAclService implements AclService {
 		String javaType = rs.getString("class");
 		Serializable identifier = (Serializable) rs.getObject("obj_id");
 		identifier = this.aclClassIdUtils.identifierFrom(identifier, rs);
-		return this.objectIdentityGenerator.createObjectIdentity(identifier, javaType);
+		return new ObjectIdentityImpl(javaType, identifier);
 	}
 
 	@Override
@@ -169,11 +165,6 @@ public class JdbcAclService implements AclService {
 		this.aclClassIdUtils = new AclClassIdUtils(conversionService);
 	}
 
-	public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
-		Assert.notNull(objectIdentityGenerator, "objectIdentityGenerator cannot be null");
-		this.objectIdentityGenerator = objectIdentityGenerator;
-	}
-
 	protected boolean isAclClassIdSupported() {
 		return this.aclClassIdSupported;
 	}

acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.acls;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.domain.AclFormattingUtils;
 import org.springframework.security.acls.model.Permission;

acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java

@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.AclService;

acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.acls;
 
 import java.util.Locale;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java

@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;

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

@@ -16,7 +16,7 @@
 
 package org.springframework.security.acls.domain;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.Acl;

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

@@ -18,12 +18,12 @@ package org.springframework.security.acls.domain;
 
 import java.util.Arrays;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.given;
  * @author Rob Winch
  *
  */
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class AclAuthorizationStrategyImplTests {
 
 	@Mock
@@ -47,7 +47,7 @@ public class AclAuthorizationStrategyImplTests {
 
 	AclAuthorizationStrategyImpl strategy;
 
-	@BeforeEach
+	@Before
 	public void setup() {
 		this.authority = new SimpleGrantedAuthority("ROLE_AUTH");
 		TestingAuthenticationToken authentication = new TestingAuthenticationToken("foo", "bar",
@@ -56,7 +56,7 @@ public class AclAuthorizationStrategyImplTests {
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 	}
 
-	@AfterEach
+	@After
 	public void cleanup() {
 		SecurityContextHolder.clearContext();
 	}

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

@@ -22,9 +22,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.Acl;
@@ -83,7 +83,7 @@ public class AclImplTests {
 
 	private DefaultPermissionFactory permissionFactory;
 
-	@BeforeEach
+	@Before
 	public void setUp() {
 		SecurityContextHolder.getContext().setAuthentication(this.auth);
 		this.authzStrategy = mock(AclAuthorizationStrategy.class);
@@ -93,7 +93,7 @@ public class AclImplTests {
 		this.permissionFactory = new DefaultPermissionFactory();
 	}
 
-	@AfterEach
+	@After
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

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

@@ -16,9 +16,9 @@
 
 package org.springframework.security.acls.domain;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.acls.model.Acl;
@@ -43,12 +43,12 @@ public class AclImplementationSecurityCheckTests {
 
 	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
 
-	@BeforeEach
+	@Before
 	public void setUp() {
 		SecurityContextHolder.clearContext();
 	}
 
-	@AfterEach
+	@After
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

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

@@ -19,9 +19,9 @@ package org.springframework.security.acls.domain;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.AuditableAccessControlEntry;
@@ -45,7 +45,7 @@ public class AuditLoggerTests {
 
 	private AuditableAccessControlEntry ace;
 
-	@BeforeEach
+	@Before
 	public void setUp() {
 		this.logger = new ConsoleAuditLogger();
 		this.ace = mock(AuditableAccessControlEntry.class);
@@ -53,7 +53,7 @@ public class AuditLoggerTests {
 		System.setOut(new PrintStream(this.bytes));
 	}
 
-	@AfterEach
+	@After
 	public void tearDown() {
 		System.setOut(this.console);
 		this.bytes.reset();

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

@@ -16,7 +16,7 @@
 
 package org.springframework.security.acls.domain;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.ObjectIdentity;
 

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

@@ -16,7 +16,7 @@
 
 package org.springframework.security.acls.domain;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;

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

@@ -16,8 +16,8 @@
 
 package org.springframework.security.acls.domain;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.security.acls.model.Permission;
 
@@ -32,7 +32,7 @@ public class PermissionTests {
 
 	private DefaultPermissionFactory permissionFactory;
 
-	@BeforeEach
+	@Before
 	public void createPermissionfactory() {
 		this.permissionFactory = new DefaultPermissionFactory();
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java

@@ -26,11 +26,11 @@ import javax.sql.DataSource;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.acls.TargetObject;
@@ -81,19 +81,19 @@ public abstract class AbstractBasicLookupStrategyTests {
 
 	public abstract DataSource getDataSource();
 
-	@BeforeAll
+	@BeforeClass
 	public static void initCacheManaer() {
 		cacheManager = CacheManager.create();
 		cacheManager.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30));
 	}
 
-	@AfterAll
+	@AfterClass
 	public static void shutdownCacheManager() {
 		cacheManager.removalAll();
 		cacheManager.shutdown();
 	}
 
-	@BeforeEach
+	@Before
 	public void populateDatabase() {
 		String query = "INSERT INTO acl_sid(ID,PRINCIPAL,SID) VALUES (1,1,'ben');"
 				+ "INSERT INTO acl_class(ID,CLASS) VALUES (2,'" + TARGET_CLASS + "');"
@@ -107,7 +107,7 @@ public abstract class AbstractBasicLookupStrategyTests {
 		getJdbcTemplate().execute(query);
 	}
 
-	@BeforeEach
+	@Before
 	public void initializeBeans() {
 		this.strategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(),
 				new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));
@@ -123,7 +123,7 @@ public abstract class AbstractBasicLookupStrategyTests {
 				new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
 	}
 
-	@AfterEach
+	@After
 	public void emptyDatabase() {
 		String query = "DELETE FROM acl_entry;" + "DELETE FROM acl_object_identity WHERE ID = 9;"
 				+ "DELETE FROM acl_object_identity WHERE ID = 8;" + "DELETE FROM acl_object_identity WHERE ID = 7;"
@@ -318,13 +318,4 @@ public abstract class AbstractBasicLookupStrategyTests {
 		assertThat(((GrantedAuthoritySid) result).getGrantedAuthority()).isEqualTo("sid");
 	}
 
-	@Test
-	public void setObjectIdentityGeneratorWhenNullThenThrowsIllegalArgumentException() {
-		// @formatter:off
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.strategy.setObjectIdentityGenerator(null))
-				.withMessage("objectIdentityGenerator cannot be null");
-		// @formatter:on
-	}
-
 }

acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java

@@ -22,11 +22,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.core.convert.ConversionService;
 
@@ -39,7 +39,7 @@ import static org.mockito.BDDMockito.given;
  *
  * @author paulwheeler
  */
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class AclClassIdUtilsTests {
 
 	private static final Long DEFAULT_IDENTIFIER = 999L;
@@ -56,7 +56,7 @@ public class AclClassIdUtilsTests {
 
 	private AclClassIdUtils aclClassIdUtils;
 
-	@BeforeEach
+	@Before
 	public void setUp() {
 		this.aclClassIdUtils = new AclClassIdUtils();
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java

@@ -18,8 +18,8 @@ package org.springframework.security.acls.jdbc;
 
 import javax.sql.DataSource;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -33,12 +33,12 @@ public class BasicLookupStrategyTests extends AbstractBasicLookupStrategyTests {
 
 	private static final BasicLookupStrategyTestsDbHelper DATABASE_HELPER = new BasicLookupStrategyTestsDbHelper();
 
-	@BeforeAll
+	@BeforeClass
 	public static void createDatabase() throws Exception {
 		DATABASE_HELPER.createDatabase();
 	}
 
-	@AfterAll
+	@AfterClass
 	public static void dropDatabase() {
 		DATABASE_HELPER.getDataSource().destroy();
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java

@@ -21,10 +21,11 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import junit.framework.Assert;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -36,7 +37,6 @@ import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.ObjectIdentity;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
@@ -60,18 +60,18 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 		return DATABASE_HELPER.getDataSource();
 	}
 
-	@BeforeAll
+	@BeforeClass
 	public static void createDatabase() throws Exception {
 		DATABASE_HELPER.createDatabase();
 	}
 
-	@AfterAll
+	@AfterClass
 	public static void dropDatabase() {
 		DATABASE_HELPER.getDataSource().destroy();
 	}
 
 	@Override
-	@BeforeEach
+	@Before
 	public void initializeBeans() {
 		super.initializeBeans();
 		this.uuidEnabledStrategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(),
@@ -81,7 +81,7 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 		this.uuidEnabledStrategy.setConversionService(new DefaultConversionService());
 	}
 
-	@BeforeEach
+	@Before
 	public void populateDatabaseForAclClassTypeTests() {
 		String query = "INSERT INTO acl_class(ID,CLASS,CLASS_ID_TYPE) VALUES (3,'" + TARGET_CLASS_WITH_UUID
 				+ "', 'java.util.UUID');"
@@ -99,8 +99,8 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS_WITH_UUID, OBJECT_IDENTITY_UUID);
 		Map<ObjectIdentity, Acl> foundAcls = this.uuidEnabledStrategy.readAclsById(Arrays.asList(oid),
 				Arrays.asList(BEN_SID));
-		assertThat(foundAcls).hasSize(1);
-		assertThat(foundAcls.get(oid)).isNotNull();
+		Assert.assertEquals(1, foundAcls.size());
+		Assert.assertNotNull(foundAcls.get(oid));
 	}
 
 	@Test
@@ -108,8 +108,8 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku
 		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 100L);
 		Map<ObjectIdentity, Acl> foundAcls = this.uuidEnabledStrategy.readAclsById(Arrays.asList(oid),
 				Arrays.asList(BEN_SID));
-		assertThat(foundAcls).hasSize(1);
-		assertThat(foundAcls.get(oid)).isNotNull();
+		Assert.assertEquals(1, foundAcls.size());
+		Assert.assertNotNull(foundAcls.get(oid));
 	}
 
 	@Test

acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@@ -26,14 +26,14 @@ import java.util.List;
 
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
 import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Andrei Stefan
  */
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class EhCacheBasedAclCacheTests {
 
 	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
@@ -77,7 +77,7 @@ public class EhCacheBasedAclCacheTests {
 
 	private MutableAcl acl;
 
-	@BeforeEach
+	@Before
 	public void setup() {
 		this.myCache = new EhCacheBasedAclCache(this.cache,
 				new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()),
@@ -89,7 +89,7 @@ public class EhCacheBasedAclCacheTests {
 		this.acl = new AclImpl(identity, 1L, aclAuthorizationStrategy, new ConsoleAuditLogger());
 	}
 
-	@AfterEach
+	@After
 	public void cleanup() {
 		SecurityContextHolder.clearContext();
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java

@@ -25,12 +25,12 @@ import java.util.UUID;
 
 import javax.sql.DataSource;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowMapper;
@@ -45,7 +45,6 @@ import org.springframework.security.acls.model.Sid;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -57,7 +56,7 @@ import static org.mockito.BDDMockito.given;
  *
  * @author Nena Raab
  */
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class JdbcAclServiceTests {
 
 	private EmbeddedDatabase embeddedDatabase;
@@ -75,20 +74,23 @@ public class JdbcAclServiceTests {
 
 	private JdbcAclService aclService;
 
-	@BeforeEach
+	@Before
 	public void setUp() {
+		this.aclService = new JdbcAclService(this.jdbcOperations, this.lookupStrategy);
+		this.aclServiceIntegration = new JdbcAclService(this.embeddedDatabase, this.lookupStrategy);
+	}
+
+	@Before
+	public void setUpEmbeddedDatabase() {
 		// @formatter:off
 		this.embeddedDatabase = new EmbeddedDatabaseBuilder()
 			.addScript("createAclSchemaWithAclClassIdType.sql")
 			.addScript("db/sql/test_data_hierarchy.sql")
 			.build();
 		// @formatter:on
-
-		this.aclService = new JdbcAclService(this.jdbcOperations, this.lookupStrategy);
-		this.aclServiceIntegration = new JdbcAclService(this.embeddedDatabase, this.lookupStrategy);
 	}
 
-	@AfterEach
+	@After
 	public void tearDownEmbeddedDatabase() {
 		this.embeddedDatabase.shutdown();
 	}
@@ -171,26 +173,6 @@ public class JdbcAclServiceTests {
 				.isEqualTo(UUID.fromString("25d93b3f-c3aa-4814-9d5e-c7c96ced7762"));
 	}
 
-	@Test
-	public void setObjectIdentityGeneratorWhenNullThenThrowsIllegalArgumentException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.aclServiceIntegration.setObjectIdentityGenerator(null))
-				.withMessage("objectIdentityGenerator cannot be null");
-	}
-
-	@Test
-	public void findChildrenWhenObjectIdentityGeneratorSetThenUsed() {
-		this.aclServiceIntegration
-				.setObjectIdentityGenerator((id, type) -> new ObjectIdentityImpl(type, "prefix:" + id));
-
-		ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US");
-		this.aclServiceIntegration.setAclClassIdSupported(true);
-		List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
-		assertThat(objectIdentities.size()).isEqualTo(1);
-		assertThat(objectIdentities.get(0).getType()).isEqualTo("location");
-		assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("prefix:US-PAL");
-	}
-
 	class MockLongIdDomainObject {
 
 		private Object id;

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java

@@ -22,8 +22,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -50,7 +49,7 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,10 +66,8 @@ import static org.mockito.Mockito.spy;
  * @author Ben Alex
  * @author Andrei Stefan
  */
-@Transactional
-@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "/jdbcMutableAclServiceTests-context.xml" })
-public class JdbcMutableAclServiceTests {
+public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4SpringContextTests {
 
 	private static final String TARGET_CLASS = TargetObject.class.getName();
 

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java

@@ -18,7 +18,7 @@ package org.springframework.security.acls.jdbc;
 
 import java.util.UUID;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.TargetObjectWithUUID;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;

acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java

@@ -18,9 +18,9 @@ package org.springframework.security.acls.jdbc;
 
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
@@ -56,7 +56,7 @@ public class SpringCacheBasedAclCacheTests {
 
 	private static CacheManager cacheManager;
 
-	@BeforeAll
+	@BeforeClass
 	public static void initCacheManaer() {
 		cacheManager = new ConcurrentMapCacheManager();
 		// Use disk caching immediately (to test for serialization issue reported in
@@ -64,7 +64,7 @@ public class SpringCacheBasedAclCacheTests {
 		cacheManager.getCache("springcasebasedacltests");
 	}
 
-	@AfterEach
+	@After
 	public void clearContext() {
 		SecurityContextHolder.clearContext();
 	}

acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.acls.sid;
 
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.security.acls.domain.GrantedAuthoritySid;

acl/src/test/java/org/springframework/security/acls/sid/SidTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.acls.sid;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import org.springframework.security.acls.domain.GrantedAuthoritySid;
 import org.springframework.security.acls.domain.PrincipalSid;

aspects/spring-security-aspects.gradle

@@ -10,13 +10,6 @@ dependencies {
 	api 'org.springframework:spring-core'
 
 	testImplementation 'org.springframework:spring-aop'
-	testImplementation "org.assertj:assertj-core"
-	testImplementation "org.junit.jupiter:junit-jupiter-api"
-	testImplementation "org.junit.jupiter:junit-jupiter-params"
-	testImplementation "org.junit.jupiter:junit-jupiter-engine"
-	testImplementation "org.mockito:mockito-core"
-	testImplementation "org.mockito:mockito-junit-jupiter"
-	testImplementation "org.springframework:spring-test"
 	testAspect sourceSets.main.output
 }
 
@@ -27,3 +20,7 @@ sourceSets.test.aspectj.srcDir "src/test/java"
 sourceSets.test.java.srcDirs = files()
 
 compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml"
+
+aspectj {
+	version = aspectjVersion
+}

aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java

@@ -20,9 +20,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -74,7 +74,7 @@ public class AnnotationSecurityAspectTests {
 
 	private PrePostSecured prePostSecured = new PrePostSecured();
 
-	@BeforeEach
+	@Before
 	public final void setUp() {
 		MockitoAnnotations.initMocks(this);
 		this.interceptor = new AspectJMethodSecurityInterceptor();
@@ -88,7 +88,7 @@ public class AnnotationSecurityAspectTests {
 		secAspect.setSecurityInterceptor(this.interceptor);
 	}
 
-	@AfterEach
+	@After
 	public void clearContext() {
 		SecurityContextHolder.clearContext();
 	}

build.gradle

@@ -2,26 +2,24 @@ buildscript {
 	dependencies {
 		classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
 		classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
-		classpath "io.freefair.gradle:aspectj-plugin:6.4.3.1"
+		classpath "io.freefair.gradle:aspectj-plugin:5.3.3.3"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-		classpath "com.netflix.nebula:nebula-project-plugin:8.2.0"
+		classpath "com.netflix.nebula:nebula-project-plugin:8.0.0"
 	}
 	repositories {
-		gradlePluginPortal()
+		maven { url 'https://repo.spring.io/plugins-snapshot' }
+		maven { url 'https://plugins.gradle.org/m2/' }
 	}
 }
 
 apply plugin: 'io.spring.nohttp'
 apply plugin: 'locks'
-apply plugin: 's101'
 apply plugin: 'io.spring.convention.root'
-apply plugin: 'io.spring.convention.include-check-remote'
 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'
-apply plugin: 'org.springframework.github.release'
 
 group = 'org.springframework.security'
 description = 'Spring Security'
@@ -35,7 +33,7 @@ repositories {
 }
 
 tasks.named("saganCreateRelease") {
-	referenceDocUrl = "https://docs.spring.io/spring-security/reference/{version}/index.html"
+	referenceDocUrl = "https://docs.spring.io/spring-security/site/docs/{version}/reference/html5/"
 	apiDocUrl = "https://docs.spring.io/spring-security/site/docs/{version}/api/"
 }
 
@@ -46,13 +44,6 @@ tasks.named("gitHubCheckMilestoneHasNoOpenIssues") {
 	}
 }
 
-tasks.named("createGitHubRelease") {
-	repository {
-		owner = "spring-projects"
-		name = "spring-security"
-	}
-}
-
 tasks.named("updateDependencies") {
 	// we aren't Gradle 7 compatible yet
 	checkForGradleUpdate = false
@@ -65,23 +56,18 @@ updateDependenciesSettings {
 	}
 	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()
-		alphaBetaVersions()
 		snapshotVersions()
 		addRule { components ->
-			components.withModule("commons-codec:commons-codec") { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
-					selection.reject("commons-codec updates break saml tests");
-				}
-			}
 			components.withModule("org.python:jython") { selection ->
 				ModuleComponentIdentifier candidate = selection.getCandidate();
 				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
@@ -101,17 +87,13 @@ updateDependenciesSettings {
 				if (candidate.getGroup().equals("org.opensaml")) {
 					selection.reject("org.opensaml maintains two different versions, so it must be updated manually");
 				}
-			}
-			components.withModule("io.spring.javaformat:spring-javaformat-gradle-plugin") { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
-					selection.reject("spring-javaformat-gradle-plugin updates break checkstyle");
-				}
-			}
-			components.withModule("io.spring.javaformat:spring-javaformat-checkstyle") { selection ->
-				ModuleComponentIdentifier candidate = selection.getCandidate();
-				if (!candidate.getVersion().equals(selection.getCurrentVersion())) {
-					selection.reject("spring-javaformat-checkstyle updates break checkstyle");
+				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")
+					}
 				}
 			}
 		}
@@ -168,19 +150,3 @@ nohttp {
 	source.exclude "buildSrc/build/**"
 
 }
-
-tasks.register('checkSamples') {
-	includeCheckRemote {
-		repository = 'spring-projects/spring-security-samples'
-		ref = samplesBranch
-		if (project.hasProperty("samplesInitScript")) {
-			initScripts = [samplesInitScript]
-			projectProperties = ["localRepositoryPath": localRepositoryPath, "springSecurityVersion": project.version]
-		}
-	}
-	dependsOn checkRemote
-}
-
-s101 {
-	configurationDirectory = project.file("etc/s101")
-}

buildSrc/build.gradle

@@ -9,6 +9,7 @@ plugins {
 sourceCompatibility = 1.8
 
 repositories {
+	jcenter()
 	gradlePluginPortal()
 	mavenCentral()
 	maven { url 'https://repo.spring.io/plugins-release/' }
@@ -27,10 +28,6 @@ sourceSets {
 
 gradlePlugin {
 	plugins {
-		checkAntoraVersion {
-			id = "org.springframework.antora.check-version"
-			implementationClass = "org.springframework.gradle.antora.CheckAntoraVersionPlugin"
-		}
 		trang {
 			id = "trang"
 			implementationClass = "trang.TrangPlugin"
@@ -59,14 +56,6 @@ gradlePlugin {
 			id = "org.springframework.github.changelog"
 			implementationClass = "org.springframework.gradle.github.changelog.GitHubChangelogPlugin"
 		}
-		githubRelease {
-			id = "org.springframework.github.release"
-			implementationClass = "org.springframework.gradle.github.release.GitHubReleasePlugin"
-		}
-		s101 {
-			id = "s101"
-			implementationClass = "s101.S101Plugin"
-		}
 	}
 }
 
@@ -80,39 +69,31 @@ 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 'org.yaml:snakeyaml:1.30'
 	implementation localGroovy()
 
 	implementation 'io.github.gradle-nexus:publish-plugin:1.1.0'
-	implementation 'io.projectreactor:reactor-core:3.5.0-M1'
+	implementation 'io.projectreactor:reactor-core:3.4.17'
 	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 'com.github.spullara.mustache.java:compiler:0.9.4'
+	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 'net.sourceforge.htmlunit:htmlunit:2.37.0'
+	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.24.20'
+	implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.10'
 	implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
 
-	testImplementation platform('org.junit:junit-bom:5.8.2')
-	testImplementation "org.junit.jupiter:junit-jupiter-api"
-	testImplementation "org.junit.jupiter:junit-jupiter-params"
-	testImplementation "org.junit.jupiter:junit-jupiter-engine"
+	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.12.4'
-	testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
+	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"
 }
 
 
-tasks.named('test', Test).configure {
-	onlyIf { !project.hasProperty("buildSrc.skipTests") }
-	useJUnitPlatform()
-	jvmArgs(
-			'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
-			'--add-opens', 'java.base/java.util=ALL-UNNAMED'
-	)
-}
+test.onlyIf { !project.hasProperty("buildSrc.skipTests") }

buildSrc/gradle/wrapper/gradle-wrapper.properties

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

buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy

@@ -1,104 +0,0 @@
-/*
- * Copyright 2002-2021 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
-
-import groovy.transform.CompileStatic
-import groovy.transform.TypeChecked
-import groovy.transform.TypeCheckingMode
-import org.gradle.api.DefaultTask
-import org.gradle.api.Task
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-
-/**
- * Checkout a project template from a git repository.
- *
- * @author Marcus Da Coregio
- */
-@CompileStatic
-abstract class IncludeRepoTask extends DefaultTask {
-
-	private static final String DEFAULT_URI_PREFIX = 'https://github.com/'
-
-	/**
-	 * Git repository to use. Will be prefixed with {@link #DEFAULT_URI_PREFIX} if it isn't already
-	 * @return
-	 */
-	@Input
-	abstract Property<String> getRepository();
-
-	/**
-	 * Git reference to use.
-	 */
-	@Input
-	abstract Property<String> getRef()
-
-	/**
-	 * Directory where the project template should be copied.
-	 */
-	@OutputDirectory
-	final File outputDirectory = project.file("$project.buildDir/$name")
-
-	@TaskAction
-	void checkoutAndCopy() {
-		outputDirectory.deleteDir()
-		File checkoutDir = checkout(this, getRemoteUri(), ref.get())
-		moveToOutputDir(checkoutDir, outputDirectory)
-	}
-
-	private static File cleanTemporaryDir(Task task, File tmpDir) {
-		if (tmpDir.exists()) {
-			task.project.delete(tmpDir)
-		}
-		return tmpDir
-	}
-
-	static File checkout(Task task, String remoteUri, String ref) {
-		checkout(task, remoteUri, ref, task.getTemporaryDir())
-	}
-
-	@TypeChecked(TypeCheckingMode.SKIP)
-	static File checkout(Task task, String remoteUri, String ref, File checkoutDir) {
-		cleanTemporaryDir(task, checkoutDir)
-		task.project.exec {
-			commandLine = ["git", "clone", "--no-checkout", remoteUri, checkoutDir.absolutePath]
-			errorOutput = System.err
-		}
-		task.project.exec {
-			commandLine = ["git", "checkout", ref]
-			workingDir = checkoutDir
-			errorOutput = System.err
-		}
-		return checkoutDir
-	}
-
-	private static void moveToOutputDir(File tmpDir, File outputDirectory) {
-		File baseDir = tmpDir
-		baseDir.renameTo(outputDirectory)
-	}
-
-	private String getRemoteUri() {
-		String remoteUri = this.repository.get()
-		if (remoteUri.startsWith(DEFAULT_URI_PREFIX)) {
-			return remoteUri
-		}
-		return DEFAULT_URI_PREFIX + remoteUri
-	}
-}

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

@@ -16,17 +16,20 @@
 
 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.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 org.springframework.gradle.CopyPropertiesPlugin
-import org.springframework.gradle.propdeps.PropDepsEclipsePlugin
-import org.springframework.gradle.propdeps.PropDepsIdeaPlugin
-import org.springframework.gradle.propdeps.PropDepsPlugin;
+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
@@ -37,7 +40,7 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 	public final void apply(Project project) {
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(JavaPlugin.class);
-		pluginManager.apply(ManagementConfigurationPlugin.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()) {
@@ -49,8 +52,12 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 		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);
@@ -62,9 +69,6 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 			manifest.attributes["Implementation-Version"] = project.version
 			manifest.attributes["Automatic-Module-Name"] = project.name.replace('-', '.')
 		}
-        project.test {
-            useJUnitPlatform()
-        }
 		additionalPlugins(project);
 	}
 

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

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

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

@@ -1,9 +1,12 @@
 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.BasePlugin
 import org.gradle.api.plugins.PluginManager
 import org.gradle.api.tasks.bundling.Zip
 
@@ -16,18 +19,54 @@ public class DocsPlugin implements Plugin<Project> {
 	public void apply(Project project) {
 
 		PluginManager pluginManager = project.getPluginManager();
-		pluginManager.apply(BasePlugin);
+		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'
+			dependsOn 'api', 'asciidoctor'
 			group = 'Distribution'
 			archiveBaseName = project.rootProject.name
 			archiveClassifier = 'docs'
-			description = "Builds -${archiveClassifier.get()} archive containing all " +
+			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'
 			}

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

@@ -1,80 +0,0 @@
-/*
- * Copyright 2002-2022 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.IncludeRepoTask
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.tasks.GradleBuild
-import org.gradle.api.tasks.TaskProvider
-
-/**
- * Adds a set of tasks that make easy to clone a remote repository and perform some task
- *
- * @author Marcus Da Coregio
- */
-class IncludeCheckRemotePlugin implements Plugin<Project> {
-	@Override
-	void apply(Project project) {
-		IncludeCheckRemoteExtension extension = project.extensions.create('includeCheckRemote', IncludeCheckRemoteExtension)
-		TaskProvider<IncludeRepoTask> includeRepoTask = project.tasks.register('includeRepo', IncludeRepoTask) { IncludeRepoTask it ->
-			it.repository = extension.repository
-			it.ref = extension.ref
-		}
-		project.tasks.register('checkRemote', GradleBuild) {
-			it.dependsOn 'includeRepo'
-			it.dir = includeRepoTask.get().outputDirectory
-			it.tasks = extension.getTasks()
-			extension.getInitScripts().forEach {script ->
-				it.startParameter.addInitScript(new File(script))
-			}
-			extension.getProjectProperties().entrySet().forEach { entry ->
-				it.startParameter.projectProperties.put(entry.getKey(), entry.getValue())
-			}
-		}
-	}
-
-	abstract static class IncludeCheckRemoteExtension {
-
-		/**
-		 * Git repository to clone
-		 */
-		String repository;
-
-		/**
-		 * Git ref to checkout
-		 */
-		String ref
-
-		/**
-		 * Task to run in the repository
-		 */
-		List<String> tasks = ['check']
-
-		/**
-		 * Init scripts for the build
-		 */
-		List<String> initScripts = []
-
-		/**
-		 * Map of properties for the build
-		 */
-		Map<String, String> projectProperties = [:]
-
-	}
-
-}

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

@@ -15,6 +15,7 @@
  */
 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
@@ -23,7 +24,6 @@ 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
-import org.springframework.gradle.propdeps.PropDepsPlugin
 
 /**
  *
@@ -54,27 +54,19 @@ public class IntegrationTestPlugin implements Plugin<Project> {
 		}
 		project.configurations {
 			integrationTestCompile {
-				extendsFrom testImplementation
+				extendsFrom testCompile, testImplementation
 			}
 			integrationTestRuntime {
 				extendsFrom integrationTestCompile, testRuntime, testRuntimeOnly
 			}
-			integrationTestCompileClasspath {
-				extendsFrom integrationTestCompile
-				canBeResolved = true
-			}
-			integrationTestRuntimeClasspath {
-				extendsFrom integrationTestRuntime
-				canBeResolved = true
-			}
 		}
 
 		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.integrationTestCompileClasspath
-				runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntimeClasspath
+				compileClasspath = project.sourceSets.main.output + project.sourceSets.test.output + project.configurations.integrationTestCompile
+				runtimeClasspath = output + compileClasspath + project.configurations.integrationTestRuntime
 			}
 		}
 
@@ -85,7 +77,6 @@ public class IntegrationTestPlugin implements Plugin<Project> {
 			testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
 			classpath = project.sourceSets.integrationTest.runtimeClasspath
 			shouldRunAfter project.tasks.test
-			useJUnitPlatform()
 		}
 		project.tasks.check.dependsOn integrationTestTask
 
@@ -93,7 +84,7 @@ public class IntegrationTestPlugin implements Plugin<Project> {
 			project.idea {
 				module {
 					testSourceDirs += project.file('src/integration-test/java')
-					scopes.TEST.plus += [ project.configurations.integrationTestCompileClasspath ]
+					scopes.TEST.plus += [ project.configurations.integrationTestCompile ]
 				}
 			}
 		}
@@ -123,7 +114,7 @@ public class IntegrationTestPlugin implements Plugin<Project> {
 
 		project.plugins.withType(EclipsePlugin) {
 			project.eclipse.classpath {
-				plusConfigurations += [ project.configurations.integrationTestCompileClasspath ]
+				plusConfigurations += [ project.configurations.integrationTestCompile ]
 			}
 		}
 	}

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

@@ -1,21 +1,7 @@
-/*
- * Copyright 2002-2021 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.artifacts.ConfigurationContainer;
@@ -26,8 +12,6 @@ import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
-import org.springframework.gradle.propdeps.PropDepsPlugin;
-
 /**
  * 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
@@ -71,4 +55,5 @@ public class ManagementConfigurationPlugin implements Plugin<Project> {
 			}));
 		});
 	}
-}
+}
+

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

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

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

@@ -35,6 +35,11 @@ class RepositoryConventionPlugin implements Plugin<Project> {
 				mavenLocal()
 			}
 			mavenCentral()
+			jcenter() {
+				content {
+					includeGroup "org.gretty"
+				}
+			}
 			if (isSnapshot) {
 				maven {
 					name = 'artifactory-snapshot'

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

@@ -21,7 +21,6 @@ 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.classpath.CheckProhibitedDependenciesLifecyclePlugin
 import org.springframework.gradle.maven.SpringNexusPublishPlugin
 
 class RootProjectPlugin implements Plugin<Project> {
@@ -33,7 +32,6 @@ class RootProjectPlugin implements Plugin<Project> {
 		pluginManager.apply(SchemaPlugin)
 		pluginManager.apply(NoHttpPlugin)
 		pluginManager.apply(SpringNexusPublishPlugin)
-		pluginManager.apply(CheckProhibitedDependenciesLifecyclePlugin)
 		pluginManager.apply("org.sonarqube")
 
 		project.repositories.mavenCentral()

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

@@ -20,7 +20,6 @@ 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.classpath.CheckClasspathForProhibitedDependenciesPlugin;
 import org.springframework.gradle.maven.SpringMavenPlugin;
 
 /**
@@ -33,13 +32,15 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(JavaLibraryPlugin.class)
 		pluginManager.apply(SpringMavenPlugin.class);
-		pluginManager.apply(CheckClasspathForProhibitedDependenciesPlugin.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)) {
+		if (Utils.isRelease(project)) {
+			deployArtifacts.dependsOn project.tasks.uploadArchives
+		}
+		else {
 			deployArtifacts.dependsOn project.tasks.artifactoryPublish
 		}
 	}

buildSrc/src/main/java/io/spring/gradle/convention/AsciidoctorConventionPlugin.java

@@ -0,0 +1,208 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.spring.gradle.convention;
+
+import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider;
+import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask;
+import org.asciidoctor.gradle.jvm.AsciidoctorJExtension;
+import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
+import org.asciidoctor.gradle.jvm.AsciidoctorTask;
+import org.gradle.api.Action;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.artifacts.dsl.RepositoryHandler;
+import org.gradle.api.file.CopySpec;
+import org.gradle.api.file.FileTree;
+import org.gradle.api.tasks.Sync;
+
+import java.io.File;
+import java.net.URI;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.function.Consumer;
+
+/**
+ * Conventions that are applied in the presence of the {@link AsciidoctorJPlugin}. When
+ * the plugin is applied:
+ *
+ * <ul>
+ * <li>All warnings are made fatal.
+ * <li>A task is created to resolve and unzip our documentation resources (CSS and
+ * Javascript).
+ * <li>For each {@link AsciidoctorTask} (HTML only):
+ * <ul>
+ * <li>A configuration named asciidoctorExtensions is ued to add the
+ * <a href="https://github.com/spring-io/spring-asciidoctor-extensions#block-switch">block
+ * switch</a> extension
+ * <li>{@code doctype} {@link AsciidoctorTask#options(Map) option} is configured.
+ * <li>{@link AsciidoctorTask#attributes(Map) Attributes} are configured for syntax
+ * highlighting, CSS styling, docinfo, etc.
+ * </ul>
+ * <li>For each {@link AbstractAsciidoctorTask} (HTML and PDF):
+ * <ul>
+ * <li>{@link AsciidoctorTask#attributes(Map) Attributes} are configured to enable
+ * warnings for references to missing attributes, the year is added as @{code today-year},
+ * etc
+ * <li>{@link AbstractAsciidoctorTask#baseDirFollowsSourceDir() baseDirFollowsSourceDir()}
+ * is enabled.
+ * </ul>
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ * @author Rob Winch
+ */
+public class AsciidoctorConventionPlugin implements Plugin<Project> {
+
+	public void apply(Project project) {
+		project.getPlugins().withType(AsciidoctorJPlugin.class, (asciidoctorPlugin) -> {
+			createDefaultAsciidoctorRepository(project);
+			makeAllWarningsFatal(project);
+			Sync unzipResources = createUnzipDocumentationResourcesTask(project);
+			project.getTasks().withType(AbstractAsciidoctorTask.class, (asciidoctorTask) -> {
+				asciidoctorTask.dependsOn(unzipResources);
+				configureExtensions(project, asciidoctorTask);
+				configureCommonAttributes(project, asciidoctorTask);
+				configureOptions(asciidoctorTask);
+				asciidoctorTask.baseDirFollowsSourceDir();
+				asciidoctorTask.useIntermediateWorkDir();
+				asciidoctorTask.resources(new Action<CopySpec>() {
+					@Override
+					public void execute(CopySpec resourcesSpec) {
+						resourcesSpec.from(unzipResources);
+						resourcesSpec.from(asciidoctorTask.getSourceDir(), new Action<CopySpec>() {
+							@Override
+							public void execute(CopySpec resourcesSrcDirSpec) {
+								// https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/523
+								// For now copy the entire sourceDir over so that include files are
+								// available in the intermediateWorkDir
+								// resourcesSrcDirSpec.include("images/**");
+							}
+						});
+					}
+				});
+				if (asciidoctorTask instanceof AsciidoctorTask) {
+					configureHtmlOnlyAttributes(project, asciidoctorTask);
+				}
+			});
+		});
+	}
+
+	private void createDefaultAsciidoctorRepository(Project project) {
+		project.getGradle().afterProject(new Action<Project>() {
+			@Override
+			public void execute(Project project) {
+				RepositoryHandler repositories = project.getRepositories();
+				if (repositories.isEmpty()) {
+					repositories.mavenCentral();
+					repositories.maven(repo -> {
+						repo.setUrl(URI.create("https://repo.spring.io/release"));
+					});
+				}
+			}
+		});
+	}
+
+	private void makeAllWarningsFatal(Project project) {
+		project.getExtensions().getByType(AsciidoctorJExtension.class).fatalWarnings(".*");
+	}
+
+	private void configureExtensions(Project project, AbstractAsciidoctorTask asciidoctorTask) {
+		Configuration extensionsConfiguration = project.getConfigurations().maybeCreate("asciidoctorExtensions");
+		extensionsConfiguration.defaultDependencies(new Action<DependencySet>() {
+			@Override
+			public void execute(DependencySet dependencies) {
+				dependencies.add(project.getDependencies().create("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.2.RELEASE"));
+			}
+		});
+		asciidoctorTask.configurations(extensionsConfiguration);
+	}
+
+	private Sync createUnzipDocumentationResourcesTask(Project project) {
+		Configuration documentationResources = project.getConfigurations().maybeCreate("documentationResources");
+		documentationResources.getDependencies()
+				.add(project.getDependencies().create("io.spring.docresources:spring-doc-resources:0.2.5"));
+		Sync unzipResources = project.getTasks().create("unzipDocumentationResources",
+				Sync.class, new Action<Sync>() {
+					@Override
+			public void execute(Sync sync) {
+				sync.dependsOn(documentationResources);
+				sync.from(new Callable<List<FileTree>>() {
+					@Override
+					public List<FileTree> call() throws Exception {
+						List<FileTree> result = new ArrayList<>();
+						documentationResources.getAsFileTree().forEach(new Consumer<File>() {
+							@Override
+							public void accept(File file) {
+								result.add(project.zipTree(file));
+							}
+						});
+						return result;
+					}
+				});
+				File destination = new File(project.getBuildDir(), "docs/resources");
+				sync.into(project.relativePath(destination));
+			}
+		});
+		return unzipResources;
+	}
+
+	private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {
+		asciidoctorTask.options(Collections.singletonMap("doctype", "book"));
+	}
+
+	private void configureHtmlOnlyAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) {
+		Map<String, Object> attributes = new HashMap<>();
+		attributes.put("source-highlighter", "highlight.js");
+		attributes.put("highlightjsdir", "js/highlight");
+		attributes.put("highlightjs-theme", "github");
+		attributes.put("linkcss", true);
+		attributes.put("icons", "font");
+		attributes.put("stylesheet", "css/spring.css");
+		asciidoctorTask.getAttributeProviders().add(new AsciidoctorAttributeProvider() {
+			@Override
+			public Map<String, Object> getAttributes() {
+				Object version = project.getVersion();
+				Map<String, Object> attrs = new HashMap<>();
+				if (version != null && version.toString() != Project.DEFAULT_VERSION) {
+					attrs.put("revnumber", version);
+				}
+				return attrs;
+			}
+		});
+		asciidoctorTask.attributes(attributes);
+	}
+
+	private void configureCommonAttributes(Project project, AbstractAsciidoctorTask asciidoctorTask) {
+		Map<String, Object> attributes = new HashMap<>();
+		attributes.put("attribute-missing", "warn");
+		attributes.put("icons", "font");
+		attributes.put("idprefix", "");
+		attributes.put("idseparator", "-");
+		attributes.put("docinfo", "shared");
+		attributes.put("sectanchors", "");
+		attributes.put("sectnums", "");
+		attributes.put("today-year", LocalDate.now().getYear());
+		asciidoctorTask.attributes(attributes);
+	}
+}

buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionPlugin.java

@@ -1,85 +0,0 @@
-package org.springframework.gradle.antora;
-
-import org.gradle.api.Action;
-import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.tasks.TaskProvider;
-import org.gradle.language.base.plugins.LifecycleBasePlugin;
-
-public class CheckAntoraVersionPlugin implements Plugin<Project> {
-	public static final String ANTORA_CHECK_VERSION_TASK_NAME = "antoraCheckVersion";
-
-	@Override
-	public void apply(Project project) {
-		TaskProvider<CheckAntoraVersionTask> antoraCheckVersion = project.getTasks().register(ANTORA_CHECK_VERSION_TASK_NAME, CheckAntoraVersionTask.class, new Action<CheckAntoraVersionTask>() {
-			@Override
-			public void execute(CheckAntoraVersionTask antoraCheckVersion) {
-				antoraCheckVersion.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
-				antoraCheckVersion.setDescription("Checks the antora.yml version properties match the Gradle version");
-				antoraCheckVersion.getAntoraVersion().convention(project.provider(() -> getDefaultAntoraVersion(project)));
-				antoraCheckVersion.getAntoraPrerelease().convention(project.provider(() -> getDefaultAntoraPrerelease(project)));
-				antoraCheckVersion.getAntoraDisplayVersion().convention(project.provider(() -> getDefaultAntoraDisplayVersion(project)));
-				antoraCheckVersion.getAntoraYmlFile().fileProvider(project.provider(() -> project.file("antora.yml")));
-			}
-		});
-		project.getPlugins().withType(LifecycleBasePlugin.class, new Action<LifecycleBasePlugin>() {
-			@Override
-			public void execute(LifecycleBasePlugin lifecycleBasePlugin) {
-				project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(new Action<Task>() {
-					@Override
-					public void execute(Task check) {
-						check.dependsOn(antoraCheckVersion);
-					}
-				});
-			}
-		});
-	}
-
-	private static String getDefaultAntoraVersion(Project project) {
-		String projectVersion = getProjectVersion(project);
-		int preReleaseIndex = getSnapshotIndex(projectVersion);
-		return isSnapshot(projectVersion) ? projectVersion.substring(0, preReleaseIndex) : projectVersion;
-	}
-
-	private static String getDefaultAntoraPrerelease(Project project) {
-		String projectVersion = getProjectVersion(project);
-		if (isSnapshot(projectVersion)) {
-			int preReleaseIndex = getSnapshotIndex(projectVersion);
-			return projectVersion.substring(preReleaseIndex);
-		}
-		if (isPreRelease(projectVersion)) {
-			return Boolean.TRUE.toString();
-		}
-		return null;
-	}
-
-	private static String getDefaultAntoraDisplayVersion(Project project) {
-		String projectVersion = getProjectVersion(project);
-		if (!isSnapshot(projectVersion) && isPreRelease(projectVersion)) {
-			return getDefaultAntoraVersion(project);
-		}
-		return null;
-	}
-
-	private static String getProjectVersion(Project project) {
-		Object projectVersion = project.getVersion();
-		if (projectVersion == null) {
-			throw new GradleException("Please define antoraVersion and antoraPrerelease on " + ANTORA_CHECK_VERSION_TASK_NAME + " or provide a Project version so they can be defaulted");
-		}
-		return String.valueOf(projectVersion);
-	}
-
-	private static boolean isSnapshot(String projectVersion) {
-		return getSnapshotIndex(projectVersion) >= 0;
-	}
-
-	private static int getSnapshotIndex(String projectVersion) {
-		return projectVersion.lastIndexOf("-SNAPSHOT");
-	}
-
-	private static boolean isPreRelease(String projectVersion) {
-		return projectVersion.lastIndexOf("-") >= 0;
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java

@@ -1,96 +0,0 @@
-package org.springframework.gradle.antora;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.TaskAction;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.representer.Representer;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public abstract class CheckAntoraVersionTask extends DefaultTask {
-
-	@TaskAction
-	public void check() throws FileNotFoundException {
-		File antoraYmlFile = getAntoraYmlFile().getAsFile().get();
-		String expectedAntoraVersion = getAntoraVersion().get();
-		String expectedAntoraPrerelease = getAntoraPrerelease().getOrElse(null);
-		String expectedAntoraDisplayVersion = getAntoraDisplayVersion().getOrElse(null);
-
-		Representer representer = new Representer();
-		representer.getPropertyUtils().setSkipMissingProperties(true);
-
-		Yaml yaml = new Yaml(new Constructor(AntoraYml.class), representer);
-		AntoraYml antoraYml = yaml.load(new FileInputStream(antoraYmlFile));
-
-		String actualAntoraPrerelease = antoraYml.getPrerelease();
-		boolean preReleaseMatches = antoraYml.getPrerelease() == null && expectedAntoraPrerelease == null ||
-				(actualAntoraPrerelease != null && actualAntoraPrerelease.equals(expectedAntoraPrerelease));
-		String actualAntoraDisplayVersion = antoraYml.getDisplay_version();
-		boolean displayVersionMatches = antoraYml.getDisplay_version() == null && expectedAntoraDisplayVersion == null ||
-				(actualAntoraDisplayVersion != null && actualAntoraDisplayVersion.equals(expectedAntoraDisplayVersion));
-		String actualAntoraVersion = antoraYml.getVersion();
-		if (!preReleaseMatches ||
-				!displayVersionMatches ||
-				!expectedAntoraVersion.equals(actualAntoraVersion)) {
-			throw new GradleException("The Gradle version of '" + getProject().getVersion() + "' should have version: '"
-					+ expectedAntoraVersion + "' prerelease: '" + expectedAntoraPrerelease + "' display_version: '"
-					+ expectedAntoraDisplayVersion + "' defined in " + antoraYmlFile + " but got version: '"
-					+ actualAntoraVersion + "' prerelease: '" + actualAntoraPrerelease + "' display_version: '" + actualAntoraDisplayVersion + "'");
-		}
-	}
-
-	@InputFile
-	public abstract RegularFileProperty getAntoraYmlFile();
-
-	@Input
-	public abstract Property<String> getAntoraVersion();
-
-	@Input
-	@Optional
-	public abstract Property<String> getAntoraPrerelease();
-
-	@Input
-	@Optional
-	public abstract Property<String> getAntoraDisplayVersion();
-
-	public static class AntoraYml {
-		private String version;
-
-		private String prerelease;
-
-		private String display_version;
-
-		public String getVersion() {
-			return version;
-		}
-
-		public void setVersion(String version) {
-			this.version = version;
-		}
-
-		public String getPrerelease() {
-			return prerelease;
-		}
-
-		public void setPrerelease(String prerelease) {
-			this.prerelease = prerelease;
-		}
-
-		public String getDisplay_version() {
-			return display_version;
-		}
-
-		public void setDisplay_version(String display_version) {
-			this.display_version = display_version;
-		}
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java

@@ -1,99 +0,0 @@
-/*
- * Copyright 2012-2022 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 org.springframework.gradle.classpath;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.Task;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.ResolvedConfiguration;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.tasks.Classpath;
-import org.gradle.api.tasks.TaskAction;
-
-import java.io.IOException;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-/**
- * A {@link Task} for checking the classpath for prohibited dependencies.
- *
- * @author Andy Wilkinson
- */
-public class CheckClasspathForProhibitedDependencies extends DefaultTask {
-
-	private Configuration classpath;
-
-	public CheckClasspathForProhibitedDependencies() {
-		getOutputs().upToDateWhen((task) -> true);
-	}
-
-	public void setClasspath(Configuration classpath) {
-		this.classpath = classpath;
-	}
-
-	@Classpath
-	public FileCollection getClasspath() {
-		return this.classpath;
-	}
-
-	@TaskAction
-	public void checkForProhibitedDependencies() throws IOException {
-		ResolvedConfiguration resolvedConfiguration = this.classpath.getResolvedConfiguration();
-		TreeSet<String> prohibited = resolvedConfiguration.getResolvedArtifacts().stream()
-				.map((artifact) -> artifact.getModuleVersion().getId()).filter(this::prohibited)
-				.map((id) -> id.getGroup() + ":" + id.getName()).collect(Collectors.toCollection(TreeSet::new));
-		if (!prohibited.isEmpty()) {
-			StringBuilder message = new StringBuilder(String.format("Found prohibited dependencies in '%s':%n", this.classpath.getName()));
-			for (String dependency : prohibited) {
-				message.append(String.format("    %s%n", dependency));
-			}
-			throw new GradleException(message.toString());
-		}
-	}
-
-	private boolean prohibited(ModuleVersionIdentifier id) {
-		String group = id.getGroup();
-		if (group.equals("javax.batch")) {
-			return false;
-		}
-		if (group.equals("javax.cache")) {
-			return false;
-		}
-		if (group.equals("javax.money")) {
-			return false;
-		}
-		if (group.startsWith("javax")) {
-			return true;
-		}
-		if (group.equals("commons-logging")) {
-			return true;
-		}
-		if (group.equals("org.slf4j") && id.getName().equals("jcl-over-slf4j")) {
-			return true;
-		}
-		if (group.startsWith("org.jboss.spec")) {
-			return true;
-		}
-		if (group.equals("org.apache.geronimo.specs")) {
-			return true;
-		}
-		return false;
-	}
-
-}

buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependenciesPlugin.java

@@ -1,67 +0,0 @@
-/*
- * Copyright 2012-2022 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 org.springframework.gradle.classpath;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.plugins.JavaBasePlugin;
-import org.gradle.api.tasks.SourceSetContainer;
-import org.gradle.api.tasks.TaskProvider;
-import org.gradle.language.base.plugins.LifecycleBasePlugin;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Andy Wilkinson
- * @author Rob Winch
- */
-public class CheckClasspathForProhibitedDependenciesPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getPlugins().apply(CheckProhibitedDependenciesLifecyclePlugin.class);
-		project.getPlugins().withType(JavaBasePlugin.class, javaBasePlugin -> {
-			configureProhibitedDependencyChecks(project);
-		});
-	}
-
-	private void configureProhibitedDependencyChecks(Project project) {
-		SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-		sourceSets.all((sourceSet) -> createProhibitedDependenciesChecks(project,
-				sourceSet.getCompileClasspathConfigurationName(), sourceSet.getRuntimeClasspathConfigurationName()));
-	}
-
-	private void createProhibitedDependenciesChecks(Project project, String... configurationNames) {
-		ConfigurationContainer configurations = project.getConfigurations();
-		for (String configurationName : configurationNames) {
-			Configuration configuration = configurations.getByName(configurationName);
-			createProhibitedDependenciesCheck(configuration, project);
-		}
-	}
-
-	private void createProhibitedDependenciesCheck(Configuration classpath, Project project) {
-		String taskName = "check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies");
-		TaskProvider<CheckClasspathForProhibitedDependencies> checkClasspathTask = project.getTasks().register(taskName,
-				CheckClasspathForProhibitedDependencies.class, checkClasspath -> {
-					checkClasspath.setGroup(LifecycleBasePlugin.CHECK_TASK_NAME);
-					checkClasspath.setDescription("Checks " + classpath.getName() + " for prohibited dependencies");
-					checkClasspath.setClasspath(classpath);
-				});
-		project.getTasks().named(CheckProhibitedDependenciesLifecyclePlugin.CHECK_PROHIBITED_DEPENDENCIES_TASK_NAME, checkProhibitedTask -> checkProhibitedTask.dependsOn(checkClasspathTask));
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/classpath/CheckProhibitedDependenciesLifecyclePlugin.java

@@ -1,41 +0,0 @@
-/*
- * Copyright 2012-2022 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 org.springframework.gradle.classpath;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.plugins.JavaBasePlugin;
-import org.gradle.api.tasks.TaskProvider;
-
-/**
- * @author Rob Winch
- */
-public class CheckProhibitedDependenciesLifecyclePlugin implements Plugin<Project> {
-	public static final String CHECK_PROHIBITED_DEPENDENCIES_TASK_NAME = "checkForProhibitedDependencies";
-
-	@Override
-	public void apply(Project project) {
-		TaskProvider<Task> checkProhibitedDependencies = project.getTasks().register(CheckProhibitedDependenciesLifecyclePlugin.CHECK_PROHIBITED_DEPENDENCIES_TASK_NAME, task -> {
-			task.setGroup(JavaBasePlugin.VERIFICATION_GROUP);
-			task.setDescription("Checks both the compile/runtime classpath of every SourceSet for prohibited dependencies");
-		});
-		project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME, checkTask -> {
-			checkTask.dependsOn(checkProhibitedDependencies);
-		});
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/github/changelog/GitHubChangelogPlugin.java

@@ -16,9 +16,6 @@
 
 package org.springframework.gradle.github.changelog;
 
-import java.io.File;
-import java.nio.file.Paths;
-
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -31,10 +28,12 @@ import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
 import org.gradle.api.artifacts.repositories.IvyPatternRepositoryLayout;
 import org.gradle.api.tasks.JavaExec;
 
+import java.io.File;
+import java.nio.file.Paths;
+
 public class GitHubChangelogPlugin implements Plugin<Project> {
 
 	public static final String CHANGELOG_GENERATOR_CONFIGURATION_NAME = "changelogGenerator";
-	public static final String RELEASE_NOTES_PATH = "changelog/release-notes.md";
 
 	@Override
 	public void apply(Project project) {
@@ -43,7 +42,7 @@ public class GitHubChangelogPlugin implements Plugin<Project> {
 		project.getTasks().register("generateChangelog", JavaExec.class, new Action<JavaExec>() {
 			@Override
 			public void execute(JavaExec generateChangelog) {
-				File outputFile = project.file(Paths.get(project.getBuildDir().getPath(), RELEASE_NOTES_PATH));
+				File outputFile = project.file(Paths.get(project.getBuildDir().getPath(), "changelog/release-notes.md"));
 				outputFile.getParentFile().mkdirs();
 				generateChangelog.setGroup("Release");
 				generateChangelog.setDescription("Generates the changelog");

buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneApi.java

@@ -16,9 +16,6 @@
 
 package org.springframework.gradle.github.milestones;
 
-import java.io.IOException;
-import java.util.List;
-
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import okhttp3.Interceptor;
@@ -26,7 +23,8 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-import org.springframework.gradle.github.RepositoryRef;
+import java.io.IOException;
+import java.util.List;
 
 public class GitHubMilestoneApi {
 	private String baseUrl = "https://api.github.com";

buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestoneHasNoOpenIssuesTask.java

@@ -21,8 +21,6 @@ import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 
-import org.springframework.gradle.github.RepositoryRef;
-
 public class GitHubMilestoneHasNoOpenIssuesTask extends DefaultTask {
 	@Input
 	private RepositoryRef repository = new RepositoryRef();

buildSrc/src/main/java/org/springframework/gradle/github/milestones/GitHubMilestonePlugin.java

@@ -29,7 +29,7 @@ public class GitHubMilestonePlugin implements Plugin<Project> {
 				githubCheckMilestoneHasNoOpenIssues.setGroup("Release");
 				githubCheckMilestoneHasNoOpenIssues.setDescription("Checks if there are any open issues for the specified repository and milestone");
 				githubCheckMilestoneHasNoOpenIssues.setMilestoneTitle((String) project.findProperty("nextVersion"));
-				if (project.hasProperty("gitHubAccessToken")) {
+				if (project.hasProperty("githubAccessToken")) {
 					githubCheckMilestoneHasNoOpenIssues.setGitHubAccessToken((String) project.findProperty("gitHubAccessToken"));
 				}
 			}

buildSrc/src/main/java/org/springframework/gradle/github/milestones/RepositoryRef.java

@@ -1,11 +1,10 @@
-package org.springframework.gradle.github;
-
+package org.springframework.gradle.github.milestones;
 public class RepositoryRef {
 	private String owner;
 
 	private String name;
 
-	public RepositoryRef() {
+	RepositoryRef() {
 	}
 
 	public RepositoryRef(String owner, String name) {
@@ -63,3 +62,4 @@ public class RepositoryRef {
 		}
 	}
 }
+

buildSrc/src/main/java/org/springframework/gradle/github/release/CreateGitHubReleaseTask.java

@@ -1,130 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.github.release;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import org.gradle.api.Action;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.TaskAction;
-
-import org.springframework.gradle.github.RepositoryRef;
-import org.springframework.gradle.github.changelog.GitHubChangelogPlugin;
-
-/**
- * @author Steve Riesenberg
- */
-public class CreateGitHubReleaseTask extends DefaultTask {
-	@Input
-	private RepositoryRef repository = new RepositoryRef();
-
-	@Input @Optional
-	private String gitHubAccessToken;
-
-	@Input
-	private String version;
-
-	@Input @Optional
-	private String branch = "main";
-
-	@Input
-	private boolean createRelease = false;
-
-	@TaskAction
-	public void createGitHubRelease() {
-		String body = readReleaseNotes();
-		Release release = Release.tag(this.version)
-				.commit(this.branch)
-				.name(this.version)
-				.body(body)
-				.preRelease(this.version.contains("-"))
-				.build();
-
-		System.out.printf("%sCreating GitHub release for %s/%s@%s\n",
-				this.createRelease ? "" : "[DRY RUN] ",
-				this.repository.getOwner(),
-				this.repository.getName(),
-				this.version
-		);
-		System.out.printf("  Release Notes:\n\n----\n%s\n----\n\n", body.trim());
-
-		if (this.createRelease) {
-			GitHubReleaseApi github = new GitHubReleaseApi(this.gitHubAccessToken);
-			github.publishRelease(this.repository, release);
-		}
-	}
-
-	private String readReleaseNotes() {
-		Project project = getProject();
-		File inputFile = project.file(Paths.get(project.getBuildDir().getPath(), GitHubChangelogPlugin.RELEASE_NOTES_PATH));
-		try {
-			return Files.readString(inputFile.toPath());
-		} catch (IOException ex) {
-			throw new RuntimeException("Unable to read release notes from " + inputFile, ex);
-		}
-	}
-
-	public RepositoryRef getRepository() {
-		return repository;
-	}
-
-	public void repository(Action<RepositoryRef> repository) {
-		repository.execute(this.repository);
-	}
-
-	public void setRepository(RepositoryRef repository) {
-		this.repository = repository;
-	}
-
-	public String getGitHubAccessToken() {
-		return gitHubAccessToken;
-	}
-
-	public void setGitHubAccessToken(String gitHubAccessToken) {
-		this.gitHubAccessToken = gitHubAccessToken;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public String getBranch() {
-		return branch;
-	}
-
-	public void setBranch(String branch) {
-		this.branch = branch;
-	}
-
-	public boolean isCreateRelease() {
-		return createRelease;
-	}
-
-	public void setCreateRelease(boolean createRelease) {
-		this.createRelease = createRelease;
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleaseApi.java

@@ -1,91 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.github.release;
-
-import java.io.IOException;
-
-import com.google.gson.Gson;
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-import org.springframework.gradle.github.RepositoryRef;
-
-/**
- * Manage GitHub releases.
- *
- * @author Steve Riesenberg
- */
-public class GitHubReleaseApi {
-	private String baseUrl = "https://api.github.com";
-
-	private final OkHttpClient httpClient;
-	private Gson gson = new Gson();
-
-	public GitHubReleaseApi(String gitHubAccessToken) {
-		this.httpClient = new OkHttpClient.Builder()
-				.addInterceptor(new AuthorizationInterceptor(gitHubAccessToken))
-				.build();
-	}
-
-	public void setBaseUrl(String baseUrl) {
-		this.baseUrl = baseUrl;
-	}
-
-	/**
-	 * Publish a release with no binary attachments.
-	 *
-	 * @param repository The repository owner/name
-	 * @param release The contents of the release
-	 */
-	public void publishRelease(RepositoryRef repository, Release release) {
-		String url = this.baseUrl + "/repos/" + repository.getOwner() + "/" + repository.getName() + "/releases";
-		String json = this.gson.toJson(release);
-		RequestBody body = RequestBody.create(MediaType.parse("application/json"), json);
-		Request request = new Request.Builder().url(url).post(body).build();
-		try {
-			Response response = this.httpClient.newCall(request).execute();
-			if (!response.isSuccessful()) {
-				throw new RuntimeException(String.format("Could not create release %s for repository %s/%s. Got response %s",
-						release.getName(), repository.getOwner(), repository.getName(), response));
-			}
-		} catch (IOException ex) {
-			throw new RuntimeException(String.format("Could not create release %s for repository %s/%s",
-					release.getName(), repository.getOwner(), repository.getName()), ex);
-		}
-	}
-
-	private static class AuthorizationInterceptor implements Interceptor {
-		private final String token;
-
-		public AuthorizationInterceptor(String token) {
-			this.token = token;
-		}
-
-		@Override
-		public Response intercept(Chain chain) throws IOException {
-			Request request = chain.request().newBuilder()
-					.addHeader("Authorization", "Bearer " + this.token)
-					.build();
-
-			return chain.proceed(request);
-		}
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/github/release/GitHubReleasePlugin.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.github.release;
-
-import groovy.lang.MissingPropertyException;
-import org.gradle.api.Action;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-
-/**
- * @author Steve Riesenberg
- */
-public class GitHubReleasePlugin implements Plugin<Project> {
-	@Override
-	public void apply(Project project) {
-		project.getTasks().register("createGitHubRelease", CreateGitHubReleaseTask.class, new Action<CreateGitHubReleaseTask>() {
-			@Override
-			public void execute(CreateGitHubReleaseTask createGitHubRelease) {
-				createGitHubRelease.setGroup("Release");
-				createGitHubRelease.setDescription("Create a github release");
-				createGitHubRelease.dependsOn("generateChangelog");
-
-				createGitHubRelease.setCreateRelease("true".equals(project.findProperty("createRelease")));
-				createGitHubRelease.setVersion((String) project.findProperty("nextVersion"));
-				if (project.hasProperty("branch")) {
-					createGitHubRelease.setBranch((String) project.findProperty("branch"));
-				}
-				createGitHubRelease.setGitHubAccessToken((String) project.findProperty("gitHubAccessToken"));
-				if (createGitHubRelease.isCreateRelease() && createGitHubRelease.getGitHubAccessToken() == null) {
-					throw new MissingPropertyException("Please provide an access token with -PgitHubAccessToken=...");
-				}
-			}
-		});
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/github/release/Release.java

@@ -1,156 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.github.release;
-
-import com.google.gson.annotations.SerializedName;
-
-/**
- * @author Steve Riesenberg
- */
-public class Release {
-	@SerializedName("tag_name")
-	private final String tag;
-
-	@SerializedName("target_commitish")
-	private final String commit;
-
-	@SerializedName("name")
-	private final String name;
-
-	@SerializedName("body")
-	private final String body;
-
-	@SerializedName("draft")
-	private final boolean draft;
-
-	@SerializedName("prerelease")
-	private final boolean preRelease;
-
-	@SerializedName("generate_release_notes")
-	private final boolean generateReleaseNotes;
-
-	private Release(String tag, String commit, String name, String body, boolean draft, boolean preRelease, boolean generateReleaseNotes) {
-		this.tag = tag;
-		this.commit = commit;
-		this.name = name;
-		this.body = body;
-		this.draft = draft;
-		this.preRelease = preRelease;
-		this.generateReleaseNotes = generateReleaseNotes;
-	}
-
-	public String getTag() {
-		return tag;
-	}
-
-	public String getCommit() {
-		return commit;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public boolean isDraft() {
-		return draft;
-	}
-
-	public boolean isPreRelease() {
-		return preRelease;
-	}
-
-	public boolean isGenerateReleaseNotes() {
-		return generateReleaseNotes;
-	}
-
-	@Override
-	public String toString() {
-		return "Release{" +
-				"tag='" + tag + '\'' +
-				", commit='" + commit + '\'' +
-				", name='" + name + '\'' +
-				", body='" + body + '\'' +
-				", draft=" + draft +
-				", preRelease=" + preRelease +
-				", generateReleaseNotes=" + generateReleaseNotes +
-				'}';
-	}
-
-	public static Builder tag(String tag) {
-		return new Builder().tag(tag);
-	}
-
-	public static Builder commit(String commit) {
-		return new Builder().commit(commit);
-	}
-
-	public static final class Builder {
-		private String tag;
-		private String commit;
-		private String name;
-		private String body;
-		private boolean draft;
-		private boolean preRelease;
-		private boolean generateReleaseNotes;
-
-		private Builder() {
-		}
-
-		public Builder tag(String tag) {
-			this.tag = tag;
-			return this;
-		}
-
-		public Builder commit(String commit) {
-			this.commit = commit;
-			return this;
-		}
-
-		public Builder name(String name) {
-			this.name = name;
-			return this;
-		}
-
-		public Builder body(String body) {
-			this.body = body;
-			return this;
-		}
-
-		public Builder draft(boolean draft) {
-			this.draft = draft;
-			return this;
-		}
-
-		public Builder preRelease(boolean preRelease) {
-			this.preRelease = preRelease;
-			return this;
-		}
-
-		public Builder generateReleaseNotes(boolean generateReleaseNotes) {
-			this.generateReleaseNotes = generateReleaseNotes;
-			return this;
-		}
-
-		public Release build() {
-			return new Release(tag, commit, name, body, draft, preRelease, generateReleaseNotes);
-		}
-	}
-}

buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsEclipsePlugin.groovy

@@ -1,43 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.propdeps
-
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.plugins.ide.eclipse.EclipsePlugin
-
-/**
- * Plugin to allow optional and provided dependency configurations to work with the
- * standard gradle 'eclipse' plugin
- *
- * @author Phillip Webb
- */
-class PropDepsEclipsePlugin implements Plugin<Project> {
-
-	public void apply(Project project) {
-		project.plugins.apply(PropDepsPlugin)
-		project.plugins.apply(EclipsePlugin)
-
-		project.eclipse {
-			classpath {
-				plusConfigurations += [project.configurations.provided, project.configurations.optional]
-			}
-		}
-	}
-
-}

buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsIdeaPlugin.groovy

@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.propdeps
-
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.plugins.ide.idea.IdeaPlugin
-
-/**
- * Plugin to allow optional and provided dependency configurations to work with the
- * standard gradle 'idea' plugin
- *
- * @author Phillip Webb
- * @author Brian Clozel
- * @link https://youtrack.jetbrains.com/issue/IDEA-107046
- * @link https://youtrack.jetbrains.com/issue/IDEA-117668
- */
-class PropDepsIdeaPlugin implements Plugin<Project> {
-
-	public void apply(Project project) {
-		project.plugins.apply(PropDepsPlugin)
-		project.plugins.apply(IdeaPlugin)
-		project.idea.module {
-			// IDEA internally deals with 4 scopes : COMPILE, TEST, PROVIDED, RUNTIME
-			// but only PROVIDED seems to be picked up
-			scopes.PROVIDED.plus += [project.configurations.provided]
-			scopes.PROVIDED.plus += [project.configurations.optional]
-		}
-	}
-
-}

buildSrc/src/main/java/org/springframework/gradle/propdeps/PropDepsPlugin.groovy

@@ -1,76 +0,0 @@
-/*
- * Copyright 2002-2021 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 org.springframework.gradle.propdeps
-
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.plugins.JavaLibraryPlugin
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.javadoc.Javadoc
-
-/**
- * Plugin to allow 'optional' and 'provided' dependency configurations
- *
- * As stated in the maven documentation, provided scope "is only available on the compilation and test classpath,
- * and is not transitive".
- *
- * This plugin creates two new configurations, and each one:
- * <ul>
- * <li>is a parent of the compile configuration</li>
- * <li>is not visible, not transitive</li>
- * <li>all dependencies are excluded from the default configuration</li>
- * </ul>
- *
- * @author Phillip Webb
- * @author Brian Clozel
- * @author Rob Winch
- *
- * @see <a href="https://www.gradle.org/docs/current/userguide/java_plugin.html#N121CF">Maven documentation</a>
- * @see <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope">Gradle configurations</a>
- * @see PropDepsEclipsePlugin
- * @see PropDepsIdeaPlugin
- */
-class PropDepsPlugin implements Plugin<Project> {
-
-	public void apply(Project project) {
-		project.plugins.apply(JavaPlugin)
-
-		Configuration provided = addConfiguration(project, "provided")
-		Configuration optional = addConfiguration(project, "optional")
-
-		Javadoc javadoc = project.tasks.getByName(JavaPlugin.JAVADOC_TASK_NAME)
-		javadoc.classpath = javadoc.classpath.plus(provided).plus(optional)
-	}
-
-	private Configuration addConfiguration(Project project, String name) {
-		Configuration configuration = project.configurations.create(name)
-		configuration.extendsFrom(project.configurations.implementation)
-		project.plugins.withType(JavaLibraryPlugin, {
-			configuration.extendsFrom(project.configurations.api)
-		})
-
-		project.sourceSets.all {
-			compileClasspath += configuration
-			runtimeClasspath += configuration
-		}
-
-		return configuration
-	}
-
-}

buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java

@@ -166,7 +166,7 @@ public class UpdateDependenciesExtension {
 		}
 
 		public DependencyExcludes releaseCandidatesVersions() {
-			this.actions.add(excludeVersionWithRegex("(?i).*?rc.*", "a release candidate version"));
+			this.actions.add(excludeVersionWithRegex("(?i).*?rc\\d+.*", "a release candidate version"));
 			return this;
 		}
 

buildSrc/src/main/java/s101/S101Configure.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2021 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 s101;
-
-import java.io.File;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.tasks.TaskAction;
-
-public class S101Configure extends DefaultTask {
-	@TaskAction
-	public void configure() throws Exception {
-		S101PluginExtension extension = getProject().getExtensions().getByType(S101PluginExtension.class);
-		File buildDirectory = extension.getInstallationDirectory().get();
-		File projectDirectory = extension.getConfigurationDirectory().get();
-		S101Configurer configurer = new S101Configurer(getProject());
-		configurer.configure(buildDirectory, projectDirectory);
-	}
-
-
-}

buildSrc/src/main/java/s101/S101Configurer.java

@@ -1,311 +0,0 @@
-/*
- * Copyright 2002-2021 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 s101;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UncheckedIOException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.github.mustachejava.DefaultMustacheFactory;
-import com.github.mustachejava.Mustache;
-import com.github.mustachejava.MustacheFactory;
-import org.apache.commons.io.IOUtils;
-import org.gradle.api.Project;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-public class S101Configurer {
-	private static final Pattern VERSION = Pattern.compile("<local-project .* version=\"(.*?)\"");
-
-	private static final int BUFFER = 1024;
-	private static final long TOOBIG = 0x10000000; // ~268M
-	private static final int TOOMANY = 200;
-
-	private final MustacheFactory mustache = new DefaultMustacheFactory();
-	private final Mustache hspTemplate;
-	private final Mustache repositoryTemplate;
-
-	private final Path licenseDirectory;
-
-	private final Project project;
-	private final Logger logger;
-
-	public S101Configurer(Project project) {
-		this.project = project;
-		this.logger = project.getLogger();
-		Resource template = new ClassPathResource("s101/project.java.hsp");
-		try (InputStream is = template.getInputStream()) {
-			this.hspTemplate = this.mustache.compile(new InputStreamReader(is), "project");
-		} catch (IOException ex) {
-			throw new UncheckedIOException(ex);
-		}
-		template = new ClassPathResource("s101/repository.xml");
-		try (InputStream is = template.getInputStream()) {
-			this.repositoryTemplate = this.mustache.compile(new InputStreamReader(is), "repository");
-		} catch (IOException ex) {
-			throw new UncheckedIOException(ex);
-		}
-		this.licenseDirectory = new File(System.getProperty("user.home") + "/.Structure101/java").toPath();
-	}
-
-	public void license(String licenseId) {
-		Path licenseFile = this.licenseDirectory.resolve(".structure101license.properties");
-		if (needsLicense(licenseFile, licenseId)) {
-			writeLicense(licenseFile, licenseId);
-		}
-	}
-
-	private boolean needsLicense(Path licenseFile, String licenseId) {
-		if (!licenseFile.toFile().exists()) {
-			return true;
-		}
-		try {
-			String license = new String(Files.readAllBytes(licenseFile));
-			return !license.contains(licenseId);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private void writeLicense(Path licenseFile, String licenseId) {
-		if (!this.licenseDirectory.toFile().mkdirs()) {
-			this.licenseDirectory.forEach((path) -> path.toFile().delete());
-		}
-		try (PrintWriter pw = new PrintWriter(licenseFile.toFile())) {
-			pw.println("licensecode=" + licenseId);
-		} catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	public void install(File installationDirectory, File configurationDirectory) {
-		deleteDirectory(installationDirectory);
-		installBuildTool(installationDirectory, configurationDirectory);
-	}
-
-	public void configure(File installationDirectory, File configurationDirectory) {
-		deleteDirectory(configurationDirectory);
-		String version = computeVersionFromInstallation(installationDirectory);
-		configureProject(version, configurationDirectory);
-	}
-
-	private String computeVersionFromInstallation(File installationDirectory) {
-		File buildJar = new File(installationDirectory, "structure101-java-build.jar");
-		try (JarInputStream input = new JarInputStream(new FileInputStream(buildJar))) {
-			JarEntry entry;
-			while ((entry = input.getNextJarEntry()) != null) {
-				if (entry.getName().contains("structure101-build.properties")) {
-					Properties properties = new Properties();
-					properties.load(input);
-					return properties.getProperty("s101-build");
-				}
-			}
-		} catch (Exception ex) {
-			throw new RuntimeException(ex);
-		}
-		throw new IllegalStateException("Unable to determine Structure101 version");
-	}
-
-	private boolean deleteDirectory(File directoryToBeDeleted) {
-		File[] allContents = directoryToBeDeleted.listFiles();
-		if (allContents != null) {
-			for (File file : allContents) {
-				deleteDirectory(file);
-			}
-		}
-		return directoryToBeDeleted.delete();
-	}
-
-	private String installBuildTool(File installationDirectory, File configurationDirectory) {
-		String source = "https://structure101.com/binaries/v6";
-		try (final WebClient webClient = new WebClient()) {
-			HtmlPage page = webClient.getPage(source);
-			Matcher matcher = null;
-			for (HtmlAnchor anchor : page.getAnchors()) {
-				Matcher candidate = Pattern.compile("(structure101-build-java-all-)(.*).zip").matcher(anchor.getHrefAttribute());
-				if (candidate.find()) {
-					matcher = candidate;
-				}
-			}
-			if (matcher == null) {
-				return null;
-			}
-			copyZipToFilesystem(source, installationDirectory, matcher.group(1) + matcher.group(2));
-			return matcher.group(2);
-		} catch (Exception ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	private void copyZipToFilesystem(String source, File destination, String name) {
-		try (ZipInputStream in = new ZipInputStream(new URL(source + "/" + name + ".zip").openStream())) {
-			ZipEntry entry;
-			String build = destination.getName();
-			int entries = 0;
-			long size = 0;
-			while ((entry = in.getNextEntry()) != null) {
-				if (entry.getName().equals(name + "/")) {
-					destination.mkdirs();
-				} else if (entry.getName().startsWith(name)) {
-					if (entries++ > TOOMANY) {
-						throw new IllegalArgumentException("Zip file has more entries than expected");
-					}
-					if (size + BUFFER > TOOBIG) {
-						throw new IllegalArgumentException("Zip file is larger than expected");
-					}
-					String filename = entry.getName().replace(name, build);
-					if (filename.contains("maven")) {
-						continue;
-					}
-					if (filename.contains("jxbrowser")) {
-						continue;
-					}
-					if (filename.contains("jetty")) {
-						continue;
-					}
-					if (filename.contains("jfreechart")) {
-						continue;
-					}
-					if (filename.contains("piccolo2d")) {
-						continue;
-					}
-					if (filename.contains("plexus")) {
-						continue;
-					}
-					if (filename.contains("websocket")) {
-						continue;
-					}
-					validateFilename(filename, build);
-					this.logger.info("Downloading " + filename);
-					try (OutputStream out = new FileOutputStream(new File(destination.getParentFile(), filename))) {
-						byte[] data = new byte[BUFFER];
-						int read;
-						while ((read = in.read(data, 0, BUFFER)) != -1 && TOOBIG - size >= read) {
-							out.write(data, 0, read);
-							size += read;
-						}
-					}
-				}
-			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private String validateFilename(String filename, String intendedDir)
-			throws java.io.IOException {
-		File f = new File(filename);
-		String canonicalPath = f.getCanonicalPath();
-
-		File iD = new File(intendedDir);
-		String canonicalID = iD.getCanonicalPath();
-
-		if (canonicalPath.startsWith(canonicalID)) {
-			return canonicalPath;
-		} else {
-			throw new IllegalArgumentException("File is outside extraction target directory.");
-		}
-	}
-
-	private void configureProject(String version, File configurationDirectory) {
-		configurationDirectory.mkdirs();
-		Map<String, Object> model = hspTemplateValues(version, configurationDirectory);
-		copyToProject(this.hspTemplate, model, new File(configurationDirectory, "project.java.hsp"));
-		copyToProject("s101/config.xml", new File(configurationDirectory, "config.xml"));
-		File repository = new File(configurationDirectory, "repository");
-		File snapshots = new File(repository, "snapshots");
-		if (!snapshots.exists() && !snapshots.mkdirs()) {
-			throw new IllegalStateException("Unable to create snapshots directory");
-		}
-		copyToProject(this.repositoryTemplate, model, new File(repository, "repository.xml"));
-	}
-
-	private void copyToProject(String location, File destination) {
-		Resource resource = new ClassPathResource(location);
-		try (InputStream is = resource.getInputStream();
-			OutputStream os = new FileOutputStream(destination)) {
-			IOUtils.copy(is, os);
-		} catch (IOException ex) {
-			throw new UncheckedIOException(ex);
-		}
-	}
-
-	private void copyToProject(Mustache view, Map<String, Object> model, File destination) {
-		try (OutputStream os = new FileOutputStream(destination)) {
-			view.execute(new OutputStreamWriter(os), model).flush();
-		} catch (IOException ex) {
-			throw new UncheckedIOException(ex);
-		}
-	}
-
-	private Map<String, Object> hspTemplateValues(String version, File configurationDirectory) {
-		Map<String, Object> values = new LinkedHashMap<>();
-		values.put("version", version);
-		values.put("patchVersion", version.split("\\.")[2]);
-		values.put("relativeTo", "const(THIS_FILE)/" + configurationDirectory.toPath().relativize(this.project.getProjectDir().toPath()));
-
-		List<Map<String, Object>> entries = new ArrayList<>();
-		Set<Project> projects = this.project.getAllprojects();
-		for (Project p : projects) {
-			SourceSetContainer sourceSets = (SourceSetContainer) p.getExtensions().findByName("sourceSets");
-			if (sourceSets == null) {
-				continue;
-			}
-			for (SourceSet source : sourceSets) {
-				Set<File> classDirs = source.getOutput().getClassesDirs().getFiles();
-				for (File directory : classDirs) {
-					Map<String, Object> entry = new HashMap<>();
-					entry.put("path", this.project.getProjectDir().toPath().relativize(directory.toPath()));
-					entry.put("module", p.getName());
-					entries.add(entry);
-				}
-			}
-		}
-		values.put("entries", entries);
-		return values;
-	}
-}

buildSrc/src/main/java/s101/S101Install.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2021 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 s101;
-
-import java.io.File;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.tasks.TaskAction;
-
-public class S101Install extends DefaultTask {
-	@TaskAction
-	public void install() throws Exception {
-		S101PluginExtension extension = getProject().getExtensions().getByType(S101PluginExtension.class);
-		File installationDirectory = extension.getInstallationDirectory().get();
-		File configurationDirectory = extension.getConfigurationDirectory().get();
-		S101Configurer configurer = new S101Configurer(getProject());
-		configurer.install(installationDirectory, configurationDirectory);
-	}
-
-
-}

buildSrc/src/main/java/s101/S101Plugin.java

@@ -1,161 +0,0 @@
-/*
- * Copyright 2002-2021 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 s101;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.JavaExec;
-
-public class S101Plugin implements Plugin<Project> {
-	@Override
-	public void apply(Project project) {
-		project.getExtensions().add("s101", new S101PluginExtension(project));
-		project.getTasks().register("s101Install", S101Install.class, this::configure);
-		project.getTasks().register("s101Configure", S101Configure.class, this::configure);
-		project.getTasks().register("s101", JavaExec.class, this::configure);
-	}
-
-	private void configure(S101Install install) {
-		install.setDescription("Installs Structure101 to your filesystem");
-	}
-
-	private void configure(S101Configure configure) {
-		configure.setDescription("Applies a default Structure101 configuration to the project");
-	}
-
-	private void configure(JavaExec exec) {
-		exec.setDescription("Runs Structure101 headless analysis, installing and configuring if necessary");
-		exec.dependsOn("check");
-		Project project = exec.getProject();
-		S101PluginExtension extension = project.getExtensions().getByType(S101PluginExtension.class);
-		exec
-				.workingDir(extension.getInstallationDirectory())
-				.classpath(new File(extension.getInstallationDirectory().get(), "structure101-java-build.jar"))
-				.args(new File(new File(project.getBuildDir(), "s101"), "config.xml"))
-				.systemProperty("s101.label", computeLabel(extension).get())
-				.doFirst((task) -> {
-					installAndConfigureIfNeeded(project);
-					copyConfigurationToBuildDirectory(extension, project);
-				})
-				.doLast((task) -> {
-					copyResultsBackToConfigurationDirectory(extension, project);
-				});
-	}
-
-	private Property<String> computeLabel(S101PluginExtension extension) {
-		boolean hasBaseline = extension.getConfigurationDirectory().get().toPath()
-				.resolve("repository").resolve("snapshots").resolve("baseline").toFile().exists();
-		if (!hasBaseline) {
-			return extension.getLabel().convention("baseline");
-		}
-		return extension.getLabel().convention("recent");
-	}
-
-	private void installAndConfigureIfNeeded(Project project) {
-		S101Configurer configurer = new S101Configurer(project);
-		S101PluginExtension extension = project.getExtensions().getByType(S101PluginExtension.class);
-		String licenseId = extension.getLicenseId().getOrNull();
-		if (licenseId != null) {
-			configurer.license(licenseId);
-		}
-		File installationDirectory = extension.getInstallationDirectory().get();
-		File configurationDirectory = extension.getConfigurationDirectory().get();
-		if (!installationDirectory.exists()) {
-			configurer.install(installationDirectory, configurationDirectory);
-		}
-		if (!configurationDirectory.exists()) {
-			configurer.configure(installationDirectory, configurationDirectory);
-		}
-	}
-
-	private void copyConfigurationToBuildDirectory(S101PluginExtension extension, Project project) {
-		Path configurationDirectory = extension.getConfigurationDirectory().get().toPath();
-		Path buildDirectory = project.getBuildDir().toPath();
-		copyDirectory(project, configurationDirectory, buildDirectory);
-	}
-
-	private void copyResultsBackToConfigurationDirectory(S101PluginExtension extension, Project project) {
-		Path buildConfigurationDirectory = project.getBuildDir().toPath().resolve("s101");
-		String label = extension.getLabel().get();
-		if ("baseline".equals(label)) { // a new baseline was created
-			copyDirectory(project, buildConfigurationDirectory.resolve("repository").resolve("snapshots"),
-					extension.getConfigurationDirectory().get().toPath().resolve("repository"));
-			copyDirectory(project, buildConfigurationDirectory.resolve("repository"),
-					extension.getConfigurationDirectory().get().toPath());
-		}
-	}
-
-	private void copyDirectory(Project project, Path source, Path destination) {
-		try {
-			Files.walk(source)
-					.forEach(each -> {
-						Path relativeToSource = source.getParent().relativize(each);
-						Path resolvedDestination = destination.resolve(relativeToSource);
-						if (each.toFile().isDirectory()) {
-							resolvedDestination.toFile().mkdirs();
-							return;
-						}
-						InputStream input;
-						if ("project.java.hsp".equals(each.toFile().getName())) {
-							Path relativeTo = project.getBuildDir().toPath().resolve("s101").relativize(project.getProjectDir().toPath());
-							String value = "const(THIS_FILE)/" + relativeTo;
-							input = replace(each, "<property name=\"relative-to\" value=\"(.*)\" />", "<property name=\"relative-to\" value=\"" + value + "\" />");
-						} else if (each.toFile().toString().endsWith(".xml")) {
-							input = replace(each, "\\r\\n", "\n");
-						} else {
-							input = input(each);
-						}
-						try {
-							Files.copy(input, resolvedDestination, StandardCopyOption.REPLACE_EXISTING);
-						} catch (IOException e) {
-							throw new RuntimeException(e);
-						}
-					});
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private InputStream replace(Path file, String search, String replace) {
-		try {
-			byte[] b = Files.readAllBytes(file);
-			String contents = new String(b).replaceAll(search, replace);
-			return new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8));
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private InputStream input(Path file) {
-		try {
-			return new FileInputStream(file.toFile());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}

buildSrc/src/main/java/s101/S101PluginExtension.java

@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2021 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 s101;
-
-import java.io.File;
-
-import org.gradle.api.Project;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputDirectory;
-
-public class S101PluginExtension {
-	private final Property<String> licenseId;
-	private final Property<File> installationDirectory;
-	private final Property<File> configurationDirectory;
-	private final Property<String> label;
-
-	@Input
-	public Property<String> getLicenseId() {
-		return this.licenseId;
-	}
-
-	public void setLicenseId(String licenseId) {
-		this.licenseId.set(licenseId);
-	}
-
-	@InputDirectory
-	public Property<File> getInstallationDirectory() {
-		return this.installationDirectory;
-	}
-
-	public void setInstallationDirectory(String installationDirectory) {
-		this.installationDirectory.set(new File(installationDirectory));
-	}
-
-	@InputDirectory
-	public Property<File> getConfigurationDirectory() {
-		return this.configurationDirectory;
-	}
-
-	public void setConfigurationDirectory(String configurationDirectory) {
-		this.configurationDirectory.set(new File(configurationDirectory));
-	}
-
-	@Input
-	public Property<String> getLabel() {
-		return this.label;
-	}
-
-	public void setLabel(String label) {
-		this.label.set(label);
-	}
-
-	public S101PluginExtension(Project project) {
-		this.licenseId = project.getObjects().property(String.class);
-		if (project.hasProperty("s101.licenseId")) {
-			setLicenseId((String) project.findProperty("s101.licenseId"));
-		}
-		this.installationDirectory = project.getObjects().property(File.class)
-				.convention(new File(project.getBuildDir(), "s101"));
-		this.configurationDirectory = project.getObjects().property(File.class)
-				.convention(new File(project.getProjectDir(), "s101"));
-		this.label = project.getObjects().property(String.class);
-		if (project.hasProperty("s101.label")) {
-			setLabel((String) project.findProperty("s101.label"));
-		}
-	}
-}

buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties

@@ -0,0 +1 @@
+implementation-class=io.spring.gradle.convention.DependencySetPlugin

buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.include-check-remote.properties

@@ -1 +0,0 @@
-implementation-class=io.spring.gradle.convention.IncludeCheckRemotePlugin

buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.ossrh.properties

@@ -0,0 +1 @@
+implementation-class=io.spring.gradle.convention.OssrhPlugin

buildSrc/src/main/resources/s101/config.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<headless version="1.0">
-	<operations>
-		<operation type="publish">
-			<argument name="overwrite" value="true"/>
-			<argument name="diagrams" value="true"/>
-		</operation>
-		<operation type="check-key-measures">
-			<argument name="baseline" value="baseline"/>
-			<argument name="useProjectFileSpec" value="true"/>
-			<argument name="useProjectFileDiagrams" value="true"/>
-			<argument name="fail-on-architecture-violations" value="false"/>
-			<argument name="fail-on-fat-package" value="false"/>
-			<argument name="fail-on-fat-class" value="false"/>
-			<argument name="fail-on-fat-method" value="false"/>
-			<argument name="fail-on-feedback-dependencies" value="true"/>
-			<argument name="fail-on-spec-violation-dependencies" value="false"/>
-			<argument name="fail-on-total-problem-dependencies" value="false"/>
-			<argument name="fail-on-spec-item-violations" value="false"/>
-			<argument name="fail-on-biggest-class-tangle" value="true"/>
-			<argument name="fail-on-tangled-package" value="true"/>
-			<argument name="fail-on-architecture-violations" value="false"/>
-			<argument name="fail-on-total-problem-dependencies" value="true"/>
-			<argument name="identifier-on-violation" value="S101 key measure violation"/>
-		</operation>
-	</operations>
-	<arguments>
-		<argument name="local-project" value="const(THIS_FILE)/project.java.hsp"/>
-		<argument name="repository" value="const(THIS_FILE)/repository"/>
-		<argument name="project" value="snapshots"/>
-	</arguments>
-</headless>

buildSrc/src/main/resources/s101/project.java.hsp

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<local-project language="java" version="{{version}}" xml-version="3" flavor="j2se">
-  <property name="show-as-module" value="false" />
-  <property name="publish-architecture-artifacts" value="true" />
-  <property name="force-classpath" value="false" />
-  <property name="project-type" value="classpath" />
-  <property name="hide-externals" value="true" />
-  <property name="parse-archive-in-archive" value="false" />
-  <property name="include-injected-dependency" value="false" />
-  <property name="relative-to" value="{{relativeTo}}" />
-  <property name="action-set-mod" value="1" />
-  <property name="detail-mode" value="true" />
-  <property name="hide-deprecated" value="false" />
-  <property name="resolve-name-clashes" value="true" />
-  <property name="project-excluded" />
-  <property name="show-needs-to-compile" value="false" />
-  <classpath>
-    {{#entries}}
-    <classpathentry kind="lib" path="{{path}}" module="{{module}}" />
-    {{/entries}}
-  </classpath>
-  <pom-root-files />
-  <modules-in-scope />
-  <restructuring>
-    <set version="3" name="Action list 1" hiview="Codemap" active="true" todo="false" list="0" />
-  </restructuring>
-  <grid-set sep="." version="{{version}}" />
-</local-project>

buildSrc/src/main/resources/s101/repository.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<structure101-repository language="java" version="{{patchVersion}}">
-  <xs-configuration>
-    <entry metric="Tangled" scope="design" threshold="0" color="153,53,0" />
-    <entry metric="Fat" scope="design" threshold="120" color="255,153,0" />
-    <entry metric="Fat" scope="leaf package" threshold="120" color="0,153,153" />
-    <entry metric="Fat" scope="class" threshold="120" color="255,153,153" />
-    <entry metric="Fat" scope="method" threshold="15" color="51,255,51" />
-  </xs-configuration>
-  <!--Note: All date strings are stored in short US format e.g. 2/1/06 for 1st Feb 2006-->
-  <project name="snapshots" dir="snapshots" baselineSnapshot="default" version="{{patchVersion}}">
-    <snapshot label="baseline" location="baseline" timestamp="3/16/21, 4:42 PM" version="{{patchVersion}}" detail="true" good="true" size="20" />
-  </project>
-</structure101-repository>

buildSrc/src/test/groovy/io/spring/gradle/convention/DependencySetPluginITest.groovy

@@ -0,0 +1,37 @@
+/*
+ * 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 io.spring.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class DependencySetPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "dependencies"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/dependencyset")
+			.withArguments('dependencies')
+			.build();
+		then:
+		result.task(":dependencies").outcome == SUCCESS
+		!result.output.contains("FAILED")
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/DocsPluginITest.groovy

@@ -0,0 +1,95 @@
+/*
+ * 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 io.spring.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Specification
+
+import java.util.zip.ZipFile
+
+import static org.gradle.testkit.runner.TaskOutcome.FAILED
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class DocsPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "build triggers docs"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/simple/")
+			.withArguments('build')
+			.build();
+		then:
+		result.task(":build").outcome == SUCCESS
+		and:
+		result.task(":docs").outcome == SUCCESS
+		and:
+		result.task(":docsZip").outcome == SUCCESS
+		and:
+		def zip = new File(testKit.getRootDir(), 'build/distributions/simple-1.0.0.BUILD-SNAPSHOT-docs.zip')
+		def names = new ZipFile(zip).entries()*.name
+		names.contains("docs/reference/html5/index.html")
+		names.contains("docs/reference/pdf/simple-reference.pdf")
+	}
+
+	def "asciidoc copies images"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/simple/")
+				.withArguments('asciidoctor')
+				.build();
+		then:
+		result.task(":asciidoctor").outcome == SUCCESS
+		new File(testKit.getRootDir(), "build/docs/asciidoc/images").exists()
+	}
+
+	def "asciidoc docinfo from resources used"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/simple/")
+				.withArguments('asciidoctor')
+				.build();
+		then:
+		result.task(":asciidoctor").outcome == SUCCESS
+		new File(testKit.getRootDir(), "build/docs/asciidoc/index.html").getText().contains("""<script type="text/javascript" src="js/tocbot/tocbot.min.js"></script>""")
+	}
+
+	def "missing attribute fails"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/missing-attribute/")
+				.withArguments(':asciidoctor')
+				.buildAndFail();
+		then:
+		result.task(":asciidoctor").outcome == FAILED
+	}
+
+	def "missing include"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/missing-include/")
+				.withArguments(':asciidoctor')
+				.buildAndFail();
+		then:
+		result.task(":asciidoctor").outcome == FAILED
+	}
+
+	def "missing cross reference"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/docs/missing-cross-reference/")
+				.withArguments(':asciidoctor')
+				.buildAndFail();
+		then:
+		result.task(":asciidoctor").outcome == FAILED
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/IntegrationTestPluginITest.groovy

@@ -0,0 +1,63 @@
+/*
+ * 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.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class IntegrationTestPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "check with java plugin"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/integrationtest/withjava/")
+				.withArguments('check')
+				.build();
+		then:
+		result.task(":check").outcome == SUCCESS
+		and:
+		new File(testKit.getRootDir(), 'build/test-results/integrationTest/').exists()
+		new File(testKit.getRootDir(), 'build/reports/tests/integrationTest/').exists()
+	}
+
+	def "check with propdeps"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/integrationtest/withpropdeps/")
+				.withArguments('check')
+				.build();
+		then:
+		result.task(":check").outcome == SUCCESS
+		and:
+		new File(testKit.getRootDir(), 'build/test-results/integrationTest/').exists()
+		new File(testKit.getRootDir(), 'build/reports/tests/integrationTest/').exists()
+	}
+
+	def "check with groovy plugin"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/integrationtest/withgroovy/")
+			.withArguments('check')
+			.build();
+		then:
+		result.task(":check").outcome == SUCCESS
+		and:
+		new File(testKit.getRootDir(), 'build/test-results/integrationTest/').exists()
+		new File(testKit.getRootDir(), 'build/reports/tests/integrationTest/').exists()
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/JacocoPluginITest.groovy

@@ -0,0 +1,39 @@
+/*
+ * 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 io.spring.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class JacocoPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "check with java plugin"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/jacoco/java/")
+				.withArguments('check')
+				.build();
+		then:
+		result.task(":check").outcome == SUCCESS
+		and:
+		new File(testKit.getRootDir(), 'build/jacoco').exists()
+		new File(testKit.getRootDir(), 'build/reports/jacoco/test/html/').exists()
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/JavadocApiPluginITest.groovy

@@ -0,0 +1,48 @@
+/*
+ * 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.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.Rule
+import org.junit.rules.TemporaryFolder
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.*;
+
+import io.spring.gradle.testkit.junit.rules.TestKit
+import org.apache.commons.io.FileUtils
+
+class JavadocApiPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "multimodule api"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/javadocapi/multimodule/")
+			.withArguments('api')
+			.build();
+		then:
+		result.task(":api").outcome == SUCCESS
+		and:
+		File allClasses = new File(testKit.getRootDir(), 'build/api/allclasses-noframe.html');
+		File index = new File(testKit.getRootDir(), 'build/api/allclasses.html');
+        new File(testKit.getRootDir(), "build/api/").listFiles().each { println it }
+		File listing = allClasses.exists() ? allClasses : index
+		listing.text.contains('sample/Api.html')
+        listing.text.contains('sample/Impl.html')
+		!listing.text.contains('sample/Sample.html')
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/ShowcaseITest.groovy

@@ -0,0 +1,126 @@
+/*
+ * 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.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.Rule
+import spock.lang.Ignore
+import spock.lang.Specification
+
+class ShowcaseITest extends Specification {
+
+	@Rule final TestKit testKit = new TestKit()
+
+	def "build"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/showcase/")
+				.withArguments('build','--stacktrace')
+				.forwardOutput()
+				.build();
+		then: 'entire build passes'
+		result.output.contains("BUILD SUCCESSFUL")
+	}
+
+	@Ignore
+	def "install"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/showcase/")
+				.withArguments('install','--stacktrace')
+				.build();
+		then:
+		result.output.contains("SUCCESS")
+
+		and: 'pom exists'
+		File pom = new File(testKit.getRootDir(), 'sgbcs-core/build/poms/pom-default.xml')
+		pom.exists()
+		String pomText = pom.getText()
+
+		and: 'pom does not contain <dependencyManagement>'
+		!pomText.contains('<dependencyManagement>')
+
+		and: 'creates optional dependencies correctly'
+		pomText.replaceAll('\\s','').contains("""<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+			<version>4.3.6.RELEASE</version>
+		</dependency>""".replaceAll('\\s',''))
+
+		and: 'adds author'
+		pomText.replaceAll('\\s','').contains("""<developers>
+			<developer>
+				<id>rwinch</id>
+				<name>Rob Winch</name>
+				<email>rwinch@pivotal.io</email>
+			</developer>
+			<developer>
+				<id>jgrandja</id>
+				<name>Joe Grandja</name>
+				<email>jgrandja@pivotal.io</email>
+			</developer>
+		</developers>""".replaceAll('\\s',''))
+
+		and: 'adds repositories'
+		pomText.replaceAll('\\s','').contains("""<scm>
+			<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+			<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+			<url>https://github.com/spring-projects/spring-security</url>
+		</scm>""".replaceAll('\\s',''))
+
+		and: 'adds description & url'
+		pomText.contains('<description>sgbcs-core</description>')
+		pomText.contains('<url>https://spring.io/spring-security</url>')
+
+		and: 'adds organization'
+		pomText.replaceAll('\\s','').contains('''<organization>
+			<name>spring.io</name>
+			<url>https://spring.io/</url>
+		</organization>'''.replaceAll('\\s',''))
+
+		and: 'adds licenses'
+		pomText.replaceAll('\\s','').contains('''	<licenses>
+			<license>
+				<name>The Apache Software License, Version 2.0</name>
+				<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+				<distribution>repo</distribution>
+			</license>
+		</licenses>'''.replaceAll('\\s',''))
+
+		and: 'adds scm'
+		pomText.replaceAll('\\s','').replaceAll('\\s','').contains("""<scm>
+			<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+			<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+			<url>https://github.com/spring-projects/spring-security</url>
+		</scm>""".replaceAll('\\s',''))
+
+		and: 'bom created'
+		File bom = new File(testKit.getRootDir(), 'bom/build/poms/pom-default.xml')
+		bom.exists()
+		String bomText = bom.getText()
+		bomText.contains("""<artifactId>sgbcs-core</artifactId>""")
+
+		when: 'mavenBom ran again'
+		result = testKit.withProjectResource("samples/showcase/")
+				.withArguments('mavenBom','--stacktrace')
+				.build();
+		then: 'mavenBom is not up to date since install is never up to date'
+		result.task(':bom:mavenBom').getOutcome() == TaskOutcome.SUCCESS
+	}
+
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/SpringMavenPluginITest.groovy

@@ -0,0 +1,91 @@
+/*
+ * 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.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Ignore
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class SpringMavenPluginITest extends Specification {
+
+	@Rule final TestKit testKit = new TestKit()
+
+	@Ignore
+	def "install"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/maven/install")
+			.withArguments('install')
+			.build();
+		then: 'pom contains optional'
+		result.output.contains("SUCCESS")
+		File pom = new File(testKit.getRootDir(), 'build/poms/pom-default.xml')
+		pom.exists()
+		String pomText = pom.getText()
+		pomText.replaceAll('\\s','').contains("""<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>""".replaceAll('\\s',''))
+	}
+
+	@Ignore
+	def "signArchives when in memory"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/maven/signing")
+				.withArguments('signArchives')
+				.withEnvironment(["ORG_GRADLE_PROJECT_signingKey" : signingKey,
+								  "ORG_GRADLE_PROJECT_signingPassword" : "password"])
+				.forwardOutput()
+				.build();
+		then:
+		result.output.contains("SUCCESS")
+		File jar = new File(testKit.getRootDir(), 'build/libs/signing-1.0.0.RELEASE.jar')
+		jar.exists()
+		File signature = new File("${jar.absolutePath}.asc")
+		signature.exists()
+	}
+
+	def "upload"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/maven/upload")
+				.withArguments('uploadArchives')
+				.forwardOutput()
+				.build();
+		then: 'pom contains optional'
+		result.output.contains("SUCCESS")
+		File pom = new File(testKit.getRootDir(), 'build/poms/pom-default.xml')
+		pom.exists()
+		String pomText = pom.getText()
+		pomText.replaceAll('\\s','').contains("""<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+			<scope>compile</scope>
+			<optional>true</optional>
+			</dependency>""".replaceAll('\\s',''))
+	}
+
+	def getSigningKey() {
+		getClass().getResource("/test-private.pgp").text
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/convention/TestsConfigurationPluginITest.groovy

@@ -0,0 +1,36 @@
+/*
+ * 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 io.spring.gradle.testkit.junit.rules.TestKit
+import org.gradle.testkit.runner.BuildResult
+import org.junit.Rule
+import spock.lang.Specification
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class TestsConfigurationPluginITest extends Specification {
+	@Rule final TestKit testKit = new TestKit()
+
+	def "can find dependency"() {
+		when:
+		BuildResult result = testKit.withProjectResource("samples/testsconfiguration")
+				.withArguments('check')
+				.build();
+		then:
+		result.task(":web:check").outcome == SUCCESS
+	}
+}

buildSrc/src/test/groovy/io/spring/gradle/testkit/junit/rules/TestKit.java

@@ -13,25 +13,42 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.spring.gradle;
-
-import org.apache.commons.io.FileUtils;
-import org.gradle.testkit.runner.GradleRunner;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+package io.spring.gradle.testkit.junit.rules;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.Enumeration;
 
-public class TestKit {
-	final File buildDir;
+import org.apache.commons.io.FileUtils;
+import org.gradle.testkit.runner.GradleRunner;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 
-	public TestKit(File buildDir) {
-		this.buildDir = buildDir;
+public class TestKit implements TestRule {
+	final TemporaryFolder testProjectDir = new TemporaryFolder();
+	File buildDir;
+
+	@Override
+	public Statement apply(Statement base, Description description) {
+		Statement wrapped = new Statement() {
+
+			@Override
+			public void evaluate() throws Throwable {
+				try {
+					buildDir = testProjectDir.newFolder();
+				} catch(IOException e) {
+					throw new RuntimeException(e);
+				}
+				base.evaluate();
+			}
+		};
+		return testProjectDir.apply(wrapped, description);
 	}
 
 	public File getRootDir() {

buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java

@@ -1,148 +0,0 @@
-/*
- * Copyright 2002-2022 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.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.spring.gradle.IncludeRepoTask;
-import org.apache.commons.io.FileUtils;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.GradleBuild;
-import org.gradle.testfixtures.ProjectBuilder;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class IncludeCheckRemotePluginTest {
-
-	Project rootProject;
-
-	@AfterEach
-	public void cleanup() throws Exception {
-		if (rootProject != null) {
-			FileUtils.deleteDirectory(rootProject.getProjectDir());
-		}
-	}
-
-	@Test
-	void applyWhenExtensionPropertiesNoTasksThenCreateCheckRemoteTaskWithDefaultTask() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-				});
-
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(checkRemote.getTasks()).containsExactly("check");
-	}
-
-	@Test
-	void applyWhenExtensionPropertiesTasksThenCreateCheckRemoteWithProvidedTasks() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-					includeCheckRemoteExtension.setProperty("tasks", Arrays.asList("clean", "build", "test"));
-				});
-
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(checkRemote.getTasks()).containsExactly("clean", "build", "test");
-	}
-
-	@Test
-	void applyWhenExtensionPropertiesInitScriptsThenCreateCheckRemoteWithProvidedTasks() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-					includeCheckRemoteExtension.setProperty("initScripts", Arrays.asList("spring-security-ci.gradle"));
-				});
-
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(checkRemote.getStartParameter().getAllInitScripts()).extracting(File::getName).containsExactly("spring-security-ci.gradle");
-	}
-
-	@Test
-	void applyWhenExtensionPropertiesBuildPropertiesThenCreateCheckRemoteWithProvidedTasks() {
-		Map<String, String> projectProperties = new HashMap<>();
-		projectProperties.put("localRepositoryPath", "~/local/repository");
-		projectProperties.put("anotherProperty", "some_value");
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-					includeCheckRemoteExtension.setProperty("projectProperties", projectProperties);
-				});
-
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(checkRemote.getStartParameter().getProjectProperties()).containsEntry("localRepositoryPath", "~/local/repository")
-				.containsEntry("anotherProperty", "some_value");
-	}
-
-	@Test
-	void applyWhenExtensionPropertiesThenRegisterIncludeRepoTaskWithExtensionProperties() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-				});
-
-		IncludeRepoTask includeRepo = (IncludeRepoTask) this.rootProject.getTasks().named("includeRepo").get();
-		assertThat(includeRepo).isNotNull();
-		assertThat(includeRepo.getRepository().get()).isEqualTo("my-project/my-repository");
-		assertThat(includeRepo.getRef().get()).isEqualTo("main");
-	}
-
-	@Test
-	void applyWhenRegisterTasksThenCheckRemoteDirSameAsIncludeRepoOutputDir() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		this.rootProject.getExtensions().configure(IncludeCheckRemotePlugin.IncludeCheckRemoteExtension.class,
-				(includeCheckRemoteExtension) -> {
-					includeCheckRemoteExtension.setProperty("repository", "my-project/my-repository");
-					includeCheckRemoteExtension.setProperty("ref", "main");
-				});
-		IncludeRepoTask includeRepo = (IncludeRepoTask) this.rootProject.getTasks().named("includeRepo").get();
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(checkRemote.getDir()).isEqualTo(includeRepo.getOutputDirectory());
-	}
-
-	@Test
-	void applyWhenNoExtensionPropertiesThenRegisterTasks() {
-		this.rootProject = ProjectBuilder.builder().build();
-		this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
-		IncludeRepoTask includeRepo = (IncludeRepoTask) this.rootProject.getTasks().named("includeRepo").get();
-		GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
-		assertThat(includeRepo).isNotNull();
-		assertThat(checkRemote).isNotNull();
-	}
-
-}

buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTest.java

@@ -19,9 +19,10 @@ package io.spring.gradle.convention;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.testfixtures.ProjectBuilder;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Test;
 
 import java.io.File;
 
@@ -33,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class IntegrationPluginTest {
 	Project rootProject;
 
-	@AfterEach
+	@After
 	public void cleanup() throws Exception {
 		if (rootProject != null) {
 			FileUtils.deleteDirectory(rootProject.getProjectDir());