From a4ab537f7b653e948be00f98036f506d853c9735 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Tue, 3 Dec 2024 15:14:41 -0500 Subject: [PATCH 1/4] Updates to grails-publish plugin --- .github/workflows/gradle.yml | 5 +++-- .github/workflows/release.yml | 8 ++++---- build.gradle | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e944381..d0a51f7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,8 +33,9 @@ jobs: - name: "📤 Publish Snapshot to repo.grails.org" if: success() && github.event_name == 'push' env: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }} + MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }} + MAVEN_PUBLISH_URL: ${{ secrets.MAVEN_PUBLISH_SNAPSHOT_URL }} DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} run: > diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b6aa574..898f085 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,10 +34,10 @@ jobs: env: DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} - SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }} + NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} + NEXUS_PUBLISH_NEXUS_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }} + NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SECRING_FILE: ${{ secrets.SECRING_FILE }} diff --git a/build.gradle b/build.gradle index 9672f73..6b27783 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' id 'org.grails.grails-plugin' id 'org.grails.grails-gsp' - id 'org.grails.internal.grails-plugin-publish' + id 'org.grails.grails-publish' } version = project.projectVersion @@ -32,7 +32,6 @@ dependencies { } grailsPublish { - userOrg = 'grails' githubSlug = 'grails/scaffolding' license { name = 'Apache-2.0' From 73641673a07f0305029486245cddea4ba578888c Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Tue, 3 Dec 2024 15:15:00 -0500 Subject: [PATCH 2/4] Update groovy version to 4.0.24 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6ffcf5d..d5c5e14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ projectVersion=6.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT fieldsVersion=6.0.0-SNAPSHOT -groovyVersion=4.0.23 +groovyVersion=4.0.24 org.gradle.caching=true org.gradle.daemon=true From c05d0cbf1cce78aa2f3adbbea51c18eca1d98067 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Tue, 3 Dec 2024 16:04:45 -0500 Subject: [PATCH 3/4] add jline:jline dependency --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 6b27783..85a7948 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,7 @@ dependencyManagement { dependencies { api "org.grails:grails-plugin-rest" api "org.grails.plugins:fields:$fieldsVersion" + compileOnly "jline:jline" } grailsPublish { From 830465fd997cc367328bc9d8cc4557427a6b26de Mon Sep 17 00:00:00 2001 From: James Fredley Date: Tue, 3 Dec 2024 16:08:07 -0500 Subject: [PATCH 4/4] use grails-bom version of fields plugin and switch to Gradle Platform instead of Spring dependency management plugin --- build.gradle | 10 ++-------- gradle.properties | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 85a7948..8ec8aa1 100644 --- a/build.gradle +++ b/build.gradle @@ -19,16 +19,10 @@ java { } } -dependencyManagement { - imports { - mavenBom "org.grails:grails-bom:$grailsVersion" - } - applyMavenExclusions false -} - dependencies { + implementation platform("org.grails:grails-bom:$grailsVersion") api "org.grails:grails-plugin-rest" - api "org.grails.plugins:fields:$fieldsVersion" + api "org.grails.plugins:fields" compileOnly "jline:jline" } diff --git a/gradle.properties b/gradle.properties index d5c5e14..302fb13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ projectVersion=6.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT -fieldsVersion=6.0.0-SNAPSHOT groovyVersion=4.0.24 org.gradle.caching=true