Skip to content

Commit 157c4a7

Browse files
authored
Merge branch '9.0.x' into renovate/com.gradle.develocity-3.x
2 parents a54b0c5 + 0db9bcd commit 157c4a7

File tree

6 files changed

+42
-41
lines changed

6 files changed

+42
-41
lines changed

.github/workflows/gradle.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,50 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Set up JDK
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
17-
distribution: temurin
17+
distribution: liberica
1818
java-version: 17
19+
- name: Setup Gradle
20+
uses: gradle/actions/setup-gradle@v4
21+
with:
22+
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
1923
- name: Run Build
2024
id: build
21-
uses: gradle/gradle-build-action@v2
25+
run: ./gradlew build
2226
env:
23-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2427
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
2528
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
26-
with:
27-
arguments: build
2829
publish:
2930
if: github.event_name == 'push'
3031
needs: ["build"]
3132
runs-on: ubuntu-latest
3233
steps:
33-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3435
- name: Set up JDK
35-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3637
with:
37-
distribution: temurin
38-
java-version: '17'
38+
distribution: liberica
39+
java-version: 17
40+
- name: Setup Gradle
41+
uses: gradle/actions/setup-gradle@v4
42+
with:
43+
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3944
- name: Publish to Artifactory (repo.grails.org)
40-
uses: gradle/gradle-build-action@v2
45+
run: ./gradlew -Dorg.gradle.internal.publish.checksums.insecure=true publish
4146
env:
42-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4347
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
4448
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
4549
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
4650
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
47-
with:
48-
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
4951
trigger-build-gorm-impls:
5052
if: github.event_name == 'push'
5153
needs: ["build", "publish"]
5254
runs-on: ubuntu-latest
5355
steps:
54-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5557
- name: Extract branch name
5658
id: extract_branch
5759
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ jobs:
141141
run: >
142142
./gradlew build
143143
-PgroovyVersion=${{needs.build_groovy.outputs.groovyVersion}}
144-
-x groovydoc
144+
-x groovydoc

.github/workflows/release-notes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
release_notes:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Check if it has release drafter config file
1919
id: check_release_drafter
2020
run: |
@@ -24,7 +24,7 @@ jobs:
2424
id: extract_branch
2525
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
2626
# If it has release drafter:
27-
- uses: release-drafter/release-drafter@v5
27+
- uses: release-drafter/release-drafter@v6
2828
if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/release.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
GIT_USER_EMAIL: '[email protected]'
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
token: ${{ secrets.GH_TOKEN }}
1919
- name: Set up JDK
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
22-
distribution: temurin
22+
distribution: liberica
2323
java-version: 17
2424
- name: Run pre-release
2525
uses: micronaut-projects/github-actions/pre-release@master
@@ -35,14 +35,15 @@ jobs:
3535
- name: Set the current release version
3636
id: release_version
3737
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
38+
- name: Setup Gradle
39+
uses: gradle/actions/setup-gradle@v4
40+
with:
41+
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3842
- name: Run Assemble
3943
if: success()
4044
id: assemble
41-
uses: gradle/gradle-build-action@v2
42-
with:
43-
arguments: assemble
45+
run: ./gradlew assemble
4446
env:
45-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4647
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
4748
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
4849
- name: Upload Distribution
@@ -57,9 +58,11 @@ jobs:
5758
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
5859
- name: Publish to Sonatype OSSRH
5960
id: publish
60-
uses: gradle/gradle-build-action@v2
61+
run: >
62+
./gradlew -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
63+
publishToSonatype
64+
closeSonatypeStagingRepository
6165
env:
62-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6366
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
6467
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
6568
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
@@ -68,11 +71,6 @@ jobs:
6871
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
6972
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
7073
SECRING_FILE: ${{ secrets.SECRING_FILE }}
71-
with:
72-
arguments: |
73-
-Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
74-
publishToSonatype
75-
closeSonatypeStagingRepository
7674
release:
7775
needs: publish
7876
runs-on: ubuntu-latest
@@ -84,19 +82,20 @@ jobs:
8482
with:
8583
token: ${{ secrets.GH_TOKEN }}
8684
ref: v${{ needs.publish.outputs.release_version }}
85+
- name: Setup Gradle
86+
uses: gradle/actions/setup-gradle@v4
87+
with:
88+
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8789
- name: Nexus Staging Close And Release
88-
uses: gradle/gradle-build-action@v2
90+
run: >
91+
./gradlew findSonatypeStagingRepository
92+
releaseSonatypeStagingRepository
8993
env:
90-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
9194
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
9295
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
9396
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
9497
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
9598
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
96-
with:
97-
arguments: |
98-
findSonatypeStagingRepository
99-
releaseSonatypeStagingRepository
10099
- name: Run post-release
101100
if: success()
102101
uses: micronaut-projects/github-actions/post-release@master

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

grails-datastore-gorm-support/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55

66
compileOnly "org.springframework:spring-orm"
77
compileOnly "org.springframework:spring-webmvc"
8-
compileOnly "org.grails:grails-web-url-mappings:"
8+
compileOnly "org.grails:grails-web-url-mappings"
99
compileOnly "org.grails:grails-web-common"
1010
compileOnly("org.hibernate:hibernate-core-jakarta:$hibernateVersion") {
1111
exclude group:'commons-logging', module:'commons-logging'

0 commit comments

Comments
 (0)