Skip to content
This repository was archived by the owner on Feb 28, 2025. It is now read-only.

Commit 5e83ccd

Browse files
committed
[skip ci] pre-release 6.0.0-M1
1 parent 3900a1c commit 5e83ccd

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: gradle/actions/wrapper-validation@v3
2121
- name: Setup Java
2222
uses: actions/setup-java@v4
23-
with: { java-version: 17, distribution: temurin }
23+
with: { java-version: 17, distribution: liberica }
2424
- name: Run Tests
2525
uses: gradle/actions/setup-gradle@v3
2626
env:
@@ -39,7 +39,7 @@ jobs:
3939
- uses: gradle/wrapper-validation-action@v3
4040
- uses: actions/setup-java@v4
4141
with:
42-
distribution: temurin
42+
distribution: liberica
4343
java-version: 17
4444
- name: Publish to Artifactory (repo.grails.org)
4545
uses: gradle/actions/setup-gradle@v3

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: gradle/actions/wrapper-validation@v3
2020
- name: Set up JDK
2121
uses: actions/setup-java@v4
22-
with: { java-version: 17, distribution: temurin }
22+
with: { java-version: 17, distribution: liberica }
2323
- name: Set the current release version
2424
id: release_version
2525
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -63,7 +63,7 @@ jobs:
6363
uses: gradle/actions/wrapper-validation@v3
6464
- name: Set up JDK
6565
uses: actions/setup-java@v4
66-
with: { java-version: 17, distribution: temurin }
66+
with: { java-version: 17, distribution: liberica }
6767
- name: Nexus Staging Close And Release
6868
uses: gradle/gradle-build-action@v3
6969
env:
@@ -98,7 +98,7 @@ jobs:
9898
uses: gradle/actions/wrapper-validation@v3
9999
- name: Set up JDK
100100
uses: actions/setup-java@v4
101-
with: { java-version: 17, distribution: temurin }
101+
with: { java-version: 17, distribution: liberica }
102102
- name: Generate Documentation
103103
id: docs
104104
uses: gradle/actions/setup-gradle@v3

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ version projectVersion
2727
group "org.grails.plugins"
2828

2929
subprojects { Project project ->
30-
group "org.grails.plugins"
31-
version projectVersion
30+
project.group "org.grails.plugins"
31+
project.version projectVersion
3232

3333
ext.set('grailsVersion', project.grailsVersion)
3434
ext.set('isProfile', project.name.endsWith('-profile'))
@@ -54,6 +54,8 @@ subprojects { Project project ->
5454
apply plugin: "java-library"
5555

5656
dependencies {
57+
implementation platform("org.grails:grails-bom:$grailsVersion")
58+
5759
console "org.grails:grails-console"
5860

5961
api "org.springframework.boot:spring-boot-starter-logging"

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
projectVersion=6.0.0-SNAPSHOT
2-
grailsVersion=7.0.0-SNAPSHOT
2+
grailsVersion=7.0.0-M1
33
grailsGradlePluginVersion=7.0.0-SNAPSHOT
4-
gradlePublishPlugin=2.0.0
5-
springSecurityCoreVersion=7.0.0-SNAPSHOT
4+
springSecurityCoreVersion=7.0.0-M1
5+
grailsRedisVersion=5.0.0-M1
66
pac4jVersion=6.0.6
77
jackson.version=2.18.0
88
mavenPublishUrl=https://repo.grails.org/grails/plugins3-snapshots-local
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
api project(":spring-security-rest")
3-
api "org.grails.plugins:grails-redis:5.0.0-SNAPSHOT"
3+
api "org.grails.plugins:grails-redis:$grailsRedisVersion"
44
api "redis.clients:jedis"
55

6-
profile "org.grails.profiles:plugin:${grailsVersion}"
6+
profile "org.grails.profiles:plugin:$grailsVersion"
77
}

spring-security-rest-testapp-profile/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
buildscript {
2-
repositories {
3-
maven { url "https://repo.grails.org/grails/core" }
4-
}
5-
dependencies {
6-
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
7-
}
8-
}
9-
101
tasks.register('generateProfileConfig') {
112
copy {
123
from 'profile.yml.tmpl'

0 commit comments

Comments
 (0)