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

Commit b9b5d11

Browse files
committed
fix(deps): Use versions from grails-bom in example apps
And remove unused versions from `gradle.properties`
1 parent b15b34c commit b9b5d11

File tree

10 files changed

+72
-84
lines changed

10 files changed

+72
-84
lines changed

examples/grails-data-service/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ dependencies {
2525
implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityRestVersion"
2626
profile "org.grails.profiles:rest-api"
2727
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
28-
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
29-
testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
28+
testImplementation "org.grails:grails-gorm-testing-support"
29+
testImplementation "org.grails:grails-web-testing-support"
3030
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ dependencies {
55

66
implementation "org.springframework.boot:spring-boot-starter-logging"
77
implementation "org.springframework.boot:spring-boot-autoconfigure"
8-
implementation "org.grails:grails-core:$grailsVersion"
9-
implementation "org.grails:grails-dependencies:$grailsVersion", {
8+
implementation "org.grails:grails-core"
9+
implementation "org.grails:grails-dependencies", {
1010
exclude module:'grails-datastore-simple'
1111
}
12-
implementation "org.grails:grails-web-boot:$grailsVersion"
12+
implementation "org.grails:grails-web-boot"
1313
implementation project(":grails-plugin")
1414

1515
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
1616

1717
runtimeOnly "com.h2database:h2"
18-
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
19-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
18+
runtimeOnly "org.yaml:snakeyaml"
19+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
2020

21-
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
21+
testImplementation "org.grails:grails-gorm-testing-support"
2222

2323
}

examples/grails3-database-per-tenant/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ dependencies {
1616
implementation "org.springframework.boot:spring-boot-autoconfigure"
1717
implementation "org.springframework.boot:spring-boot-starter-actuator"
1818
implementation "org.springframework.boot:spring-boot-starter-tomcat"
19-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
20-
implementation "org.grails:grails-core:$grailsVersion"
21-
implementation "org.grails:grails-dependencies:$grailsVersion", {
19+
implementation "jakarta.servlet:jakarta.servlet-api"
20+
implementation "org.grails:grails-core"
21+
implementation "org.grails:grails-dependencies", {
2222
exclude module:'grails-datastore-simple'
2323
}
2424
implementation "org.ysb33r.gradle:grolifant80:$grolifantVersion"
25-
implementation "org.grails:grails-web-boot:$grailsVersion"
25+
implementation "org.grails:grails-web-boot"
2626
implementation project(":grails-plugin")
2727

2828

2929
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
3030

31-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
31+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
3232
runtimeOnly "com.h2database:h2"
33-
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
34-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
35-
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
36-
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
33+
runtimeOnly "org.yaml:snakeyaml"
34+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
35+
runtimeOnly "org.grails.plugins:fields"
36+
runtimeOnly "org.grails.plugins:scaffolding"
3737

38-
testImplementation ("org.grails:grails-gorm-testing-support:$testingSupportVersion") {
38+
testImplementation ("org.grails:grails-gorm-testing-support") {
3939
exclude group: "org.spockframework", module: "spock-core"
4040
}
4141
}

examples/grails3-hibernate5/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ dependencies {
55
implementation "org.springframework.boot:spring-boot-autoconfigure"
66
implementation "org.springframework.boot:spring-boot-starter-actuator"
77
implementation "org.springframework.boot:spring-boot-starter-tomcat"
8-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
9-
implementation "org.grails:grails-core:$grailsVersion"
10-
implementation "org.grails:grails-dependencies:$grailsVersion", {
8+
implementation "jakarta.servlet:jakarta.servlet-api"
9+
implementation "org.grails:grails-core"
10+
implementation "org.grails:grails-dependencies", {
1111
exclude module:'grails-datastore-simple'
1212
}
1313

14-
implementation "org.grails:grails-web-boot:$grailsVersion"
14+
implementation "org.grails:grails-web-boot"
1515
implementation project(":grails-plugin")
1616

1717
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
1818
implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"
1919

20-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
20+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
2121
runtimeOnly "com.h2database:h2"
22-
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
23-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
24-
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
25-
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
22+
runtimeOnly "org.yaml:snakeyaml"
23+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
24+
runtimeOnly "org.grails.plugins:fields"
25+
runtimeOnly "org.grails.plugins:scaffolding"
2626

27-
testImplementation("org.grails:grails-gorm-testing-support:$testingSupportVersion") {
27+
testImplementation("org.grails:grails-gorm-testing-support") {
2828
exclude group: "org.spockframework", module: "spock-core"
2929
}
30-
testImplementation("org.grails:grails-web-testing-support:$testingSupportVersion") {
30+
testImplementation("org.grails:grails-web-testing-support") {
3131
exclude group: "org.spockframework", module: "spock-core"
3232
}
3333

34-
integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
34+
integrationTestImplementation testFixtures("org.grails.plugins:geb")
3535
}
3636

3737

examples/grails3-multiple-datasources/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ dependencies {
55
implementation "org.springframework.boot:spring-boot-autoconfigure"
66
implementation "org.springframework.boot:spring-boot-starter-actuator"
77
implementation "org.springframework.boot:spring-boot-starter-tomcat"
8-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
9-
implementation "org.grails:grails-core:$grailsVersion"
10-
implementation "org.grails:grails-dependencies:$grailsVersion", {
8+
implementation "jakarta.servlet:jakarta.servlet-api"
9+
implementation "org.grails:grails-core"
10+
implementation "org.grails:grails-dependencies", {
1111
exclude module:'grails-datastore-simple'
1212
}
1313

14-
implementation "org.grails:grails-web-boot:$grailsVersion"
14+
implementation "org.grails:grails-web-boot"
1515
implementation project(":grails-plugin")
1616

1717
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
1818

19-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
19+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
2020
runtimeOnly "com.h2database:h2"
21-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
22-
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
23-
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
21+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
22+
runtimeOnly "org.grails.plugins:fields"
23+
runtimeOnly "org.grails.plugins:scaffolding"
2424

25-
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
25+
testImplementation "org.grails:grails-gorm-testing-support"
2626

2727

28-
integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
28+
integrationTestImplementation testFixtures("org.grails.plugins:geb")
2929
}
3030

examples/grails3-partitioned-multi-tenancy/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ dependencies {
77
implementation "org.springframework.boot:spring-boot-autoconfigure"
88
implementation "org.springframework.boot:spring-boot-starter-actuator"
99
implementation "org.springframework.boot:spring-boot-starter-tomcat"
10-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
11-
implementation "org.grails:grails-core:$grailsVersion"
12-
implementation "org.grails:grails-dependencies:$grailsVersion", {
10+
implementation "jakarta.servlet:jakarta.servlet-api"
11+
implementation "org.grails:grails-core"
12+
implementation "org.grails:grails-dependencies", {
1313
exclude module:'grails-datastore-simple'
1414
}
15-
implementation "org.grails:grails-web-boot:$grailsVersion"
15+
implementation "org.grails:grails-web-boot"
1616
implementation project(":grails-plugin")
1717

1818
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
1919

20-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
20+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
2121
runtimeOnly "com.h2database:h2"
22-
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
23-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
24-
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
25-
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
22+
runtimeOnly "org.yaml:snakeyaml"
23+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
24+
runtimeOnly "org.grails.plugins:fields"
25+
runtimeOnly "org.grails.plugins:scaffolding"
2626

27-
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
27+
testImplementation "org.grails:grails-gorm-testing-support"
2828
}

examples/grails3-schema-per-tenant/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ dependencies {
55
implementation "org.springframework.boot:spring-boot-autoconfigure"
66
implementation "org.springframework.boot:spring-boot-starter-actuator"
77
implementation "org.springframework.boot:spring-boot-starter-tomcat"
8-
implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
9-
implementation "org.grails:grails-core:$grailsVersion"
10-
implementation "org.grails:grails-dependencies:$grailsVersion", {
8+
implementation "jakarta.servlet:jakarta.servlet-api"
9+
implementation "org.grails:grails-core"
10+
implementation "org.grails:grails-dependencies", {
1111
exclude module:'grails-datastore-simple'
1212
}
13-
implementation "org.grails:grails-web-boot:$grailsVersion"
13+
implementation "org.grails:grails-web-boot"
1414
implementation project(":grails-plugin")
1515

1616
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
1717

18-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
18+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
1919
runtimeOnly "com.h2database:h2"
20-
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
21-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
22-
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
23-
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
20+
runtimeOnly "org.yaml:snakeyaml"
21+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
22+
runtimeOnly "org.grails.plugins:fields"
23+
runtimeOnly "org.grails.plugins:scaffolding"
2424

25-
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
25+
testImplementation "org.grails:grails-gorm-testing-support"
2626

27-
integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
27+
integrationTestImplementation testFixtures("org.grails.plugins:geb")
2828
}

examples/spring-boot-hibernate5/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ apply plugin: "groovy"
1515
group 'examples'
1616

1717
dependencies {
18+
implementation platform("org.grails:grails-bom:$grailsVersion")
1819
implementation("org.springframework.boot:spring-boot-starter")
1920
implementation("org.springframework.boot:spring-boot-starter-web")
2021
implementation "org.springframework.boot:spring-boot-autoconfigure"
@@ -24,13 +25,13 @@ dependencies {
2425
implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"
2526

2627
runtimeOnly "com.h2database:h2"
27-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
28+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
2829
runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
29-
runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"
30+
runtimeOnly "org.slf4j:slf4j-api"
3031

31-
testImplementation "org.spockframework:spock-core:$spockVersion"
32+
testImplementation "org.spockframework:spock-core"
3233

33-
testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
34+
testRuntimeOnly "org.slf4j:slf4j-simple"
3435

3536
testImplementation('org.springframework.boot:spring-boot-starter-test')
3637
}

examples/standalone-hibernate5/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ group 'examples'
33
apply plugin:"groovy"
44

55
dependencies {
6+
implementation platform("org.grails:grails-bom:$grailsVersion")
67
implementation project(":grails-datastore-gorm-hibernate5")
78
runtimeOnly "com.h2database:h2"
8-
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
9+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
910
runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
10-
runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"
11-
implementation "org.grails:grails-core:$grailsVersion"
12-
testImplementation "org.spockframework:spock-core:$spockVersion"
11+
runtimeOnly "org.slf4j:slf4j-api"
12+
implementation "org.grails:grails-core"
13+
testImplementation "org.spockframework:spock-core"
1314

14-
testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
15+
testRuntimeOnly "org.slf4j:slf4j-simple"
1516
}

gradle.properties

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
projectVersion=9.0.0-SNAPSHOT
22
#4.0.2-4.0.3 breaks org.ysb33r.gradle:grolifant for chromedriver
33
asciidoctorGradleVersion=4.0.1
4-
assetPipelineVersion=5.0.1
5-
fieldsVersion=6.0.0-SNAPSHOT
6-
gebPluginVersion=5.0.0-SNAPSHOT
74
grolifantVersion=4.0.0
85
gormVersion=9.0.0-SNAPSHOT
96
gradleNexusPublishPluginVersion=2.0.0
@@ -16,18 +13,10 @@ groovyVersion=4.0.24-SNAPSHOT
1613
hibernateVersion=5.6.15.Final
1714
hibernateValidatorVersion=8.0.1.Final
1815
hibernateGroovyProxy=1.1
19-
jakartaAnnotationApiVersion=3.0.0
20-
jakartaPersistenceVersion=3.1.0
21-
jakartaTransactionVersion=2.0.1
22-
jakartaValidationVersion=3.0.2
2316
jansiVersion=2.4.1
2417
javaParserCoreVersion=3.26.2
2518
junitJupiterVersion=5.11.3
26-
junitJupiterPlatformVersion=1.11.3
2719
picocliVersion=4.7.6
28-
projectReactorVersion=3.6.10
29-
scaffoldingVersion=6.0.0-SNAPSHOT
30-
servletApiVersion=6.0.0
3120
snakeYamlVersion=2.3
3221
slf4jVersion=2.0.16
3322
spockVersion=2.3-groovy-4.0
@@ -36,9 +25,6 @@ tomcatLog4jVersion=8.5.2
3625
tomcatVersion=10.1.31
3726
viewsGradleVersion=4.0.0-SNAPSHOT
3827
webdriverBinariesPluginVersion=3.2
39-
chromeDriverVersion=126.0.6478.126
40-
geckodriverVersion=0.32.2
41-
edgeDriverVersion=110.0.1587.57
4228

4329
org.gradle.caching=true
4430
org.gradle.parallel=false

0 commit comments

Comments
 (0)