Merge pull request #2073 from jdaugherty/9.0.x

apache coordinate move

Author: jdaugherty

.github/renovate.json

@@ -20,42 +20,9 @@
     },
     {
       "matchPackageNames": [
-        "org.grails:grails-bom",
-        "org.grails:grails-bootstrap",
-        "org.grails:grails-codecs",
-        "org.grails:grails-console",
-        "org.grails:grails-core",
-        "org.grails:grails-databinding",
-        "org.grails:grails-dependencies",
-        "org.grails:grails-docs",
-        "org.grails:grails-encoder",
-        "org.grails:grails-gradle-model",
-        "org.grails:grails-logging",
-        "org.grails:grails-plugin-codecs",
-        "org.grails:grails-plugin-controllers",
-        "org.grails:grails-plugin-databinding",
-        "org.grails:grails-plugin-datasource",
-        "org.grails:grails-plugin-domain-class",
-        "org.grails:grails-plugin-i18n",
-        "org.grails:grails-plugin-interceptors",
-        "org.grails:grails-plugin-mimetypes",
-        "org.grails:grails-plugin-rest",
-        "org.grails:grails-plugin-services",
-        "org.grails:grails-plugin-url-mappings",
-        "org.grails:grails-plugin-url-validation",
-        "org.grails:grails-shell",
-        "org.grails:grails-spring",
-        "org.grails:grails-test",
-        "org.grails:grails-validation",
-        "org.grails:grails-web",
-        "org.grails:grails-web-boot",
-        "org.grails:grails-web-common",
-        "org.grails:grails-web-databinding",
-        "org.grails:grails-web-fileupload",
-        "org.grails:grails-web-mvc",
-        "org.grails:grails-web-url-mappings"
+        "org.grails:grails-bom"
       ],
-      "groupName": "grails monorepo"
+      "groupName": "grails bom"
     }
   ]
 }

.github/workflows/gradle.yml

@@ -28,7 +28,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 Build"
         id: build
         env:
@@ -53,7 +53,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: "▶️ Start MongoDB (needed for some tests)"
         uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action)
         with:
@@ -81,7 +81,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 Build"
         id: build
         env:
@@ -103,15 +103,14 @@ 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: "📤 Publish Snapshot to repo.grails.org"
         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 }}
-          # NOTE: secrets.MAVEN_PUBLISH_URL == https://repo.grails.org/grails/plugins3-snapshot-local
-          MAVEN_PUBLISH_URL: https://repo.grails.org/grails/libs-snapshots-local
+          MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }}
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW  }}
         run: ./gradlew --no-build-cache publish
   docs:
     if: github.event_name == 'push'
@@ -130,7 +129,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: "🔨 Build Docs"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
@@ -162,7 +161,7 @@ jobs:
         continue-on-error: true
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.GH_TOKEN }} # must be a PAT since we're triggering on an external repo
+          github-token: ${{ secrets.GRAILS_GH_TOKEN }} # must be a PAT since we're triggering on an external repo
           script: |
             try {
               const result = await github.rest.actions.createWorkflowDispatch({

.github/workflows/groovy-joint-workflow.yml

@@ -47,7 +47,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 Groovy version to use when building the project"
         id: groovy-version
         run: |
@@ -69,7 +69,7 @@ jobs:
         id: develocity-conf-2
         run: |
           echo "VALUE<<EOF" >> $GITHUB_OUTPUT
-          echo "def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null" >> $GITHUB_OUTPUT
+          echo "def isAuthenticated = System.getenv('GRAILS_DEVELOCITY_ACCESS_KEY') != null" >> $GITHUB_OUTPUT
           echo "develocity {" >> $GITHUB_OUTPUT
           echo "    server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT
           echo "    buildScan {" >> $GITHUB_OUTPUT
@@ -119,7 +119,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: "🗄️ Restore local Maven repository from cache"
         uses: actions/cache@v4
         with:

.github/workflows/release-notes.yml

@@ -19,4 +19,4 @@ jobs:
       - name: "📝 Update Release Draft"
         uses: release-drafter/release-drafter@v6
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GRAILS_GH_TOKEN }}

.github/workflows/release.yml

@@ -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: "⚙️ Run pre-release"
         uses: apache/grails-github-actions/pre-release@asf
       - name: "🔍 Determine Target Branch"
@@ -84,7 +84,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: "🚀 Release Sonatype Staging Repository"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
@@ -117,7 +117,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: "📖 Generate documentation"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -22,18 +22,15 @@ allprojects {
     }
 
     repositories {
+        // Used for testing locally against the latest snapshot of Groovy & for pulling dependencies in other repos
+        // Usage: ./gradlew build -P"groovyVersion=X.X.X-SNAPSHOT"
+        maven {
+            name = 'ASF Snapshot repo'
+            url = 'https://repository.apache.org/content/repositories/snapshots'
+        }
         mavenCentral()
         maven { url = 'https://repo.grails.org/grails/core' }
         // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
-        if (customGroovyVersion?.endsWith('-SNAPSHOT')) {
-            // Used for testing locally against the latest snapshot of Groovy
-            // Usage: ./gradlew build -P"groovyVersion=X.X.X-SNAPSHOT"
-            logger.lifecycle('Adding Groovy Snapshot Repo for project: {}, Using Groovy {}', name, customGroovyVersion)
-            maven {
-                name = 'ASF Snapshot repo'
-                url = 'https://repository.apache.org/content/repositories/snapshots'
-            }
-        }
         if (System.getenv('GITHUB_MAVEN_PASSWORD') && !grailsVersion.endsWith('-SNAPSHOT')) {
             logger.lifecycle('Adding Grails Core Staging Repo for project: {}', name)
             maven {
@@ -58,34 +55,34 @@ def publishedProjects = [
         'grails-datastore-async',
         'grails-datastore-core',
         'grails-datastore-gorm',
-        'grails-datastore-gorm-async',
+        'grails-datamapping-async',
         //'grails-datastore-gorm-rx',
-        'grails-datastore-gorm-support',
-        'grails-datastore-gorm-tck',
-        'grails-datastore-gorm-tck-base',
-        'grails-datastore-gorm-tck-domains',
-        'grails-datastore-gorm-validation',
+        'grails-datamapping-support',
+        'grails-datamapping-tck-tests',
+        'grails-datamapping-tck-base',
+        'grails-datamapping-tck-domains',
+        'grails-datamapping-validation',
         'grails-datastore-web',
-        'grails-gorm-testing-support',
+        'grails-testing-support-datamapping',
         // simple
         'simple-gorm',
         // hibernate5
         'hibernate5-boot-plugin',
         'hibernate5-database-migration',
-        'hibernate5-gorm',
+        'hibernate5-core',
         'hibernate5-grails-plugin',
         // mongodb
         'mongodb-boot-plugin',
-        'mongodb-gorm',
-        'mongodb-gorm-bson',
-        'mongodb-gorm-ext',
+        'mongodb-core',
+        'mongodb-bson',
+        'mongodb-ext',
         'mongodb-grails-plugin',
-        'mongodb-views-json-templates'
+        'mongodb-gson-templates'
 ]
 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'
     }
 }
 

buildSrc/build.gradle

@@ -8,7 +8,7 @@ file('../gradle.properties').withInputStream {
 }
 
 repositories {
-//    mavenLocal()
+    maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
     maven { url = 'https://repo.grails.org/grails/core' }
     mavenCentral()
     if (System.getenv('GITHUB_MAVEN_PASSWORD')) {
@@ -23,9 +23,8 @@ repositories {
 }
 
 dependencies {
-    implementation platform("org.grails:grails-bom:${versions.getProperty('grailsVersion')}")
-    implementation 'org.grails:grails-gradle-plugin'
+    implementation platform("org.apache.grails:grails-bom:${versions.getProperty('grailsVersion')}")
+    implementation 'org.apache.grails:grails-gradle-plugins'
     implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
-    implementation 'org.grails.plugins:views-gradle'
     implementation 'org.springframework.boot:spring-boot-gradle-plugin'
 }

docs/guide-developer/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 version project.projectVersion
-group 'org.grails'
+group 'org.apache.grails'
 
 def asciidoctorAttributes = [
         icons               : 'font',

docs/guide-developer/src/main/docs/gettingStarted.adoc

@@ -31,8 +31,8 @@ The project is essentially a multi-project Gradle build. There is a core API and
 
 * `grails-datastore-core` - The core API, this provides core interfaces for implementing a GORM provider
 * `grails-datastore-gorm` - The runtime meta-programming and AST transformation infrastructure behind GORM. This also provides end users with APIs like `grails.gorm.CriteriaBuilder` and `grails.gorm.DetachedCriteria`
-* `grails-datastore-gorm-support` - Support classes for easing the writing of a GORM plugin for Grails
-* `grails-datastore-gorm-tck` - The TCK that includes hundreds of Spock specifications that a GORM implementation will need to pass
+* `grails-datamapping-support` - Support classes for easing the writing of a GORM plugin for Grails
+* `grails-datamapping-tck-tests` - The TCK that includes hundreds of Spock specifications that a GORM implementation will need to pass
 * `grails-datastore-web` - Classes required to integrate GORM into a web tier
 
 In addition to this, there are separate projects of GORM implementations for various datastores:

docs/guide-developer/src/main/docs/stepByStep.adoc

@@ -30,9 +30,9 @@ With contents:
 dependencies {
     implementation project(':grails-datastore-gorm'),
             project(':grails-datastore-web'),
-            project(':grails-datastore-gorm-support')
+            project(':grails-datamapping-support')
             
-    testImplementation project(':grails-datastore-gorm-tck')
+    testImplementation project(':grails-datamapping-tck-tests')
     testRuntime "javax.servlet:javax.servlet-api:$servletApiVersion"
 
 }