Skip to content

Commit

Permalink
allow dependency versions to be set by grails-bom so they automatical…
Browse files Browse the repository at this point in the history 
…ly advance (#248)

* allow dependency versions to be set by grails-bom so they automatically advance

* allow hibernate-ehcache and hibernate-core-jakarta to come from the hibernate5 plugin
  • Loading branch information
@jamesfredley
jamesfredley authored Sep 30, 2024
1 parent 9e7df80 commit cd654be
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 63 deletions.
10 changes: 4 additions & 6 deletions app1/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,15 @@ dependencies {
implementation "org.grails:grails-core"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"
implementation "org.grails.plugins:scaffolding:$scaffoldingVersion"
implementation "org.grails.plugins:scaffolding"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:fields"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
Expand Down
10 changes: 4 additions & 6 deletions app2/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
10 changes: 4 additions & 6 deletions app3/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
10 changes: 4 additions & 6 deletions datasources/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,15 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
10 changes: 4 additions & 6 deletions gorm/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,15 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
assetPipelineVersion=5.0.1
fieldsVersion=6.0.0-SNAPSHOT
gebVersion=7.0
gormVersion=9.0.0-SNAPSHOT
# 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.23
hibernate5Version=5.6.15.Final
jakartaXmlBindVersion=4.0.2

# no longer comes from grails-bom
micronautVersion=4.6.5
micronautSerdeJacksonVersion=2.11.0
scaffoldingVersion=6.0.0-SNAPSHOT

seleniumVersion=4.25.0
servletApiVersion=6.0.0
springSecurityCoreVersion=7.0.0-SNAPSHOT
testingSupportVersion=4.0.0-SNAPSHOT
# required for org.grails.plugins:views-gradle version
viewsVersion=4.0.0-SNAPSHOT

webdriverBinariesVersion=3.2
Expand Down
10 changes: 4 additions & 6 deletions hyphenated/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,16 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
4 changes: 2 additions & 2 deletions issue-11102/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ dependencies {
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
testImplementation "io.micronaut.serde:micronaut-serde-jackson:$micronautSerdeJacksonVersion"
Expand Down
10 changes: 4 additions & 6 deletions issue-698-domain-save-npe/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,15 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
7 changes: 3 additions & 4 deletions issue-views-182/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ dependencies {
implementation "org.grails.plugins:async"
implementation "org.grails.plugins:events"
implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.grails.plugins:views-json:$viewsVersion"
implementation "org.grails.plugins:views-json"
console "org.grails:grails-console"
profile "org.grails.profiles:rest-api"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

testImplementation "io.micronaut:micronaut-http-client:$micronautVersion"
testImplementation "io.micronaut.serde:micronaut-serde-jackson:$micronautSerdeJacksonVersion"
Expand Down
3 changes: 1 addition & 2 deletions micronaut/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "org.grails.plugins:hibernate5:$gormVersion"
classpath "org.grails.plugins:hibernate5"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
}
Expand Down Expand Up @@ -52,7 +52,6 @@ dependencies {
implementation "org.grails.plugins:scaffolding"
implementation "org.grails.plugins:events"
implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.grails.plugins:gsp"
compileOnly "io.micronaut:micronaut-inject-groovy"
console "org.grails:grails-console"
Expand Down
10 changes: 4 additions & 6 deletions namespaces/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,15 @@ dependencies {
implementation "org.grails:grails-web-boot"

implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.grails.plugins:cache"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:scaffolding"
runtimeOnly "org.grails.plugins:fields"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/issue11005/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dependencies {
api "org.grails:grails-dependencies"
api "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"

testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"
}

0 comments on commit cd654be

Please sign in to comment.