diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 015f5e4a..965ca9df 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,7 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 - target-branch: 6.0.x + target-branch: 5.0.x labels: - "type: dependency upgrade" ignore: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 76f37ed7..48a71129 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,10 +58,10 @@ jobs: if: success() uses: micronaut-projects/github-pages-deploy-action@grails env: + TARGET_REPOSITORY: ${{ github.repository }} + GH_TOKEN: ${{ secrets.GH_TOKEN }} BRANCH: gh-pages - COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }} - COMMIT_NAME: ${{ env.GIT_USER_NAME }} FOLDER: docs/build/docs DOC_FOLDER: gh-pages COMMIT_EMAIL: 'grails-build@users.noreply.github.com' - COMMIT_NAME: 'grails-build' + COMMIT_NAME: 'grails-build' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a77a292..d7eed2c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,21 +15,20 @@ jobs: with: distribution: temurin java-version: 17 - - name: Get the current release version + + - name: Set the current release version id: release_version - run: | - echo "Release version: ${GITHUB_REF:11}" - echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT + run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT - - name: Set projectVersion to the release version + - name: Run pre-release uses: micronaut-projects/github-actions/pre-release@master - - name: Generate key file for artifact signing + - name: Generate secring file env: SECRING_FILE: ${{ secrets.SECRING_FILE }} run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg - - name: Publish release artifacts to Sonatype + - name: Publish to Sonatype id: publish_to_sonatype uses: gradle/actions/setup-gradle@v3 env: @@ -60,15 +59,12 @@ jobs: TARGET_REPOSITORY: ${{ github.repository }} GH_TOKEN: ${{ secrets.GH_TOKEN }} BRANCH: gh-pages - COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }} - COMMIT_NAME: ${{ env.GIT_USER_NAME }} FOLDER: docs/build/docs - GH_TOKEN: ${{ secrets.GH_TOKEN }} VERSION: ${{ steps.release_version.outputs.release_version }} DOC_FOLDER: gh-pages COMMIT_EMAIL: 'grails-build@users.noreply.github.com' COMMIT_NAME: 'grails-build' - - name: Set projectVersion to the next snapshot version + - 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c2f484b5..44a6de09 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ gorm = '9.0.0-SNAPSHOT' jakarta-annotation-api = '3.0.0' micronaut-http-client = '4.6.5' micronaut-serde-jackson = '2.10.2' -objenesis = '3.3' +objenesis = '3.4' rxjava = '1.3.8' rxjava2 = '2.2.21' slf4j = '1.7.36'