Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 69b15bf

Browse files
jdaughertyjdaugherty
committed
Fix bom import, use liberica, use grails github actions, support the pre release workflow
# Conflicts: # docs/build.gradle # gradle.properties # grails-plugin/build.gradle
1 parent b9491ec commit 69b15bf

File tree

16 files changed

+48
-20
lines changed

16 files changed

+48
-20
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up JDK
2121
uses: actions/setup-java@v4
2222
with:
23-
distribution: temurin
23+
distribution: liberica
2424
java-version: '17'
2525
- name: Publish Documentation
2626
id: docs
@@ -29,6 +29,7 @@ jobs:
2929
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3030
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3131
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
32+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3233
with:
3334
arguments: docs:docs
3435
- name: Determine docs target repository
@@ -41,7 +42,7 @@ jobs:
4142
if_false: ${{ github.repository }}
4243
- name: Publish to Github Pages
4344
if: success()
44-
uses: micronaut-projects/github-pages-deploy-action@grails
45+
uses: grails/github-pages-deploy-action@grails
4546
env:
4647
SKIP_LATEST: ${{ contains(steps.release_version.outputs.release_version, 'M') }}
4748
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

‎.github/workflows/gradle.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up JDK
1919
uses: actions/setup-java@v4
2020
with:
21-
distribution: temurin
21+
distribution: liberica
2222
java-version: '17'
2323
- name: Run Build
2424
id: build
@@ -27,6 +27,7 @@ jobs:
2727
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2828
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
2929
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
30+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3031
with:
3132
arguments: build
3233
publish:
@@ -38,7 +39,7 @@ jobs:
3839
- name: Set up JDK
3940
uses: actions/setup-java@v4
4041
with:
41-
distribution: temurin
42+
distribution: liberica
4243
java-version: '17'
4344
- name: Publish Artifacts To Grails Artifactory (repo.grails.org)
4445
uses: gradle/gradle-build-action@v3
@@ -69,7 +70,7 @@ jobs:
6970
if_false: ${{ github.repository }}
7071
- name: Publish to Github Pages
7172
if: success()
72-
uses: micronaut-projects/github-pages-deploy-action@grails
73+
uses: grails/github-pages-deploy-action@grails
7374
env:
7475
SKIP_SNAPSHOT: ${{ contains(steps.release_version.outputs.release_version, 'M') }}
7576
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up JDK
4141
uses: actions/setup-java@v4
4242
with:
43-
distribution: temurin
43+
distribution: liberica
4444
java-version: 17
4545
- name: Cache local Maven repository & Groovy
4646
uses: actions/cache@v4
@@ -115,6 +115,7 @@ jobs:
115115
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
116116
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
117117
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
118+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
118119
with:
119120
build-root-directory: ../groovy
120121
arguments: |
@@ -135,7 +136,7 @@ jobs:
135136
- name: Set up JDK
136137
uses: actions/setup-java@v4
137138
with:
138-
distribution: temurin
139+
distribution: liberica
139140
java-version: 17
140141
- name: Cache local Maven repository & Groovy
141142
uses: actions/cache@v4
@@ -154,6 +155,7 @@ jobs:
154155
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
155156
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
156157
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
158+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
157159
with:
158160
arguments: |
159161
build

‎.github/workflows/release-notes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
# Otherwise:
3232
- name: Export Gradle Properties
3333
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
34-
uses: micronaut-projects/github-actions/export-gradle-properties@master
35-
- uses: micronaut-projects/github-actions/release-notes@master
34+
uses: grails/github-actions/export-gradle-properties@main
35+
- uses: grails/github-actions/release-notes@main
3636
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
3737
id: release_notes
3838
with:

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
- name: Set up JDK
1818
uses: actions/setup-java@v4
1919
with:
20-
distribution: temurin
20+
distribution: liberica
2121
java-version: '17'
2222
- name: Set the current release version
2323
id: release_version
2424
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
2525
- name: Run pre-release
26-
uses: micronaut-projects/github-actions/pre-release@master
26+
uses: grails/github-actions/pre-release@main
2727
with:
2828
token: ${{ secrets.GITHUB_TOKEN }}
2929
- name: Generate secring file
@@ -43,6 +43,7 @@ jobs:
4343
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4444
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
4545
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
46+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
4647
with:
4748
arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository
4849
- name: Publish Documentation
@@ -53,10 +54,11 @@ jobs:
5354
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5455
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
5556
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
57+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
5658
with:
5759
arguments: docs:docs
5860
- name: Export Gradle Properties
59-
uses: micronaut-projects/github-actions/export-gradle-properties@master
61+
uses: grails/github-actions/export-gradle-properties@main
6062
- name: Determine docs target repository
6163
if: success()
6264
uses: haya14busa/action-cond@v1
@@ -67,7 +69,7 @@ jobs:
6769
if_false: ${{ github.repository }}
6870
- name: Publish to Github Pages
6971
if: success()
70-
uses: micronaut-projects/github-pages-deploy-action@grails
72+
uses: grails/github-pages-deploy-action@grails
7173
env:
7274
SKIP_LATEST: ${{ contains(steps.release_version.outputs.release_version, 'M') }}
7375
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
@@ -81,7 +83,7 @@ jobs:
8183
VERSION: ${{ steps.release_version.outputs.release_version }}
8284
- name: Run post-release
8385
if: success()
84-
uses: micronaut-projects/github-actions/post-release@master
86+
uses: grails/github-actions/post-release@main
8587
with:
8688
token: ${{ secrets.GITHUB_TOKEN }}
8789
env:

‎build.gradle‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ allprojects {
6767
url = 'https://repository.apache.org/content/repositories/snapshots'
6868
}
6969
}
70+
if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
71+
System.out.println("Adding Grails Core Repo")
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+
}
7080
}
7181
}
7282

@@ -92,7 +102,11 @@ subprojects { Project subproject ->
92102
}
93103

94104
dependencies {
95-
implementation platform("org.grails:grails-bom:$grailsVersion")
105+
106+
// Global dependencies for every app should be added here with great caution.
107+
// Gorm is used by other frameworks (ie springboot, micronaut, etc) and we
108+
// don't want to add dependencies that would make it harder to use in those frameworks.
109+
96110
testImplementation "jakarta.annotation:jakarta.annotation-api"
97111
testImplementation "io.micrometer:micrometer-core:latest.integration"
98112
testImplementation "io.projectreactor:reactor-test"

‎examples/grails-data-service/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
id 'org.grails.plugins.views-json'
55
}
66

7-
87
version = rootProject.version
98
group = 'examples'
109

1110
dependencies {
11+
implementation platform("org.grails:grails-bom:$grailsVersion")
1212

1313
implementation project(':grails-plugin')
1414
implementation 'org.grails:grails-core'

‎examples/grails-database-per-tenant/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ version = rootProject.version
99
group = 'examples'
1010

1111
dependencies {
12+
implementation platform("org.grails:grails-bom:$grailsVersion")
1213

1314
implementation project(':grails-plugin')
1415
implementation 'org.grails:grails-core'

‎examples/grails-hibernate-groovy-proxy/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = rootProject.version
77
group = 'examples'
88

99
dependencies {
10+
implementation platform("org.grails:grails-bom:$grailsVersion")
1011

1112
implementation project(':grails-plugin')
1213
implementation 'org.grails:grails-core'

‎examples/grails-hibernate/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ version = rootProject.version
99
group = 'examples'
1010

1111
dependencies {
12+
implementation platform("org.grails:grails-bom:$grailsVersion")
1213

1314
implementation project(':grails-plugin')
1415
implementation 'jakarta.persistence:jakarta.persistence-api'

0 commit comments

Comments
 (0)