Skip to content

Commit

Permalink
[skip ci] pre-release 6.0.0-M1
Browse files Browse the repository at this point in the history
  • Loading branch information
jdaugherty committed Dec 24, 2024
1 parent 3900a1c commit 5e83ccd
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: gradle/actions/wrapper-validation@v3
- name: Setup Java
uses: actions/setup-java@v4
with: { java-version: 17, distribution: temurin }
with: { java-version: 17, distribution: liberica }
- name: Run Tests
uses: gradle/actions/setup-gradle@v3
env:
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: gradle/wrapper-validation-action@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
distribution: liberica
java-version: 17
- name: Publish to Artifactory (repo.grails.org)
uses: gradle/actions/setup-gradle@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: gradle/actions/wrapper-validation@v3
- name: Set up JDK
uses: actions/setup-java@v4
with: { java-version: 17, distribution: temurin }
with: { java-version: 17, distribution: liberica }
- name: Set the current release version
id: release_version
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
uses: gradle/actions/wrapper-validation@v3
- name: Set up JDK
uses: actions/setup-java@v4
with: { java-version: 17, distribution: temurin }
with: { java-version: 17, distribution: liberica }
- name: Nexus Staging Close And Release
uses: gradle/gradle-build-action@v3
env:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: gradle/actions/wrapper-validation@v3
- name: Set up JDK
uses: actions/setup-java@v4
with: { java-version: 17, distribution: temurin }
with: { java-version: 17, distribution: liberica }
- name: Generate Documentation
id: docs
uses: gradle/actions/setup-gradle@v3
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ version projectVersion
group "org.grails.plugins"

subprojects { Project project ->
group "org.grails.plugins"
version projectVersion
project.group "org.grails.plugins"
project.version projectVersion

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

dependencies {
implementation platform("org.grails:grails-bom:$grailsVersion")

console "org.grails:grails-console"

api "org.springframework.boot:spring-boot-starter-logging"
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
projectVersion=6.0.0-SNAPSHOT
grailsVersion=7.0.0-SNAPSHOT
grailsVersion=7.0.0-M1
grailsGradlePluginVersion=7.0.0-SNAPSHOT
gradlePublishPlugin=2.0.0
springSecurityCoreVersion=7.0.0-SNAPSHOT
springSecurityCoreVersion=7.0.0-M1
grailsRedisVersion=5.0.0-M1
pac4jVersion=6.0.6
jackson.version=2.18.0
mavenPublishUrl=https://repo.grails.org/grails/plugins3-snapshots-local
4 changes: 2 additions & 2 deletions spring-security-rest-redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
api project(":spring-security-rest")
api "org.grails.plugins:grails-redis:5.0.0-SNAPSHOT"
api "org.grails.plugins:grails-redis:$grailsRedisVersion"
api "redis.clients:jedis"

profile "org.grails.profiles:plugin:${grailsVersion}"
profile "org.grails.profiles:plugin:$grailsVersion"
}
9 changes: 0 additions & 9 deletions spring-security-rest-testapp-profile/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
buildscript {
repositories {
maven { url "https://repo.grails.org/grails/core" }
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
}
}

tasks.register('generateProfileConfig') {
copy {
from 'profile.yml.tmpl'
Expand Down

0 comments on commit 5e83ccd

Please sign in to comment.