diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9bfea40b..312c4604 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -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: @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b035b3b0..e992d17f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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: @@ -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 diff --git a/build.gradle b/build.gradle index ae56dd0f..be10fa02 100644 --- a/build.gradle +++ b/build.gradle @@ -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')) @@ -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" diff --git a/gradle.properties b/gradle.properties index aa5952fa..6059d56b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file diff --git a/spring-security-rest-redis/build.gradle b/spring-security-rest-redis/build.gradle index 40614592..4c5f163e 100644 --- a/spring-security-rest-redis/build.gradle +++ b/spring-security-rest-redis/build.gradle @@ -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" } \ No newline at end of file diff --git a/spring-security-rest-testapp-profile/build.gradle b/spring-security-rest-testapp-profile/build.gradle index 178817db..250ec0dd 100644 --- a/spring-security-rest-testapp-profile/build.gradle +++ b/spring-security-rest-testapp-profile/build.gradle @@ -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'