Skip to content

Grails - 7.0.0-M5 Upgrade #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jdaugherty wants to merge 13 commits into from
Closed

Grails - 7.0.0-M5 Upgrade #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f5e348d
Initial Work for updating latest js dependencies
jdaugherty Jul 21, 2025
44a17cf
Revert "Initial Work for updating latest js dependencies"
jdaugherty Jul 21, 2025
a7a148d
test: fix failing tests due to password encoding change
jdaugherty Jul 21, 2025
2a5db61
test: increase timeouts for slower responses
jdaugherty Jul 21, 2025
f8c09b2
refactor: rework test apps to have a common set of dependencies that …
jdaugherty Jul 21, 2025
1d3b1c0
fix: turn off spring dependency management for plugins
jdaugherty Jul 21, 2025
7c37a90
feature: upgrade Grails to 7.0.0-M5
jdaugherty Jul 21, 2025
ca34cc1
revert: harmonizing jquery / bootstrap versions in test apps
jdaugherty Jul 21, 2025
dbe25b9
test: update test for API difference between core & spring utils
jdaugherty Jul 21, 2025
e008ba7
test: increase timeout to 30s for slower env
jdaugherty Jul 21, 2025
8e5a9fb
revert: add back selenium workaround until geb waitFor() can be confi…
jdaugherty Jul 21, 2025
4f83cfd
test: add debug settings
jdaugherty Jul 21, 2025
48ff35b
feedback: do not share common grails dependencies
jdaugherty Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@
# under the License.
#
projectVersion=7.0.0-SNAPSHOT
grailsVersion=7.0.0-SNAPSHOT
grailsVersion=7.0.0-M5
javaVersion=17

# TODO: This is a work around since the bom does not support exclusions and spring forces groovy version 4.0.26
groovy.version=4.0.27

unboundidLdapSdk=7.0.2
apacheDsVersion=1.5.4
asciidoctorGradlePluginVersion=4.0.4
Expand Down
3 changes: 3 additions & 0 deletions gradle/test-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ tasks.named('integrationTest', Test) {
}

systemProperty 'geb.build.reportsDir', reporting.file("$project.projectDir/build/geb-reports")
systemProperty 'grails.geb.reporting.directory', reporting.file("$project.projectDir/build/geb-reports").canonicalFile.absolutePath
systemProperty 'grails.geb.timeouts.implicitlyWait', '30'
// systemProperty 'grails.geb.recording.mode', 'RECORD_ALL'
systemProperties System.properties
doFirst {
logger.quiet(
Expand Down
46 changes: 25 additions & 21 deletions plugin-acl/examples/functional-test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,44 @@

plugins {
id 'org.apache.grails.gradle.grails-web'
id 'org.apache.grails.gradle.grails-gsp'
}

group = 'misc.functional.test.app'

dependencies {

profile 'org.apache.grails.profiles:web'
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
implementation project(':acl-plugin')
implementation 'org.apache.grails:grails-core'
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-gsp'
implementation 'org.apache.grails:grails-i18n'
implementation 'org.apache.grails:grails-interceptors'
implementation 'org.apache.grails:grails-logging'
implementation 'org.apache.grails:grails-rest-transforms'
implementation 'org.apache.grails:grails-scaffolding'
implementation 'org.apache.grails:grails-services'
implementation 'org.apache.grails:grails-url-mappings'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.apache.grails:grails-gsp'
implementation 'org.apache.grails:grails-data-hibernate5'

implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.springframework.boot:spring-boot-starter-validation'
console 'org.apache.grails:grails-console'
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'com.zaxxer:HikariCP'
runtimeOnly 'org.fusesource.jansi:jansi'
runtimeOnly 'org.apache.grails:grails-databinding'
runtimeOnly 'org.apache.grails:grails-i18n'
runtimeOnly 'org.apache.grails:grails-services'
runtimeOnly 'org.apache.grails:grails-url-mappings'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'

integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
integrationTestImplementation 'org.apache.grails:grails-testing-support-web'
integrationTestImplementation 'org.apache.grails.data:grails-datamapping-core', {
// @Rollback
}
integrationTestImplementation 'org.springframework.security:spring-security-acl', {
// BasePermission
}
integrationTestImplementation 'org.spockframework:spock-core'
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'
testImplementation 'org.spockframework:spock-core'

// Non-default dependencies
implementation project(':acl-plugin')
}

apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
Expand Down
43 changes: 27 additions & 16 deletions plugin-acl/examples/integration-test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,46 @@
* specific language governing permissions and limitations
* under the License.
*/

plugins {
id 'org.apache.grails.gradle.grails-web'
id 'org.apache.grails.gradle.grails-gsp'
}

group = 'grails.plugin.springsecurity.acl'

dependencies {

profile 'org.apache.grails.profiles:web'
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
implementation project(':acl-plugin')
implementation 'org.apache.grails:grails-core'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.apache.grails:grails-rest-transforms'
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-gsp'

implementation 'org.apache.grails:grails-i18n'
implementation 'org.apache.grails:grails-interceptors'
implementation 'org.apache.grails:grails-logging'
implementation 'org.apache.grails:grails-rest-transforms'
implementation 'org.apache.grails:grails-scaffolding'
implementation 'org.apache.grails:grails-services'
implementation 'org.apache.grails:grails-url-mappings'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.springframework.boot:spring-boot-starter-validation'
console 'org.apache.grails:grails-console'
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'com.zaxxer:HikariCP'
runtimeOnly 'org.apache.grails:grails-databinding'
runtimeOnly 'org.apache.grails:grails-i18n'
runtimeOnly 'org.apache.grails:grails-services'
runtimeOnly 'org.apache.grails:grails-url-mappings'
runtimeOnly 'org.apache.grails:grails-data-hibernate5'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
runtimeOnly 'org.fusesource.jansi:jansi'
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'
testImplementation 'org.spockframework:spock-core'

integrationTestImplementation 'org.apache.grails:grails-testing-support-web'
integrationTestImplementation 'org.spockframework:spock-core'
// Non-default dependencies
implementation project(':acl-plugin')
}

apply {
Expand Down
45 changes: 25 additions & 20 deletions plugin-acl/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,27 @@ dependencies {

implementation platform("org.apache.grails:grails-bom:$grailsVersion")

implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.apache.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.apache.grails:grails-web-boot"
implementation "org.apache.grails:grails-logging"
implementation "org.apache.grails:grails-rest-transforms"
implementation "org.apache.grails:grails-databinding"
implementation "org.apache.grails:grails-i18n"
implementation "org.apache.grails:grails-services"
implementation "org.apache.grails:grails-url-mappings"
implementation "org.apache.grails:grails-interceptors"
implementation "org.apache.grails:grails-gsp"
console "org.apache.grails:grails-console"
profile "org.apache.grails.profiles:web-plugin"
runtimeOnly "org.apache.grails:grails-services"
runtimeOnly "org.apache.grails:grails-domain-class"
testImplementation "org.apache.grails:grails-testing-support-datamapping"
testImplementation "org.apache.grails:grails-testing-support-web"
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.apache.grails:grails-core'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.apache.grails:grails-logging'
implementation 'org.apache.grails:grails-rest-transforms'
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-i18n'
implementation 'org.apache.grails:grails-services'
implementation 'org.apache.grails:grails-url-mappings'
implementation 'org.apache.grails:grails-interceptors'
implementation 'org.apache.grails:grails-gsp'
console 'org.apache.grails:grails-console'
profile 'org.apache.grails.profiles:web-plugin'
runtimeOnly 'org.apache.grails:grails-services'
runtimeOnly 'org.apache.grails:grails-domain-class'
testImplementation platform("org.apache.grails:grails-bom:$grailsVersion")
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'

implementation 'org.ehcache:ehcache'

Expand All @@ -71,3 +72,7 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/reproducible-config.gradle')
}

grails {
springDependencyManagement = false
Copy link
Contributor

@bkoehm bkoehm Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because?

Copy link
Contributor Author

@jdaugherty jdaugherty Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're switching away from the spring dependency management plugin for managing dependencies - it resolves versions differently (based on the spring bom), but we have our own. This is using stock gradle platforms instead.

}
41 changes: 25 additions & 16 deletions plugin-cas/examples/spring-security-cas-test1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,44 @@

plugins {
id 'org.apache.grails.gradle.grails-web'
id 'cloud.wondrify.asset-pipeline'
id 'org.apache.grails.gradle.grails-gsp'
}

group = 'spring.security.cas'

dependencies {

profile 'org.apache.grails.profiles:web'
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
implementation project(':cas-plugin')
implementation 'org.apache.grails:grails-core'
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-gsp'
implementation 'org.apache.grails:grails-i18n'
implementation 'org.apache.grails:grails-interceptors'
implementation 'org.apache.grails:grails-logging'
implementation 'org.apache.grails:grails-rest-transforms'
implementation 'org.apache.grails:grails-scaffolding'
implementation 'org.apache.grails:grails-services'
implementation 'org.apache.grails:grails-url-mappings'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.apache.grails:grails-gsp'

// 3rd party client-side assets bundled in webjars
implementation 'org.webjars:bootstrap:3.3.6'
implementation 'org.webjars:jquery:2.2.0'

implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.springframework.boot:spring-boot-starter-validation'
console 'org.apache.grails:grails-console'
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'com.zaxxer:HikariCP'
runtimeOnly 'org.apache.grails:grails-databinding'
runtimeOnly 'org.apache.grails:grails-i18n'
runtimeOnly 'org.apache.grails:grails-url-mappings'
runtimeOnly 'org.apache.grails:grails-data-hibernate5'
runtimeOnly 'org.fusesource.jansi:jansi'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'
testImplementation 'org.spockframework:spock-core'

// Non-default dependencies
implementation project(':cas-plugin')
}

apply {
Expand Down
4 changes: 4 additions & 0 deletions plugin-cas/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/reproducible-config.gradle')
}

grails {
springDependencyManagement = false
}
43 changes: 27 additions & 16 deletions plugin-core/examples/functional-test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,49 @@
* specific language governing permissions and limitations
* under the License.
*/

plugins {
id 'org.apache.grails.gradle.grails-web'
id 'cloud.wondrify.asset-pipeline'
id 'org.apache.grails.gradle.grails-web'
id 'org.apache.grails.gradle.grails-gsp'
}

group = 'examples.test'

dependencies {

profile 'org.apache.grails.profiles:web'
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
implementation project(':core-plugin')
implementation 'org.apache.grails:grails-core'
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-gsp'
implementation 'org.apache.grails:grails-i18n'
implementation 'org.apache.grails:grails-interceptors'
implementation 'org.apache.grails:grails-logging'
implementation 'org.apache.grails:grails-rest-transforms'

implementation 'org.apache.grails:grails-scaffolding'
implementation 'org.apache.grails:grails-services'
implementation 'org.apache.grails:grails-url-mappings'
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
implementation 'org.springframework.boot:spring-boot-starter-validation'
console 'org.apache.grails:grails-console'
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'com.zaxxer:HikariCP'
runtimeOnly 'org.apache.grails:grails-data-hibernate5'
runtimeOnly 'org.apache.grails:grails-i18n'
runtimeOnly 'org.apache.grails:grails-services'
runtimeOnly 'org.apache.grails:grails-url-mappings'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'

runtimeOnly 'org.fusesource.jansi:jansi'
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
integrationTestImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
integrationTestImplementation 'org.apache.grails:grails-testing-support-web'
integrationTestImplementation 'org.spockframework:spock-core'
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'
testImplementation 'org.spockframework:spock-core'

// Non-default dependencies
implementation project(':core-plugin')

integrationTestImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
integrationTestRuntimeOnly "io.micronaut:micronaut-jackson-databind:$micronautVersion"
}

Expand Down
Loading
Loading