diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index b7baf20f2b..23cdae4f8c 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -64,39 +64,23 @@ jobs: ./gradlew publishMavenJavaPublicationToLocalRepository ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR" ./gradlew --refresh-dependencies --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" test integrationTest - check-tangles: - name: Check for Package Tangles - runs-on: ubuntu-latest - if: ${{ github.repository_owner == 'spring-projects' }} - steps: - - uses: actions/checkout@v4 - - name: Set up gradle - uses: spring-io/spring-gradle-build-action@v2 - with: - java-version: 17 - distribution: temurin - - name: Check for package tangles - env: - STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }} - run: | - ./gradlew assemble && ./gradlew s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace deploy-artifacts: name: Deploy Artifacts - needs: [ build, test, check-samples, check-tangles ] + needs: [ build, test, check-samples ] uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1 with: should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }} secrets: inherit deploy-docs: name: Deploy Docs - needs: [ build, test, check-samples, check-tangles ] + needs: [ build, test, check-samples ] uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1 with: should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }} secrets: inherit deploy-schema: name: Deploy Schema - needs: [ build, test, check-samples, check-tangles ] + needs: [ build, test, check-samples ] uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1 with: should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }} diff --git a/build.gradle b/build.gradle index 4fd368b54a..25f41aa780 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ plugins { apply plugin: 'io.spring.nohttp' apply plugin: 'locks' -apply plugin: 's101' apply plugin: 'io.spring.convention.root' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.springframework.security.versions.verify-dependencies-versions' @@ -121,11 +120,6 @@ tasks.register('cloneRepository', IncludeRepoTask) { outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : defaultDirectory } -s101 { - repository = 'https://structure101.com/binaries/latest' - configurationDirectory = project.file("etc/s101") -} - wrapperUpgrade { gradle { 'spring-security' { diff --git a/core/src/test/java/org/springframework/security/authorization/method/ExpressionUtilsTests.java b/core/src/test/java/org/springframework/security/authorization/method/ExpressionUtilsTests.java index 1f853cd516..5f6e9e0d5c 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/ExpressionUtilsTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/ExpressionUtilsTests.java @@ -64,7 +64,7 @@ public class ExpressionUtilsTests { } public Object throwException() { - throw new AuthorizationDeniedException("denied"); + throw new AuthorizationDeniedException("denied", new AuthorizationDecision(false)); } public boolean returnResult() {