Skip to content

Commit a7da386

Browse files
Fix typo
2 parents 0571552 + a820624 commit a7da386

File tree

36 files changed

+74
-53
lines changed

36 files changed

+74
-53
lines changed

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,24 @@ jobs:
6363
samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
6464
./gradlew publishMavenJavaPublicationToLocalRepository
6565
./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
66-
./gradlew --refresh-dependencies --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" test integrationTest
67-
check-tangles:
68-
name: Check for Package Tangles
69-
runs-on: ubuntu-latest
70-
if: ${{ github.repository_owner == 'spring-projects' }}
71-
steps:
72-
- uses: actions/checkout@v4
73-
- name: Set up gradle
74-
uses: spring-io/spring-gradle-build-action@v2
75-
with:
76-
java-version: 17
77-
distribution: temurin
78-
- name: Check for package tangles
79-
env:
80-
STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }}
81-
run: |
82-
./gradlew assemble && ./gradlew s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
66+
./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" :runAllTests
8367
deploy-artifacts:
8468
name: Deploy Artifacts
85-
needs: [ build, test, check-samples, check-tangles ]
69+
needs: [ build, test, check-samples ]
8670
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
8771
with:
8872
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
8973
secrets: inherit
9074
deploy-docs:
9175
name: Deploy Docs
92-
needs: [ build, test, check-samples, check-tangles ]
76+
needs: [ build, test, check-samples ]
9377
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
9478
with:
9579
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
9680
secrets: inherit
9781
deploy-schema:
9882
name: Deploy Schema
99-
needs: [ build, test, check-samples, check-tangles ]
83+
needs: [ build, test, check-samples ]
10084
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
10185
with:
10286
should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }}

acl/spring-security-acl.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ dependencies {
2020
testImplementation "org.springframework:spring-test"
2121

2222
testRuntimeOnly 'org.hsqldb:hsqldb'
23+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
2324
}

aspects/spring-security-aspects.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ dependencies {
2727
testImplementation "org.mockito:mockito-junit-jupiter"
2828
testImplementation "org.springframework:spring-test"
2929
testAspect sourceSets.main.output
30+
31+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3032
}
3133

3234
compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml"

build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ plugins {
2020

2121
apply plugin: 'io.spring.nohttp'
2222
apply plugin: 'locks'
23-
apply plugin: 's101'
2423
apply plugin: 'io.spring.convention.root'
2524
apply plugin: 'org.jetbrains.kotlin.jvm'
2625
apply plugin: 'org.springframework.security.versions.verify-dependencies-versions'
@@ -121,11 +120,6 @@ tasks.register('cloneRepository', IncludeRepoTask) {
121120
outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : defaultDirectory
122121
}
123122

124-
s101 {
125-
repository = 'https://structure101.com/binaries/latest'
126-
configurationDirectory = project.file("etc/s101")
127-
}
128-
129123
wrapperUpgrade {
130124
gradle {
131125
'spring-security' {

buildSrc/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ dependencies {
9595
testImplementation 'org.mockito:mockito-core'
9696
testImplementation 'org.mockito:mockito-junit-jupiter'
9797
testImplementation libs.com.squareup.okhttp3.mockwebserver
98+
99+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
98100
}
99101

100102

buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ dependencies {
66
implementation 'org.springframework:spring-core'
77
testImplementation "org.junit.jupiter:junit-jupiter-api"
88
testImplementation "org.junit.jupiter:junit-jupiter-engine"
9+
10+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
911
}
1012

buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ dependencies {
55
optional 'ch.qos.logback:logback-classic'
66
testImplementation "org.junit.jupiter:junit-jupiter-api"
77
testImplementation "org.junit.jupiter:junit-jupiter-engine"
8+
9+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
810
}

cas/spring-security-cas.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ dependencies {
2222
testImplementation "org.mockito:mockito-junit-jupiter"
2323
testImplementation "org.springframework:spring-test"
2424
testImplementation 'org.skyscreamer:jsonassert'
25+
26+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
2527
}

config/spring-security-config.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ dependencies {
126126
testImplementation libs.org.eclipse.jetty.jetty.servlet
127127

128128
testRuntimeOnly 'org.hsqldb:hsqldb'
129+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
129130
}
130131

131132
def rncToXsd = tasks.named('rncToXsd', RncToXsd)

core/spring-security-core.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dependencies {
4040
testImplementation 'io.mockk:mockk'
4141

4242
testRuntimeOnly 'org.hsqldb:hsqldb'
43+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4344
}
4445

4546
task springVersion(type: org.gradle.api.tasks.WriteProperties) {

0 commit comments

Comments
 (0)