diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 48a71129..350389d8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,12 +17,13 @@ jobs: - uses: gradle/wrapper-validation-action@v2 - uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: Run Gradle build uses: gradle/actions/setup-gradle@v3 env: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} with: arguments: build publish_documentation: @@ -35,7 +36,7 @@ jobs: - uses: gradle/wrapper-validation-action@v2 - uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: Publish to Artifactory (repo.grails.org) uses: gradle/actions/setup-gradle@v3 @@ -56,7 +57,7 @@ jobs: arguments: docs - name: Publish to Github Pages if: success() - uses: micronaut-projects/github-pages-deploy-action@grails + uses: grails/github-pages-deploy-action@grails env: TARGET_REPOSITORY: ${{ github.repository }} GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 9e72bd75..37701478 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -99,6 +99,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: | @@ -142,6 +143,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 index 87b925df..096ed549 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -34,8 +34,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 index d11fc383..4f8a0225 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT - name: Run pre-release - uses: micronaut-projects/github-actions/pre-release@master + uses: grails/github-actions/pre-release@main - name: Generate secring file env: @@ -38,6 +38,7 @@ jobs: SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} with: arguments: | -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg @@ -54,7 +55,7 @@ jobs: - name: Publish Documentation to Github Pages if: success() - uses: micronaut-projects/github-pages-deploy-action@grails + uses: grails/github-pages-deploy-action@grails env: TARGET_REPOSITORY: ${{ github.repository }} GH_TOKEN: ${{ secrets.GH_TOKEN }} @@ -67,4 +68,4 @@ jobs: - name: Run post-release if: steps.publish_to_sonatype.outcome == 'success' - uses: micronaut-projects/github-actions/post-release@master \ No newline at end of file + uses: grails/github-actions/post-release@main \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2030e1aa..ecca75b9 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,16 @@ subprojects { url = 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/' } } + if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) { + System.out.println("Adding Grails Core Repo") + maven { + url = 'https://maven.pkg.github.com/grails/grails-core' + credentials { + username = 'DOES_NOT_MATTER' + password = System.getenv("GITHUB_MAVEN_PASSWORD") + } + } + } } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1d09e07..3069482a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] gpars = '1.2.1' -grails = '7.0.0-SNAPSHOT' +grails = '7.0.0-M1' groovy = '4.0.24' gorm = '9.0.0-SNAPSHOT' micronaut-http-client = '4.6.5' diff --git a/grails-events-transform/build.gradle b/grails-events-transform/build.gradle index 089acaa2..0df884db 100644 --- a/grails-events-transform/build.gradle +++ b/grails-events-transform/build.gradle @@ -12,7 +12,7 @@ dependencies { api libs.grails.datastore.core api libs.spring.context - implementation libs.grails.datastore.gorm, { + compileOnly libs.grails.datastore.gorm, { // TODO: Explain why this exclusion is done exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' } @@ -23,6 +23,11 @@ dependencies { implementation libs.spring.tx implementation libs.jakarta.annotation.api + testImplementation libs.grails.datastore.gorm, { + // TODO: Explain why this exclusion is done + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + } + testImplementation libs.grails.datastore.gorm.test, { // TODO: Explain why this exclusion is done (I don't know) exclude group: 'org.grails', module: 'grails-datastore-gorm-validation'