Merge pull request #147 from jdaugherty/6.0.x

Publish Plugin Update + Groovy 4.0.24
grails · Dec 3, 2024 · 71c6af2 · 71c6af2
2 parents b820b51 + 830465f
commit 71c6af2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -19,20 +19,14 @@ 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"
 }
 
 grailsPublish {
-    userOrg = 'grails'
     githubSlug = 'grails/scaffolding'
     license {
         name = 'Apache-2.0'

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,6 @@
 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