build: use org.grails.grails-publish for publishing

matrei · matrei · commit 254c76037a80 · 2025-01-24T15:39:58.000+01:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -55,8 +55,10 @@ jobs:
       - name: "📤 Publish Snapshot to repo.grails.org"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          GRADLE_PUBLISH_RELEASE: 'false'
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+          MAVEN_PUBLISH_URL: ${{ secrets.MAVEN_PUBLISH_SNAPSHOT_URL }}
         run: ./gradlew --no-build-cache publish
   trigger-build-gorm-impls:
     if: github.event_name == 'push'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,11 +56,13 @@ jobs:
         id: publish
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GRAILS_PUBLISH_RELEASE: 'true'
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
+          NEXUS_PUBLISH_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 }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
         run: >
           ./gradlew --no-build-cache
           -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
@@ -90,9 +92,11 @@ jobs:
       - name: "🚀 Release Sonatype Staging Repository"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          GRAILS_PUBLISH_RELEASE: 'true'
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
+          NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
+          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
         run: >
           ./gradlew
           findSonatypeStagingRepository
diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,5 @@
-io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
-
-buildscript {
-    repositories {
-        maven { url = 'https://repo.grails.org/grails/core' }
-    }
-    dependencies {
-        classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
-    }
-}
-
-group = 'org.grails'
-version = project.projectVersion
-
 ext {
     isCiBuild = System.getenv('CI')
-    isSnapshot = projectVersion.endsWith('-SNAPSHOT')
-    isReleaseVersion = !isSnapshot
     excludeUnusedTransDeps = findProperty('excludeUnusedTransDeps')
 }
 
@@ -62,25 +46,7 @@ allprojects {
     }
 }
 
-if (isReleaseVersion) {
-    apply plugin: 'io.github.gradle-nexus.publish-plugin'
-    nexusPublishing {
-        repositories {
-            sonatype {
-                nexusUrl = uri('https://s01.oss.sonatype.org/service/local')
-                username = System.getenv('SONATYPE_USERNAME') ?: ''
-                password = System.getenv('SONATYPE_PASSWORD') ?: ''
-                stagingProfileId = System.getenv('SONATYPE_STAGING_PROFILE_ID') ?: ''
-            }
-        }
-    }
-    //do not generate extra load on Nexus with new staging repository if signing fails
-    tasks.withType(InitializeNexusStagingRepository).configureEach {
-        shouldRunAfter = tasks.withType(Sign)
-    }
-}
-
 tasks.register('clean', Delete) {
     group = 'build'
     delete layout.buildDirectory
-}
+}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -0,0 +1,28 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+def versions = new Properties()
+file('../gradle.properties').withInputStream {
+    versions.load(it)
+}
+
+repositories {
+    mavenLocal()
+    maven { url = 'https://repo.grails.org/grails/core' }
+    mavenCentral()
+    if (System.getenv('GITHUB_MAVEN_PASSWORD')) {
+        maven {
+            url = 'https://maven.pkg.github.com/grails/grails-core'
+            credentials {
+                username = 'DOES_NOT_MATTER'
+                password = System.getenv('GITHUB_MAVEN_PASSWORD')
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation platform("org.grails:grails-bom:${versions.getProperty('grailsVersion')}")
+    implementation 'org.grails:grails-gradle-plugin'
+}
diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle
@@ -1,6 +1 @@
-compileJava.options.release = javaVersion.toInteger()
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
+compileJava.options.release = javaVersion.toInteger()
diff --git a/gradle/publish-config.gradle b/gradle/publish-config.gradle
@@ -1,77 +1,18 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-ext.set('signing.keyId', System.getenv('SIGNING_KEY'))
-ext.set('signing.password', System.getenv('SIGNING_PASSPHRASE'))
-ext.set('signing.secretKeyRingFile', project.findProperty('signing.secretKeyRingFile') ?: "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg")
-
-publishing {
-    if (isSnapshot) {
-        repositories {
-            maven {
-                credentials {
-                    username = System.getenv('ARTIFACTORY_USERNAME') ?: ''
-                    password = System.getenv('ARTIFACTORY_PASSWORD') ?: ''
-                }
-                url = 'https://repo.grails.org/grails/libs-snapshots-local'
-            }
-        }
-    }
-
-    publications {
-        maven(MavenPublication) {
-
-            artifactId = project.findProperty('artifactId') ?: project.name
-            groupId = project.group
-            version = project.version
-
-            from components.java
-
-            pom {
-                name = project.findProperty('pomTitle') ?: 'Grails GORM'
-                description = project.findProperty('pomDescription') ?: 'GORM - Grails Data Access Framework'
-                url = 'https://gorm.grails.org/'
-
-                licenses {
-                    license {
-                        name = 'The Apache Software License, Version 2.0'
-                        url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
-                        distribution = 'repo'
-                    }
-                }
-
-                developers {
-                    for (dev in project.findProperty('pomDevelopers') ?: [[id: 'graemerocher', name: 'Graeme Rocher'], [id: 'jeffscottbrown', name: 'Jeff Brown'], [id: 'burtbeckwith', name: 'Burt Beckwith'], [id: 'jameskleeh', name: 'James Kleeh'], [id: 'puneetbehl', name: 'Puneet Behl'], [id: 'jamesfredley', name: 'James Fredley']]) {
-                        developer {
-                            id = dev.id
-                            name = dev.name
-                        }
-                    }
-                }
-
-                scm {
-                    url = 'scm:git@github.com:grails/grails-data-mapping.git'
-                    connection = 'scm:git@github.com:grails/grails-data-mapping.git'
-                    developerConnection = 'scm:git@github.com:grails/grails-data-mapping.git'
-                }
-            }
-
-            // dependency management shouldn't be included
-            pom.withXml {
-                def pomNode = asNode()
-                try { pomNode.dependencyManagement.replaceNode({}) } catch (Throwable ignore) {}
-            }
-        }
-    }
+import org.grails.gradle.plugin.publishing.GrailsPublishExtension
+
+apply plugin: 'org.grails.grails-publish'
+
+project.extensions.configure(GrailsPublishExtension) {
+    it.githubSlug = 'grails/grails-data-mapping'
+    it.license.name = 'Apache-2.0'
+    it.title = findProperty('pomTitle') ?: 'Grails GORM'
+    it.desc = findProperty('pomDescription') ?: 'GORM - Grails Data Access Framework'
+    it.developers = findProperty('pomDevelopers') as Map<String,String> ?: [
+            'graemerocher': 'Graeme Rocher',
+            'jeffscottbrown': 'Jeff Brown',
+            'burtbeckwith': 'Burt Beckwith',
+            'jameskleeh': 'James Kleeh',
+            'puneetbehl': 'Puneet Behl',
+            'jamesfredley': 'James Fredley'
+    ]
 }
-
-afterEvaluate {
-    signing {
-        required = { isReleaseVersion && gradle.taskGraph.hasTask('publish') }
-        sign(publishing.publications.maven)
-    }
-}
-
-tasks.withType(Sign).configureEach {
-    onlyIf { isReleaseVersion }
-}
diff --git a/grails-gorm-testing-support/build.gradle b/grails-gorm-testing-support/build.gradle
@@ -9,10 +9,7 @@ group = 'org.grails'
 ext {
     pomTitle = 'Grails Web Testing Support'
     pomDescription = 'Support for writing concise expressive tests for Grails Web Artifacts'
-    pomDevelopers = [
-            [id: 'jeffscottbrown', name: 'Jeff Brown'],
-            [id: 'jameskleeh', name: 'James Kleeh']
-    ]
+    pomDevelopers = ['jeffscottbrown': 'Jeff Brown', 'jameskleeh': 'James Kleeh']
 }
 
 dependencies {
