Skip to content

Commit

Permalink
Move all versions numbers to gradle.properties and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesfredley committed Sep 24, 2024
1 parent e5afa45 commit 4aa15b7
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 48 deletions.
12 changes: 3 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ buildscript {
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "org.asciidoctor:asciidoctor-gradle-jvm:4.0.0"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2"
classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleVersion"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion"
classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
}
}

Expand Down Expand Up @@ -83,12 +83,6 @@ allprojects {
details.useVersion(micronautVersion)
}
}

resolutionStrategy.dependencySubstitution {

//update fields plugin used by scaffolding
substitute(module("org.grails.plugins:fields:3.0.0.RC1")).using(module("io.github.gpc:fields:5.0.3"))
}
}


Expand Down
16 changes: 8 additions & 8 deletions examples/grails3-hibernate5-mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ dependencies {
runtimeOnly "com.h2database:h2:$h2Version"
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "io.github.gpc:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"

testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.testcontainers:mongodb:1.19.0"
testImplementation "io.netty:netty-transport:4.1.72.Final"
testImplementation "io.netty:netty-codec:4.1.72.Final"
testImplementation "io.netty:netty-handler:4.1.72.Final"
testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$grailsTestingSupportVersion"
testImplementation "org.testcontainers:mongodb:$testcontainersMongodbVersion"
testImplementation "io.netty:netty-transport:$nettyVersion"
testImplementation "io.netty:netty-codec:$nettyVersion"
testImplementation "io.netty:netty-handler:$nettyVersion"
testImplementation "org.grails.plugins:geb:$gebPluginVersion", {
exclude group: 'org.gebish', module: 'geb-spock'
}
implementation "com.github.erdi:webdriver-binaries-gradle-plugin:3.2"
implementation "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion"
testImplementation("org.grails.plugins:geb:$gebPluginVersion") {
exclude group: 'org.gebish', module: 'geb-spock'
}
Expand Down
8 changes: 4 additions & 4 deletions examples/grails3-mongodb-database-per-tenant/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ dependencies {
}
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")
implementation("org.ysb33r.gradle:grolifant50:2.0.2")
implementation("org.ysb33r.gradle:grolifant80:$grolifantVersion")

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2:$h2Version"

implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "io.github.gpc:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"

testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$grailsTestingSupportVersion"
testImplementation("org.grails.plugins:geb:$gebPluginVersion") {
exclude group: 'org.gebish', module: 'geb-spock'
}
Expand Down
6 changes: 3 additions & 3 deletions examples/grails3-mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dependencies {
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
runtimeOnly "io.github.gpc:fields:$fieldsVersion"
runtimeOnly "org.grails.plugins:fields:$fieldsVersion"

testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion"
testImplementation "org.grails:grails-web-testing-support:$grailsTestingSupportVersion"
testImplementation "io.netty:netty-transport:$nettyVersion"
testImplementation "io.netty:netty-codec:$nettyVersion"
testImplementation "io.netty:netty-handler:$nettyVersion"
Expand Down
6 changes: 3 additions & 3 deletions examples/test-data-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ dependencies {
implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
implementation "org.grails.plugins:views-json:$grailsViewsVersion"
implementation "org.grails.plugins:views-json-templates:$grailsViewsVersion"
implementation 'org.grails.plugins:spring-security-core:4.0.3'
implementation 'org.grails.plugins:spring-security-rest:3.0.1'
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
implementation "org.grails.plugins:spring-security-core:$grailsSpringSecurityCoreVersion"
implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityRestVersion"
testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion"
testImplementation "org.grails:grails-web-testing-support"
}
42 changes: 23 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
projectVersion=9.0.0-SNAPSHOT
asciidoctorGradleVersion=4.0.1
assetPipelineVersion=5.0.1
caffeineVersion=2.9.3
caffeineVersion=3.1.8
datastoreVersion=9.0.0-SNAPSHOT
fieldsVersion=6.0.0-SNAPSHOT
gebVersion=7.0
gebPluginVersion=4.0.0
gormVersion=9.0.0-SNAPSHOT
gradleNexusPublishPluginVersion=1.3.0
grailsGradlePluginVersion=7.0.0-SNAPSHOT
grailsShellVersion=7.0.0-SNAPSHOT
grailsSpringSecurityCoreVersion=6.0.0-SNAPSHOT
grailsSpringSecurityRestVersion=3.0.1
grailsTestingSupportVersion=4.0.0-SNAPSHOT
grailsVersion=7.0.0-SNAPSHOT
grailsViewsVersion=4.0.0-SNAPSHOT
grolifantVersion=4.0.0
groovyVersion=4.0.23
h2Version=1.4.200
hibernateCoreVersion=5.6.15.Final
Expand All @@ -20,33 +29,28 @@ jakartaAnnotationApiVersion=3.0.0
jakartaXmlBindVersion=4.0.2
jansiVersion=2.4.1
javaParserCoreVersion=3.25.9
junitJupiterVersion=5.9.3
junitJupiterPlatformVersion=1.9.3
micronautVersion=4.5.3
junitJupiterVersion=5.11.0
junitJupiterPlatformVersion=1.11.0
micrometer.version=1.8.0
micronautVersion=4.6.5
mongodbDriverVersion=5.1.4
testcontainersMongodbVersion=1.20.1
projectVersion=9.0.0-SNAPSHOT
nettyVersion=4.1.112.Final
pluginGrailsVersion=7.0.0-SNAPSHOT
seleniumSafariDriverVersion=4.23.1
seleniumVersion=4.23.1
servletApiVersion=6.0.0
scaffoldingVersion=6.0.0-SNAPSHOT
spockVersion=2.3-groovy-4.0
springBootVersion=3.2.6
springBootVersion=3.3.4
springVersion=6.1.13
testcontainersMongodbVersion=1.20.1
tomcatVersion=10.1.25
webdriverBinariesVersion=1.4
nettyVersion=4.1.112.Final
webdriverBinariesPluginVersion=3.2
chromeDriverVersion=126.0.6478.126
geckodriverVersion=0.32.2
edgeDriverVersion=110.0.1587.57

# Following are used only for example projects
fieldsVersion=5.0.3
grailsVersion=7.0.0-SNAPSHOT
micrometer.version=1.8.0
scaffoldingVersion=6.0.0-SNAPSHOT
testingSupportVersion=4.0.0-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=false
org.gradle.daemon=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M
chromeDriverVersion=126.0.6478.126
geckodriverVersion=0.32.2
edgeDriverVersion=110.0.1587.57
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M
3 changes: 1 addition & 2 deletions grails-datastore-gorm-mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ dependencies {
compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"

testImplementation "org.grails:grails-datastore-gorm-tck:$datastoreVersion"
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion"
testImplementation "org.hibernate:hibernate-validator:$hibernateValidatorVersion"
testImplementation "org.grails:grails-datastore-gorm-support:$datastoreVersion", {
exclude group: "org.grails", module:"grails-datastore-gorm-hibernate-core"
}
testRuntimeOnly 'org.glassfish.web:el-impl:2.2.1-b05'
testRuntimeOnly "org.springframework:spring-aop:$springVersion"
}

Expand Down

0 comments on commit 4aa15b7

Please sign in to comment.