Merge pull request #784 from jdaugherty/9.0.x

jdaugherty · web-flow · commit 53c9a544cb85 · 2024-12-21T18:06:18.000-05:00
Fix bom import, use liberica, use grails github actions, support the pre release workflow
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: '17'
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.11.0
@@ -36,6 +36,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           arguments: build
   publish:
@@ -49,7 +50,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        distribution: temurin
+        distribution: liberica
         java-version: '17'
     - name: Publish to repo.grails.org
       id: publish
@@ -78,7 +79,7 @@ jobs:
         if_false: ${{ github.repository }}
     - name: Publish to Github Pages
       if: steps.docs.outcome == 'success'
-      uses: micronaut-projects/github-pages-deploy-action@master
+      uses: grails/github-pages-deploy-action@main
       env:
         TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
@@ -115,6 +115,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           build-root-directory: ../groovy
           arguments: |
@@ -158,6 +159,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           arguments: |
             build
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -31,8 +31,8 @@ jobs:
       # Otherwise:
       - name: Export Gradle Properties
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
-        uses: micronaut-projects/github-actions/export-gradle-properties@master
-      - uses: micronaut-projects/github-actions/release-notes@master
+        uses: grails/github-actions/export-gradle-properties@main
+      - uses: grails/github-actions/release-notes@main
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
         id: release_notes
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
         id: release_version
         run: echo ::set-output name=release_version::${GITHUB_REF:11}
       - name: Run pre-release
-        uses: micronaut-projects/github-actions/pre-release@master
+        uses: grails/github-actions/pre-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Sonatyoe OSSRH
@@ -35,14 +35,27 @@ jobs:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo $SECRING_FILE | base64 -d > secring.gpg
           echo "Publishing Artifacts"
           (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon)
+      - name: Build Documentation
+        if: success()
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          SECRING_FILE: ${{ secrets.SECRING_FILE }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: |
           echo "Publishing Documentation"
           ./gradlew docs:docs
       - name: Export Gradle Properties
-        uses: micronaut-projects/github-actions/export-gradle-properties@master
+        uses: grails/github-actions/export-gradle-properties@main
       - name: Determine docs target repository
         if: success()
         uses: haya14busa/action-cond@v1
@@ -53,7 +66,7 @@ jobs:
           if_false: ${{ github.repository }}
       - name: Publish to Github Pages
         if: success()
-        uses: micronaut-projects/github-pages-deploy-action@master
+        uses: grails/github-pages-deploy-action@main
         env:
           BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
@@ -67,7 +80,7 @@ jobs:
           VERSION: ${{ steps.release_version.outputs.release_version }}
       - name: Run post-release
         if: success()
-        uses: micronaut-projects/github-actions/post-release@master
+        uses: grails/github-actions/post-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         env:
diff --git a/boot-plugin/build.gradle b/boot-plugin/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation platform("org.grails:grails-bom:$grailsVersion")
+
     compileOnly "org.grails:grails-shell", {
         exclude group:'org.apache.groovy', module:'groovy'
     }
diff --git a/build.gradle b/build.gradle
@@ -67,6 +67,16 @@ allprojects {
             }
         }
 //        mavenLocal() // do not commit uncommented, for local testing only
+        if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
+            System.out.println("Adding Grails Core Repo for ${project.name}")
+            maven {
+                url = 'https://maven.pkg.github.com/grails/grails-core'
+                credentials {
+                    username = 'DOES_NOT_MATTER'
+                    password = System.getenv("GITHUB_MAVEN_PASSWORD")
+                }
+            }
+        }
     }
 }
 
@@ -86,7 +96,6 @@ subprojects { Project subproject ->
         }
 
         dependencies {
-            implementation platform("org.grails:grails-bom:$grailsVersion")
             testImplementation "io.micrometer:micrometer-core:latest.integration"
             testImplementation "org.hibernate.validator:hibernate-validator"
             testImplementation "org.apache.groovy:groovy-test-junit5"
@@ -311,8 +320,9 @@ class PublishingConvention {
             name = 'rx-mongodb'
             projectName = 'RxGORM for MongoDB'
         }
-        else if(name == 'json-templates') {
-            projectName = 'JSON Views Templates'
+        else if(name.endsWith('json-templates')) {
+            projectName = 'Grails Views'
+            projectDescription = "Provides JSON Views for MongoDB to the Grails framework."
         }
         projectArtifactId = name
     }
diff --git a/examples/grails3-hibernate5-mongodb/build.gradle b/examples/grails3-hibernate5-mongodb/build.gradle
@@ -5,6 +5,7 @@ plugins {
 group "examples"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
 
     implementation project(":grails-plugin")
     implementation "org.mongodb:mongodb-driver-sync"
diff --git a/examples/grails3-mongodb-database-per-tenant/build.gradle b/examples/grails3-mongodb-database-per-tenant/build.gradle
@@ -3,6 +3,8 @@ plugins {
 }
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     implementation project(":grails-plugin")
     implementation "org.mongodb:mongodb-driver-sync"
 
diff --git a/examples/grails3-mongodb/build.gradle b/examples/grails3-mongodb/build.gradle
@@ -5,6 +5,7 @@ plugins {
 group "examples"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
 
     implementation project(":grails-plugin")
     implementation "org.mongodb:mongodb-driver-sync"
diff --git a/examples/gson-templates/build.gradle b/examples/gson-templates/build.gradle
@@ -8,6 +8,7 @@ plugins {
 group = 'functional.tests'
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
 
     implementation 'org.grails.plugins:views-json'
     implementation 'org.grails.plugins:views-markup'
diff --git a/examples/springboot-mongodb/build.gradle b/examples/springboot-mongodb/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'org.springframework.boot'
 ext['groovy.version'] = "$groovyVersion"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.mongodb:mongodb-driver-sync"
     implementation project(":gorm-mongodb-spring-boot")
diff --git a/examples/test-data-service/build.gradle b/examples/test-data-service/build.gradle
@@ -12,6 +12,8 @@ buildscript {
 apply plugin: "java"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     implementation "org.grails:grails-plugin-codecs"
     implementation "org.grails:grails-plugin-datasource"
     implementation "org.grails.plugins:cache"
diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,18 @@
-projectVersion=9.0.0-SNAPSHOT
+projectVersion=9.0.0-M2
 asciidoctorGradleVersion=4.0.3
 datastoreVersion=9.0.0-M2
 gradleNexusPublishPluginVersion=1.3.0
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
-grailsSpringSecurityCoreVersion=7.0.0-SNAPSHOT
-grailsSpringSecurityRestVersion=6.0.0-SNAPSHOT
-grailsVersion=7.0.0-SNAPSHOT
-grailsViewsVersion=4.0.0-SNAPSHOT
+grailsGradlePluginVersion=7.0.0-M2
+grailsVersion=7.0.0-M1
+grailsViewsVersion=4.0.0-M1
 groovyVersion=4.0.24
 mongodbDriverVersion=5.1.4
 testcontainersMongodbVersion=1.20.1
 
+# for example apps only
+grailsSpringSecurityCoreVersion=7.0.0-SNAPSHOT
+grailsSpringSecurityRestVersion=6.0.0-SNAPSHOT
+
 org.gradle.caching=true
 org.gradle.parallel=false
 org.gradle.daemon=true
diff --git a/grails-plugin/build.gradle b/grails-plugin/build.gradle
@@ -18,7 +18,8 @@ dependencies {
     }
     api project(":grails-datastore-gorm-mongodb-ext"), {
         exclude group:'org.grails', module:'grails-datastore-gorm-mongodb'
-    }    
+        exclude group:'org.grails', module:'grails-bom'
+    }
     api project(":grails-datastore-gorm-mongodb"), {
         exclude group:'org.springframework', module:'spring-context'
         exclude group:'org.springframework', module:'spring-core'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`implementation platform("org.grails:grails-bom:$grailsVersion")`
	`3`	`+`
`3`	`4`	`compileOnly "org.grails:grails-shell", {`
`4`	`5`	`exclude group:'org.apache.groovy', module:'groovy'`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,16 @@ allprojects {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`// mavenLocal() // do not commit uncommented, for local testing only`
	`70`	`+ if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {`
	`71`	`+ System.out.println("Adding Grails Core Repo for ${project.name}")`
	`72`	`+ maven {`
	`73`	`+ url = 'https://maven.pkg.github.com/grails/grails-core'`
	`74`	`+ credentials {`
	`75`	`+ username = 'DOES_NOT_MATTER'`
	`76`	`+ password = System.getenv("GITHUB_MAVEN_PASSWORD")`
	`77`	`+ }`
	`78`	`+ }`
	`79`	`+ }`
`70`	`80`	`}`
`71`	`81`	`}`
`72`	`82`
`@@ -86,7 +96,6 @@ subprojects { Project subproject ->`
`86`	`96`	`}`
`87`	`97`
`88`	`98`	`dependencies {`
`89`		`- implementation platform("org.grails:grails-bom:$grailsVersion")`
`90`	`99`	`testImplementation "io.micrometer:micrometer-core:latest.integration"`
`91`	`100`	`testImplementation "org.hibernate.validator:hibernate-validator"`
`92`	`101`	`testImplementation "org.apache.groovy:groovy-test-junit5"`
`@@ -311,8 +320,9 @@ class PublishingConvention {`
`311`	`320`	`name = 'rx-mongodb'`
`312`	`321`	`projectName = 'RxGORM for MongoDB'`
`313`	`322`	`}`
`314`		`- else if(name == 'json-templates') {`
`315`		`- projectName = 'JSON Views Templates'`
	`323`	`+ else if(name.endsWith('json-templates')) {`
	`324`	`+ projectName = 'Grails Views'`
	`325`	`+ projectDescription = "Provides JSON Views for MongoDB to the Grails framework."`
`316`	`326`	`}`
`317`	`327`	`projectArtifactId = name`
`318`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
	`6`	`+ implementation platform("org.grails:grails-bom:$grailsVersion")`
	`7`	`+`
`6`	`8`	`implementation project(":grails-plugin")`
`7`	`9`	`implementation "org.mongodb:mongodb-driver-sync"`
`8`	`10`