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

Commit d6a8963

Browse files
jdaughertyjdaugherty
authored
Merge pull request #457 from jdaugherty/4.0.x
Pre release workflow support & removing async from testing support to…
2 parents cbd80ba + b54f3e1 commit d6a8963

File tree

13 files changed

+100
-143
lines changed

13 files changed

+100
-143
lines changed

‎.github/workflows/docs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up JDK
1616
uses: actions/setup-java@v4
1717
with:
18-
distribution: temurin
18+
distribution: liberica
1919
java-version: 17
2020
- name: Checkout repository
2121
uses: actions/checkout@v4
@@ -31,6 +31,7 @@ jobs:
3131
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3232
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3333
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
34+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3435
- name: Publish to Github Pages
3536
if: success()
3637
uses: grails/github-pages-deploy-action@v2

‎.github/workflows/gradle.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up JDK
2323
uses: actions/setup-java@v4
2424
with:
25-
distribution: temurin
25+
distribution: liberica
2626
java-version: ${{ matrix.java }}
2727
- name: Run Tests
2828
if: github.event_name == 'pull_request'
@@ -34,6 +34,7 @@ jobs:
3434
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3535
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3636
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
37+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3738
- name: Run Build
3839
if: github.event_name == 'push'
3940
id: build
@@ -42,6 +43,7 @@ jobs:
4243
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4344
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
4445
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
46+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
4547
with:
4648
arguments: build --refresh-dependencies
4749
- name: Publish Test Report
@@ -62,6 +64,7 @@ jobs:
6264
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6365
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
6466
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
67+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
6568
- name: Generate Docs
6669
id: docs
6770
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '17'
@@ -72,6 +75,7 @@ jobs:
7275
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
7376
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
7477
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
78+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
7579
- name: Publish to Github Pages
7680
if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '17'
7781
uses: micronaut-projects/github-pages-deploy-action@master

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: "☕️ Setup JDK"
1919
uses: actions/setup-java@v4
2020
with:
21-
distribution: temurin
21+
distribution: liberica
2222
java-version: 17
2323
- name: "🗄️ Cache local Maven repository"
2424
uses: actions/cache@v4
@@ -108,6 +108,7 @@ jobs:
108108
env:
109109
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
110110
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
111+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
111112
run: |
112113
cd groovy
113114
./gradlew pTML -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK
@@ -121,7 +122,7 @@ jobs:
121122
- name: "☕️ Setup JDK"
122123
uses: actions/setup-java@v4
123124
with:
124-
distribution: temurin
125+
distribution: liberica
125126
java-version: 17
126127
- name: "🐘 Setup Gradle"
127128
uses: gradle/actions/setup-gradle@v4
@@ -138,6 +139,7 @@ jobs:
138139
env:
139140
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
140141
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
142+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
141143
run: >
142144
./gradlew build
143145
-PgroovyVersion=${{needs.build_groovy.outputs.groovyVersion}}

‎.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on:
33
release:
44
types: [published]
55
env:
6-
GIT_USER_NAME: puneetbehl
7-
GIT_USER_EMAIL: behlp@unityfoundation.io
6+
GIT_USER_NAME: 'grails-build'
7+
GIT_USER_EMAIL: 'grails-build@users.noreply.github.com'
88
jobs:
99
publish:
1010
outputs:
@@ -37,6 +37,7 @@ jobs:
3737
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3838
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3939
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
40+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
4041
- name: Upload Distribution
4142
if: success()
4243
uses: actions/upload-artifact@v4
@@ -60,6 +61,7 @@ jobs:
6061
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
6162
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
6263
SECRING_FILE: ${{ secrets.SECRING_FILE }}
64+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
6365
with:
6466
arguments: |
6567
-Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
@@ -91,6 +93,7 @@ jobs:
9193
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
9294
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
9395
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
96+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
9497
with:
9598
arguments: |
9699
findSonatypeStagingRepository
@@ -126,6 +129,7 @@ jobs:
126129
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
127130
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
128131
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
132+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
129133
with:
130134
arguments: docs
131135
- name: Publish to Github Pages

‎.github/workflows/retry-release.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎build.gradle

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@ allprojects {
4949
url = 'https://repository.apache.org/content/repositories/snapshots'
5050
}
5151
}
52+
53+
if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
54+
System.out.println("Adding Grails Core Repo")
55+
maven {
56+
url = 'https://maven.pkg.github.com/grails/grails-core'
57+
credentials {
58+
username = 'DOES_NOT_MATTER'
59+
password = System.getenv("GITHUB_MAVEN_PASSWORD")
60+
}
61+
}
62+
}
5263
}
5364
}
5465

@@ -89,15 +100,15 @@ subprojects { project ->
89100

90101
dependencies {
91102
api "org.apache.groovy:groovy:$groovyVersion"
92-
api "org.slf4j:slf4j-api:$slf4jVersion"
103+
api "org.slf4j:slf4j-api"
93104

94-
testImplementation "org.spockframework:spock-core:${spockVersion}", {
105+
testImplementation "org.spockframework:spock-core", {
95106
exclude module: 'groovy-all'
96107
}
97108
testRuntimeOnly "net.bytebuddy:byte-buddy:$bytebuddyVersion"
98109
testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion"
99110

100-
documentation "org.fusesource.jansi:jansi:$jansiVersion"
111+
documentation "org.fusesource.jansi:jansi"
101112

102113
}
103114

@@ -111,22 +122,19 @@ subprojects { project ->
111122
}
112123
}
113124

114-
java {
115-
toolchain {
116-
languageVersion = JavaLanguageVersion.of(17)
117-
}
118-
}
125+
compileJava.options.release = 17
119126

120127
dependencies {
121-
implementation "com.github.javaparser:javaparser-core:$javaParserVersion"
122-
compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
123-
124-
testImplementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
125-
testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
126-
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
127-
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformVersion"
128-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
129-
testRuntimeOnly "org.junit.platform:junit-platform-commons:$junitPlatformVersion"
128+
implementation platform("org.grails:grails-bom:$grailsVersion")
129+
implementation "com.github.javaparser:javaparser-core"
130+
compileOnly "jakarta.servlet:jakarta.servlet-api"
131+
132+
testImplementation "jakarta.servlet:jakarta.servlet-api"
133+
testImplementation "org.apache.groovy:groovy-test-junit5"
134+
testImplementation "org.junit.jupiter:junit-jupiter-api"
135+
testImplementation "org.junit.platform:junit-platform-runner"
136+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
137+
testRuntimeOnly "org.junit.platform:junit-platform-commons"
130138
}
131139

132140
tasks.withType(Test) {
@@ -270,9 +278,9 @@ subprojects { subproject ->
270278

271279
dependencies {
272280
if (configurations.find { it.name == 'documentation' }) {
273-
documentation "org.fusesource.jansi:jansi:$jansiVersion"
274-
documentation "jline:jline:$jlineVersion"
275-
documentation "com.github.javaparser:javaparser-core:$javaParserVersion"
281+
documentation "org.fusesource.jansi:jansi"
282+
documentation "jline:jline"
283+
documentation "com.github.javaparser:javaparser-core"
276284
documentation "org.apache.groovy:groovy:${groovyVersion}"
277285
documentation "org.apache.groovy:groovy-templates:${groovyVersion}"
278286
documentation "org.apache.groovy:groovy-ant:$groovyVersion"
@@ -339,9 +347,9 @@ configurations {
339347
dependencies {
340348
if (configurations.find { it.name == 'documentation' }) {
341349
documentation "info.picocli:picocli:$picocliVersion"
342-
documentation "org.fusesource.jansi:jansi:$jansiVersion"
343-
documentation "jline:jline:$jlineVersion"
344-
documentation "com.github.javaparser:javaparser-core:$javaParserVersion"
350+
documentation "org.fusesource.jansi:jansi"
351+
documentation "jline:jline"
352+
documentation "com.github.javaparser:javaparser-core"
345353
documentation "org.apache.groovy:groovy:$groovyVersion"
346354
documentation "org.apache.groovy:groovy-templates:$groovyVersion"
347355
documentation "org.apache.groovy:groovy-ant:$groovyVersion"

‎examples/demo33/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
implementation "org.grails.plugins:scaffolding"
1818
implementation "org.grails.plugins:events"
1919
implementation "org.grails.plugins:hibernate5"
20-
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
20+
implementation "org.hibernate:hibernate-core-jakarta"
2121
implementation "org.grails.plugins:gsp"
2222
implementation "org.grails.plugins:views-json"
2323
implementation "org.grails.plugins:views-json-templates"

‎gradle.properties

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,15 @@ developers=Jeff Brown,James Kleeh
1111
asciidoctorJvmVersion=4.0.1
1212
bytebuddyVersion=1.15.3
1313
grailsGradlePluginVersion=7.0.0-SNAPSHOT
14-
grailsVersion=7.0.0-SNAPSHOT
14+
grailsVersion=7.0.0-M1
1515
grailsDocsVersion=7.0.0-SNAPSHOT
16-
asyncVersion=6.0.0-SNAPSHOT
1716
groovyVersion=4.0.24
1817
gradleNexusPublishPluginVersion=2.0.0
19-
gormVersion=9.0.0-SNAPSHOT
20-
gspVersion=7.0.0-SNAPSHOT
21-
hibernateVersion=5.6.15.Final
22-
jansiVersion=1.18
2318
javassistVersion=3.30.2-GA
24-
javaParserVersion=3.25.10
25-
jlineVersion=2.14.6
2619
jsonViewsVersion=4.0.0-SNAPSHOT
27-
junitPlatformVersion=1.11.1
28-
junitJupiterVersion=5.11.1
2920
objenesisVersion=3.4
3021
picocliVersion=4.7.6
31-
htmlunitVersion=4.4.0
3222
servletApiVersion=6.0.0
33-
slf4jVersion=2.0.16
34-
spockVersion=2.3-groovy-4.0
35-
springVersion=6.2.0
36-
springBootVersion=3.4.0
3723

3824
org.gradle.caching=true
3925
org.gradle.parallel=true

‎grails-gorm-testing-support/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
21
dependencies {
3-
api "org.grails:grails-plugin-domain-class:$grailsVersion"
4-
api "org.grails:grails-datastore-gorm-test:$gormVersion"
2+
api "org.grails:grails-plugin-domain-class"
3+
api "org.grails:grails-datastore-gorm-test"
54

65
api project(':grails-testing-support')
76
}
8-

‎grails-testing-support/build.gradle

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
dependencies {
2-
api "org.springframework:spring-test:$springVersion"
3-
api("org.grails:grails-plugin-codecs:$grailsVersion") {
2+
api "org.springframework:spring-test"
3+
api("org.grails:grails-plugin-codecs") {
44
exclude module: 'grails-plugin-mimetypes'
55
exclude module: 'grails-plugin-converters'
66
exclude module: 'grails-web'
77
}
8-
api("org.grails.plugins:async:$asyncVersion") {
9-
exclude module: 'grails-plugin-controllers'
10-
exclude module: 'grails-core'
11-
}
12-
api "org.grails:grails-plugin-databinding:$grailsVersion"
13-
api "org.grails:grails-datastore-gorm:$gormVersion"
14-
api("org.grails:grails-test:$grailsVersion")
15-
api "org.springframework.boot:spring-boot-test:${springBootVersion}"
16-
api("org.spockframework:spock-spring:${spockVersion}") { transitive = false }
17-
api("org.spockframework:spock-core:${spockVersion}") { transitive = false }
8+
9+
api "org.grails:grails-plugin-databinding"
10+
api "org.grails:grails-datastore-gorm"
11+
api("org.grails:grails-test")
12+
api "org.springframework.boot:spring-boot-test"
13+
api("org.spockframework:spock-spring") { transitive = false }
14+
api("org.spockframework:spock-core") { transitive = false }
1815
api "org.apache.groovy:groovy-test-junit5:$groovyVersion"
19-
api "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
20-
api "org.junit.platform:junit-platform-runner:$junitPlatformVersion"
21-
runtimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
16+
api "org.junit.jupiter:junit-jupiter-api"
17+
api "org.junit.platform:junit-platform-runner"
18+
runtimeOnly "org.junit.jupiter:junit-jupiter-engine"
2219
}
2320

0 commit comments

Comments
 (0)