Skip to content

Commit a7130ac

Browse files
committed
Merge branch '7.0.x' into merge-7.0.0-M5-tag
# Conflicts: # gradle.properties
2 parents 71a1b96 + dfe5cc9 commit a7130ac

File tree

18 files changed

+75
-423
lines changed

18 files changed

+75
-423
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
steps:
7676
- name: "📥 Checkout repository"
7777
uses: actions/checkout@v4
78+
with:
79+
fetch-tags: true
7880
- name: "☕️ Setup JDK"
7981
uses: actions/setup-java@v4
8082
with:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ jobs:
218218
with:
219219
token: ${{ secrets.GITHUB_TOKEN }}
220220
ref: v${{ needs.publish.outputs.release_version }}
221+
fetch-depth: 1
222+
fetch-tags: true
221223
- name: "☕️ Setup JDK"
222224
uses: actions/setup-java@v4
223225
with:
@@ -247,6 +249,7 @@ jobs:
247249
contents: write # required for gradle.properties revert
248250
issues: write # required for milestone closing
249251
pull-requests: write # to open PR
252+
actions: write
250253
steps:
251254
- name: "📥 Checkout repository"
252255
uses: actions/checkout@v4

README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ Grails Spring Security
2121

2222
See [documentation](https://apache.github.io/grails-spring-security/latest/ghpages.html) for detailed information.
2323

24-
[core-plugin](https://apache.github.io/grails-spring-security/latest/core-plugin/guide/)
25-
26-
[rest-plugin](https://apache.github.io/grails-spring-security/latest/rest-plugin/guide/)
27-
28-
[ui-plugin](https://apache.github.io/grails-spring-security/latest/ui-plugin/guide/)
29-
30-
[acl-plugin](https://apache.github.io/grails-spring-security/latest/acl-plugin/guide/)
31-
32-
[ldap-plugin](https://apache.github.io/grails-spring-security/latest/ldap-plugin/guide/)
33-
34-
[cas-plugin](https://apache.github.io/grails-spring-security/latest/cas-plugin/guide/)
35-
36-
[oauth2-plugin](https://apache.github.io/grails-spring-security/latest/oauth2-plugin/guide/)
24+
- [CORE](https://apache.github.io/grails-spring-security/latest/core-plugin/guide/)
25+
- [ACL](https://apache.github.io/grails-spring-security/latest/acl-plugin/guide/)
26+
- [CAS](https://apache.github.io/grails-spring-security/latest/cas-plugin/guide/)
27+
- [LDAP](https://apache.github.io/grails-spring-security/latest/ldap-plugin/guide/)
28+
- [OAuth2](https://apache.github.io/grails-spring-security/latest/oauth2-plugin/guide/)
29+
- [REST](https://apache.github.io/grails-spring-security/latest/rest-plugin/guide/)
30+
- [UI](https://apache.github.io/grails-spring-security/latest/ui-plugin/guide/)
3731

3832
### Building
3933

buildSrc/build.gradle

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,5 @@ dependencies {
5656
implementation 'org.apache.grails:grails-gradle-plugins'
5757
implementation "org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:${versions.get('ratVersion')}"
5858
implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${versions.get('gradleCryptoChecksumVersion')}"
59-
60-
testImplementation 'org.spockframework:spock-core', {
61-
exclude(group: 'org.codehaus.groovy') // Use Gradle provided version because: Could not resolve org.codehaus.groovy:groovy:3.0.12
62-
}
63-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher', {
64-
// In Gradle 9, this needs to be declared
65-
// https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
66-
}
67-
}
68-
69-
tasks.withType(Test).configureEach {
70-
onlyIf {
71-
!project.hasProperty('skipTests')
72-
}
73-
74-
useJUnitPlatform()
59+
implementation 'org.apache.grails:grails-docs-core'
7560
}

buildSrc/src/main/groovy/grails/plugin/springsecurity/CreateReleaseDropDownTask.groovy

Lines changed: 0 additions & 115 deletions
This file was deleted.

buildSrc/src/main/groovy/grails/plugin/springsecurity/Snapshot.groovy

Lines changed: 0 additions & 79 deletions
This file was deleted.

buildSrc/src/main/groovy/grails/plugin/springsecurity/SoftwareVersion.groovy

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)