Skip to content

Commit

Permalink
use grails-bom versions (#264)
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesfredley authored Nov 12, 2024
1 parent 8102039 commit 934d3f8
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 25 deletions.
2 changes: 1 addition & 1 deletion app1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion app2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 0 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,4 @@ subprojects {
apply plugin: 'java'

compileJava.options.release = 17

dependencies {
implementation "org.sitemesh:grails-plugin-sitemesh3:$grailsSitemesh3Version"
}

}
2 changes: 1 addition & 1 deletion datasources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gorm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/geb.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
integrationTestImplementation testFixtures("org.grails.plugins:geb:$gebPluginVersion")
integrationTestImplementation testFixtures("org.grails.plugins:geb")
}
2 changes: 1 addition & 1 deletion hyphenated/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion issue-11102/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion issue-698-domain-save-npe/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions micronaut/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion namespaces/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/issue11005/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/loadafter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion plugins/loadfirst/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/loadsecond/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 934d3f8

Please sign in to comment.