fix(deps): Use versions from grails-bom in example apps

And remove unused versions from `gradle.properties`
grails · Nov 3, 2024 · b9b5d11 · b9b5d11
1 parent b15b34c
commit b9b5d11
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 84 deletions.
diff --git a/examples/grails-data-service/build.gradle b/examples/grails-data-service/build.gradle
@@ -25,6 +25,6 @@ dependencies {
     implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityRestVersion"
     profile "org.grails.profiles:rest-api"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
-    testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails:grails-web-testing-support"
 }
diff --git a/examples/grails-hibernate-groovy-proxy/build.gradle b/examples/grails-hibernate-groovy-proxy/build.gradle
@@ -5,19 +5,19 @@ dependencies {
 
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
 
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
+    runtimeOnly "org.yaml:snakeyaml"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
 
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
 
 }
diff --git a/examples/grails3-database-per-tenant/build.gradle b/examples/grails3-database-per-tenant/build.gradle
@@ -16,26 +16,26 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "jakarta.servlet:jakarta.servlet-api"
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
     implementation "org.ysb33r.gradle:grolifant80:$grolifantVersion"
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.yaml:snakeyaml"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.grails.plugins:fields"
+    runtimeOnly "org.grails.plugins:scaffolding"
 
-    testImplementation ("org.grails:grails-gorm-testing-support:$testingSupportVersion") {
+    testImplementation ("org.grails:grails-gorm-testing-support") {
         exclude group: "org.spockframework", module: "spock-core"
     }
 }
diff --git a/examples/grails3-hibernate5/build.gradle b/examples/grails3-hibernate5/build.gradle
@@ -5,33 +5,33 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "jakarta.servlet:jakarta.servlet-api"
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
 
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
     implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.yaml:snakeyaml"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.grails.plugins:fields"
+    runtimeOnly "org.grails.plugins:scaffolding"
 
-    testImplementation("org.grails:grails-gorm-testing-support:$testingSupportVersion") {
+    testImplementation("org.grails:grails-gorm-testing-support") {
         exclude group: "org.spockframework", module: "spock-core"
     }
-    testImplementation("org.grails:grails-web-testing-support:$testingSupportVersion") {
+    testImplementation("org.grails:grails-web-testing-support") {
         exclude group: "org.spockframework", module: "spock-core"
     }
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
+    integrationTestImplementation testFixtures("org.grails.plugins:geb")
 }
 
 

diff --git a/examples/grails3-multiple-datasources/build.gradle b/examples/grails3-multiple-datasources/build.gradle
@@ -5,26 +5,26 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "jakarta.servlet:jakarta.servlet-api"
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
 
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.grails.plugins:fields"
+    runtimeOnly "org.grails.plugins:scaffolding"
 
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
 
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
+    integrationTestImplementation testFixtures("org.grails.plugins:geb")
 }
 
diff --git a/examples/grails3-partitioned-multi-tenancy/build.gradle b/examples/grails3-partitioned-multi-tenancy/build.gradle
@@ -7,22 +7,22 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "jakarta.servlet:jakarta.servlet-api"
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.yaml:snakeyaml"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.grails.plugins:fields"
+    runtimeOnly "org.grails.plugins:scaffolding"
 
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
 }
diff --git a/examples/grails3-schema-per-tenant/build.gradle b/examples/grails3-schema-per-tenant/build.gradle
@@ -5,24 +5,24 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    implementation "org.grails:grails-dependencies:$grailsVersion", {
+    implementation "jakarta.servlet:jakarta.servlet-api"
+    implementation "org.grails:grails-core"
+    implementation "org.grails:grails-dependencies", {
         exclude module:'grails-datastore-simple'
     }
-    implementation "org.grails:grails-web-boot:$grailsVersion"
+    implementation "org.grails:grails-web-boot"
     implementation project(":grails-plugin")
 
     implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.yaml:snakeyaml"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.grails.plugins:fields"
+    runtimeOnly "org.grails.plugins:scaffolding"
 
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
+    integrationTestImplementation testFixtures("org.grails.plugins:geb")
 }
diff --git a/examples/spring-boot-hibernate5/build.gradle b/examples/spring-boot-hibernate5/build.gradle
@@ -15,6 +15,7 @@ apply plugin: "groovy"
 group 'examples'
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation "org.springframework.boot:spring-boot-autoconfigure"
@@ -24,13 +25,13 @@ dependencies {
     implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"
 
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
-    runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"
+    runtimeOnly "org.slf4j:slf4j-api"
 
-    testImplementation "org.spockframework:spock-core:$spockVersion"
+    testImplementation "org.spockframework:spock-core"
 
-    testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
+    testRuntimeOnly "org.slf4j:slf4j-simple"
 
     testImplementation('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/examples/standalone-hibernate5/build.gradle b/examples/standalone-hibernate5/build.gradle
@@ -3,13 +3,14 @@ group 'examples'
 apply plugin:"groovy"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
     implementation project(":grails-datastore-gorm-hibernate5")
     runtimeOnly "com.h2database:h2"
-    runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
-    runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"
-    implementation "org.grails:grails-core:$grailsVersion"
-    testImplementation "org.spockframework:spock-core:$spockVersion"
+    runtimeOnly "org.slf4j:slf4j-api"
+    implementation "org.grails:grails-core"
+    testImplementation "org.spockframework:spock-core"
 
-    testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
+    testRuntimeOnly "org.slf4j:slf4j-simple"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,6 @@
 projectVersion=9.0.0-SNAPSHOT
 #4.0.2-4.0.3 breaks org.ysb33r.gradle:grolifant for chromedriver
 asciidoctorGradleVersion=4.0.1
-assetPipelineVersion=5.0.1
-fieldsVersion=6.0.0-SNAPSHOT
-gebPluginVersion=5.0.0-SNAPSHOT
 grolifantVersion=4.0.0
 gormVersion=9.0.0-SNAPSHOT
 gradleNexusPublishPluginVersion=2.0.0
@@ -16,18 +13,10 @@ groovyVersion=4.0.24-SNAPSHOT
 hibernateVersion=5.6.15.Final
 hibernateValidatorVersion=8.0.1.Final
 hibernateGroovyProxy=1.1
-jakartaAnnotationApiVersion=3.0.0
-jakartaPersistenceVersion=3.1.0
-jakartaTransactionVersion=2.0.1
-jakartaValidationVersion=3.0.2
 jansiVersion=2.4.1
 javaParserCoreVersion=3.26.2
 junitJupiterVersion=5.11.3
-junitJupiterPlatformVersion=1.11.3
 picocliVersion=4.7.6
-projectReactorVersion=3.6.10
-scaffoldingVersion=6.0.0-SNAPSHOT
-servletApiVersion=6.0.0
 snakeYamlVersion=2.3
 slf4jVersion=2.0.16
 spockVersion=2.3-groovy-4.0
@@ -36,9 +25,6 @@ tomcatLog4jVersion=8.5.2
 tomcatVersion=10.1.31
 viewsGradleVersion=4.0.0-SNAPSHOT
 webdriverBinariesPluginVersion=3.2
-chromeDriverVersion=126.0.6478.126
-geckodriverVersion=0.32.2
-edgeDriverVersion=110.0.1587.57
 
 org.gradle.caching=true
 org.gradle.parallel=false