build: Apache artifact rename

Author: matrei

.github/workflows/gradle.yml

@@ -9,6 +9,8 @@ on:
       - '[4-9]+.[0-9]+.x'
       - '[3-9]+.[3-9]+.x'      
   workflow_dispatch:
+permissions:
+  packages: read
 jobs:
   core-tests:
     runs-on: ubuntu-24.04
@@ -23,7 +25,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃‍♂️ Run Tests"
         run: ./gradlew check --max-workers=2 --refresh-dependencies --continue
   functional-test:
@@ -43,7 +45,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃‍♂️ Run Different Config Functional Tests"
         run: ./gradlew core-examples-functional-test-app:check -DTESTCONFIG=${{ matrix.test-config }}
   build:
@@ -62,13 +64,14 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-      - name: "📤 Publish Snapshot artifacts to Artifactory (repo.grails.org)"
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+      - name: "📤 Publish Snapshot artifacts"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           GRADLE_PUBLISH_RELEASE: 'false'
-          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
-          MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW }}
+          MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }}
         run: ./gradlew --no-build-cache publish
       - name: "🔨 Generate Snapshot Documentation"
         run: ./gradlew aggregateDocs

.github/workflows/release.yml

@@ -2,9 +2,9 @@ name: "Release"
 on:
   release:
     types: [published]
-env:
-  GIT_USER_NAME: grails-build
-  GIT_USER_EMAIL: grails-build@users.noreply.github.com
+permissions:
+  contents: write
+  packages: read
 jobs:
   release:
     runs-on: ubuntu-24.04
@@ -23,7 +23,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "📝 Store the current release version"
         id: release_version
         run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -37,10 +37,10 @@ jobs:
         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 }}
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW }}
+          NEXUS_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_RELEASE_URL }}
+          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }} # TODO: What about this secret?
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
         run: >

build.gradle

@@ -1,5 +1,3 @@
-import org.asciidoctor.gradle.jvm.AsciidoctorTask
-
 String customGroovyVersion = findProperty('groovyVersion') ?: System.getenv('GROOVY_VERSION')
 if (customGroovyVersion) {
     logger.lifecycle("Using custom Groovy version: $customGroovyVersion")
@@ -21,6 +19,7 @@ subprojects {
 
     repositories {
         maven { url = 'https://repo.grails.org/grails/core' }
+        maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
         mavenCentral()
         if (customGroovyVersion?.endsWith('-SNAPSHOT')) {
             // Used for testing locally against the latest snapshot of Groovy
@@ -61,9 +60,9 @@ def publishedProjects = [
 subprojects {
     if (name in publishedProjects) {
         // This has to be applied here
-        apply plugin: 'org.grails.grails-publish'
+        apply plugin: 'org.apache.grails.gradle.grails-publish'
     }
-    else if(name == 'spring-security-rest-testapp-profile') {
-        apply plugin: 'org.grails.grails-profile-publish'
+    else if (name == 'spring-security-rest-testapp-profile') {
+        apply plugin: 'org.apache.grails.gradle.grails-publish-profile'
     }
 }

buildSrc/build.gradle

@@ -10,13 +10,14 @@ file('../gradle.properties').withInputStream {
 repositories {
     mavenCentral()
     maven { url = 'https://repo.grails.org/grails/core' }
+    maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
 }
 
 dependencies {
-    implementation platform("org.grails:grails-bom:${versions.get('grailsVersion')}")
+    implementation platform("org.apache.grails:grails-bom:${versions.get('grailsVersion')}")
     implementation "org.asciidoctor:asciidoctor-gradle-jvm:${versions.get('asciidoctorGradlePluginVersion')}"
     implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
-    implementation 'org.grails:grails-gradle-plugin'
+    implementation 'org.apache.grails:grails-gradle-plugins'
     testImplementation 'org.spockframework:spock-core'
 }
 

gradle.properties

@@ -1,7 +1,10 @@
 projectVersion=7.0.0-SNAPSHOT
-grailsVersion=7.0.0-M3
+grailsVersion=7.0.0-SNAPSHOT
 javaVersion=17
 
+# Temporary version property until it can be resolved via grails-bom
+grailsCacheVersion=8.0.0-SNAPSHOT
+
 apacheDsVersion=1.5.4
 asciidoctorGradlePluginVersion=4.0.4
 casClientCoreVersion=4.0.4

gradle/docs-config.gradle

@@ -6,14 +6,14 @@ apply plugin: 'org.asciidoctor.jvm.convert'
 configurations.register('documentation')
 
 dependencies {
-    add('documentation', platform("org.grails:grails-bom:$grailsVersion"))
+    add('documentation', platform("org.apache.grails:grails-bom:$grailsVersion"))
     add('documentation', 'com.github.javaparser:javaparser-core')
     add('documentation', 'org.apache.groovy:groovy-groovydoc')
 }
 
 tasks.register('createReleaseDropDown', CreateReleaseDropDownTask) {
     group = 'documentation'
-    githubSlug = 'grails/grails-spring-security'
+    githubSlug = 'apache/grails-spring-security'
     currentVersion = version
     versions = docsVersionSelectorInclude.split(',').collect { it.strip() }
     index = layout.buildDirectory.file('docs/index.html')

gradle/examples-config.gradle

@@ -1,3 +1,17 @@
 tasks.withType(Groovydoc).configureEach {
     enabled = false
+}
+
+tasks.named('bootJar') {
+    // Workaround for:
+    // Execution failed for task ':core-examples-functional-test-app:bootJar'.
+    // > Entry BOOT-INF/lib/grails-web-databinding-7.0.0-SNAPSHOT.jar is a duplicate but no duplicate handling strategy has been set. Please refer to https://docs.gradle.org/8.12.1/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy for details.
+    enabled = false
+}
+
+tasks.matching { 'assetCompile' == it.name }.configureEach {
+    // Workaround for: https://github.com/bertramdev/asset-pipeline/issues/177
+    // Execution failed for task ':cas-examples-spring-security-cas-test1:assetCompile'.
+    // > java.util.ConcurrentModificationException (no error message)
+    outputs.dir rootProject.layout.buildDirectory.dir('asset-serialize')
 }

gradle/java-config.gradle

@@ -1,6 +1,6 @@
 compileJava.options.release = javaVersion.toInteger()
 
-java {
-    withJavadocJar()
-    withSourcesJar()
+extensions.configure(JavaPluginExtension)  {
+    it.withJavadocJar()
+    it.withSourcesJar()
 }

gradle/publish-config.gradle

@@ -1,9 +1,5 @@
 import org.grails.gradle.plugin.publishing.GrailsPublishExtension
 
-ext {
-    mavenPublishUrl = findProperty('snapshotPublishUrl') ?: 'https://repo.grails.org/plugins3-snapshots-local'
-}
-
 extensions.configure(GrailsPublishExtension) {
 
     def requiredProperties = ['publishArtifactId', 'pomTitle', 'pomDescription', 'pomDevelopers']

gradle/test-config.gradle

@@ -1,7 +1,7 @@
 dependencies {
     // In Gradle 9, this needs to be declared
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
 }
 
 tasks.withType(Test).configureEach {
@@ -10,13 +10,17 @@ tasks.withType(Test).configureEach {
         exceptionFormat = 'full'
         events 'passed', 'skipped', 'failed'//, 'standardOut', 'standardError'
     }
-    beforeTest { descriptor -> logger.quiet " -- $descriptor" }
+    beforeTest { descriptor -> logger.quiet(" -- $descriptor") }
 }
 
 tasks.named('integrationTest', Test) {
     systemProperty 'geb.build.reportsDir', reporting.file("$project.projectDir/build/geb-reports")
     systemProperties System.properties
     doFirst {
-        logger.quiet "\n - Running tests for configuration: ${System.getProperty('TESTCONFIG') ?: 'N/S'} and Grails: $grailsVersion"
+        logger.quiet(
+                '\n - Running tests for configuration: {} and Grails: {}',
+                System.getProperty('TESTCONFIG', 'N/S'),
+                grailsVersion
+        )
     }
 }