From 934d3f8ff291ff30bad45177cd8aac7004636c41 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Tue, 12 Nov 2024 11:16:37 -0500 Subject: [PATCH] use grails-bom versions (#264) --- app1/build.gradle | 2 +- app2/build.gradle | 2 +- build.gradle | 5 ----- datasources/build.gradle | 2 +- gorm/build.gradle | 2 +- gradle.properties | 6 +----- gradle/geb.gradle | 2 +- hyphenated/build.gradle | 2 +- issue-11102/build.gradle | 2 +- issue-698-domain-save-npe/build.gradle | 2 +- micronaut/build.gradle | 4 ++-- namespaces/build.gradle | 2 +- plugins/issue11005/build.gradle | 2 +- plugins/loadafter/build.gradle | 2 +- plugins/loadfirst/build.gradle | 2 +- plugins/loadsecond/build.gradle | 2 +- 16 files changed, 16 insertions(+), 25 deletions(-) diff --git a/app1/build.gradle b/app1/build.gradle index f4fac59e..9b5ddc7b 100644 --- a/app1/build.gradle +++ b/app1/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation "org.grails.plugins:cache" implementation "org.grails.plugins:scaffolding" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:fields" runtimeOnly "org.apache.tomcat:tomcat-jdbc" diff --git a/app2/build.gradle b/app2/build.gradle index de82e95d..a5eeeb18 100644 --- a/app2/build.gradle +++ b/app2/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation "org.grails.plugins:hibernate5" implementation "org.grails.plugins:cache" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" diff --git a/build.gradle b/build.gradle index 71015fa4..36c35f6b 100644 --- a/build.gradle +++ b/build.gradle @@ -48,9 +48,4 @@ subprojects { apply plugin: 'java' compileJava.options.release = 17 - - dependencies { - implementation "org.sitemesh:grails-plugin-sitemesh3:$grailsSitemesh3Version" - } - } diff --git a/datasources/build.gradle b/datasources/build.gradle index e07245b6..d8a0261f 100644 --- a/datasources/build.gradle +++ b/datasources/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation "org.grails.plugins:hibernate5" implementation "org.grails.plugins:cache" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" runtimeOnly "org.apache.tomcat:tomcat-jdbc" diff --git a/gorm/build.gradle b/gorm/build.gradle index d77af93a..eb8544f5 100644 --- a/gorm/build.gradle +++ b/gorm/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation "org.grails.plugins:hibernate5" implementation "org.grails.plugins:cache" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" runtimeOnly "org.apache.tomcat:tomcat-jdbc" diff --git a/gradle.properties b/gradle.properties index 6fc77ae6..14092a5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,14 @@ assetPipelineVersion=5.0.1 # used to pull latest -SNAPSHOT version grailsCoreBranch=7.0.x grailsGradlePluginVersion=7.0.0-SNAPSHOT -grailsSitemesh3Version=7.0.0-SNAPSHOT # used by grails-gradle-plugin to force the groovy version groovyVersion=4.0.24 -jakartaXmlBindVersion=4.0.2 # no longer comes from grails-bom micronautVersion=4.6.5 micronautSerdeJacksonVersion=2.11.0 -gebPluginVersion=5.0.0-SNAPSHOT -servletApiVersion=6.0.0 springSecurityCoreVersion=7.0.0-SNAPSHOT # required for org.grails.plugins:views-gradle version viewsVersion=4.0.0-SNAPSHOT -org.gradle.caching=true +org.gradle.caching=true \ No newline at end of file diff --git a/gradle/geb.gradle b/gradle/geb.gradle index 6a9f5ed5..6292ed15 100644 --- a/gradle/geb.gradle +++ b/gradle/geb.gradle @@ -1,3 +1,3 @@ dependencies { - integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion") + integrationTestImplementation testFixtures("org.grails.plugins:geb") } \ No newline at end of file diff --git a/hyphenated/build.gradle b/hyphenated/build.gradle index 004a4f65..2f847104 100644 --- a/hyphenated/build.gradle +++ b/hyphenated/build.gradle @@ -34,7 +34,7 @@ dependencies { runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.apache.tomcat:tomcat-jdbc" testImplementation "org.grails:grails-web-testing-support" diff --git a/issue-11102/build.gradle b/issue-11102/build.gradle index 95d744aa..bfc558b6 100644 --- a/issue-11102/build.gradle +++ b/issue-11102/build.gradle @@ -51,7 +51,7 @@ dependencies { profile "org.grails.profiles:web" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" testImplementation "org.grails:grails-web-testing-support" testImplementation "org.grails:grails-gorm-testing-support" diff --git a/issue-698-domain-save-npe/build.gradle b/issue-698-domain-save-npe/build.gradle index 3354856e..256602a6 100644 --- a/issue-698-domain-save-npe/build.gradle +++ b/issue-698-domain-save-npe/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation "org.grails.plugins:hibernate5" implementation "org.grails.plugins:cache" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" runtimeOnly "org.apache.tomcat:tomcat-jdbc" diff --git a/micronaut/build.gradle b/micronaut/build.gradle index 1485b5f2..9f7e95f4 100644 --- a/micronaut/build.gradle +++ b/micronaut/build.gradle @@ -56,8 +56,8 @@ dependencies { profile "org.grails.profiles:web" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:$jakartaXmlBindVersion" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" testImplementation "org.grails:grails-gorm-testing-support" testImplementation "org.mockito:mockito-core" testImplementation "org.grails:grails-web-testing-support" diff --git a/namespaces/build.gradle b/namespaces/build.gradle index 16378c03..3bb8cb59 100644 --- a/namespaces/build.gradle +++ b/namespaces/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation "org.grails.plugins:hibernate5" implementation "org.grails.plugins:cache" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" runtimeOnly "org.grails.plugins:scaffolding" runtimeOnly "org.grails.plugins:fields" runtimeOnly "org.apache.tomcat:tomcat-jdbc" diff --git a/plugins/issue11005/build.gradle b/plugins/issue11005/build.gradle index 0a998eaa..fce75506 100644 --- a/plugins/issue11005/build.gradle +++ b/plugins/issue11005/build.gradle @@ -30,7 +30,7 @@ dependencies { api "org.grails:grails-web-boot" api "org.grails:grails-dependencies" - api "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + api "jakarta.servlet:jakarta.servlet-api" testImplementation "org.grails:grails-web-testing-support" testImplementation "org.grails:grails-gorm-testing-support" diff --git a/plugins/loadafter/build.gradle b/plugins/loadafter/build.gradle index 09ae6b63..c5c8d2c5 100755 --- a/plugins/loadafter/build.gradle +++ b/plugins/loadafter/build.gradle @@ -32,7 +32,7 @@ dependencies { api "org.grails:grails-web-boot" api "org.grails:grails-dependencies" - api "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + api "jakarta.servlet:jakarta.servlet-api" implementation "org.grails.plugins:spring-security-core:$springSecurityCoreVersion" diff --git a/plugins/loadfirst/build.gradle b/plugins/loadfirst/build.gradle index 277a25b5..81b0bfcb 100644 --- a/plugins/loadfirst/build.gradle +++ b/plugins/loadfirst/build.gradle @@ -31,7 +31,7 @@ dependencies { api "org.grails:grails-web-boot" api "org.grails:grails-dependencies" - api "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + api "jakarta.servlet:jakarta.servlet-api" console "org.grails:grails-console" } diff --git a/plugins/loadsecond/build.gradle b/plugins/loadsecond/build.gradle index a39dc19c..9d4aa141 100644 --- a/plugins/loadsecond/build.gradle +++ b/plugins/loadsecond/build.gradle @@ -31,7 +31,7 @@ dependencies { api "org.grails:grails-web-boot" api "org.grails:grails-dependencies" - api "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" + api "jakarta.servlet:jakarta.servlet-api" console "org.grails:grails-console" }