Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move all versions numbers to gradle.properties and update dependencies #893

Merged
merged 5 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boot-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies {
testImplementation "org.spockframework:spock-core:$spockVersion"

testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2"
testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
testRuntimeOnly "com.h2database:h2:$h2Version"
}
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "io.github.gradle-nexus:publish-plugin:2.0.0"
classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:$groovydocGradlePluginVersion"
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "org.grails.plugins:views-gradle:3.2.3"
classpath"org.asciidoctor:asciidoctor-gradle-jvm:4.0.0"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2"
classpath "org.grails.plugins:views-gradle:$viewsGradleVersion"
classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleVersion"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion"
}

configurations.configureEach {
Expand Down Expand Up @@ -149,11 +149,11 @@ subprojects { Project subproject ->
dependencies {
testImplementation "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
testImplementation "io.micrometer:micrometer-core:latest.integration"
testImplementation "io.projectreactor:reactor-test:3.6.5"
testImplementation "io.projectreactor:reactor-test:$projectreactorVersion"
testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
testImplementation "org.junit.platform:junit-platform-runner:1.10.2"
testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
}

Expand Down Expand Up @@ -257,7 +257,7 @@ subprojects { Project subproject ->
testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
testImplementation "org.junit.platform:junit-platform-runner:1.10.2"
testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/grails-data-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.grails.plugins:views-json"
implementation "org.grails.plugins:views-json-templates"
implementation 'org.grails.plugins:spring-security-rest:3.0.1'
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"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-database-per-tenant/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
implementation "org.grails:grails-dependencies:$grailsVersion", {
exclude module:'grails-datastore-simple'
}
implementation("org.ysb33r.gradle:grolifant50:2.0.2")
implementation "org.ysb33r.gradle:grolifant80:$grolifantVersion"
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-multiple-datasources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group "examples"

configurations.all {
resolutionStrategy.dependencySubstitution {
substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:4.0.22"))
substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:$groovyVersion"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/spring-boot-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {

runtimeOnly "com.h2database:h2:$h2Version"
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2"
runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation "org.spockframework:spock-core:$spockVersion"
Expand Down
2 changes: 1 addition & 1 deletion examples/standalone-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
implementation project(":grails-datastore-gorm-hibernate5")
runtimeOnly "com.h2database:h2:$h2Version"
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2"
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"
Expand Down
46 changes: 27 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
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
ehcacheVersion=3.10.8
fieldsVersion=5.0.3
gebVersion=7.0
gebPluginVersion=4.0.0
grolifantVersion=4.0.0
gormVersion=9.0.0-SNAPSHOT
gradleNexusPublishPluginVersion=2.0.0
grailsGradlePluginVersion=7.0.0-SNAPSHOT
grailsShellVersion=7.0.0-SNAPSHOT
groovyVersion=4.0.22
grailsSpringSecurityRestVersion=3.0.1
grailsVersion=7.0.0-SNAPSHOT
groovydocGradlePluginVersion=1.0.1
groovyVersion=4.0.23
# Tests are built for 1.4.200, so stick with older version
h2Version=1.4.200
hibernate5Version=5.6.15.Final
hibernateValidatorVersion=7.0.5.Final
Expand All @@ -15,32 +25,30 @@ jakartaPersistenceVersion=3.1.0
jakartaTransactionVersion=2.0.1
jakartaAnnotationApiVersion=3.0.0
jansiVersion=2.4.1
javaParserCoreVersion=3.25.9
junitJupiterVersion=5.9.3
junitJupiterPlatformVersion=1.9.3
javaParserCoreVersion=3.25.10
junitJupiterVersion=5.11.0
junitJupiterPlatformVersion=1.11.0
picocliVersion=4.7.6
pluginGrailsVersion=7.0.0-SNAPSHOT
projectreactorVersion=3.6.10
scaffoldingVersion=6.0.0-SNAPSHOT
seleniumSafariDriverVersion=4.23.1
seleniumVersion=4.23.1
servletApiVersion=6.0.0
slf4jVersion=1.7.36
snakeyamlVersion=2.2
snakeyamlVersion=2.3
slf4jVersion=2.0.16
spockVersion=2.3-groovy-4.0
springBootVersion=3.2.6
springVersion=6.1.12
springBootVersion=3.3.4
springVersion=6.1.13
testingSupportVersion=4.0.0-SNAPSHOT
tomcatLog4jVersion=8.5.2
tomcatVersion=10.1.29
viewsGradleVersion=4.0.0-SNAPSHOT
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
4 changes: 2 additions & 2 deletions grails-datastore-gorm-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
exclude group:'org.slf4j', module:'slf4j-api'
}

compileOnly ("net.sf.ehcache:ehcache-core:2.6.11") {
compileOnly ("org.ehcache:ehcache:$ehcacheVersion") {
exclude group: 'commons-logging', module:'commons-logging'
}

Expand All @@ -44,7 +44,7 @@ dependencies {
}
testImplementation "com.h2database:h2:$h2Version"

testImplementation "net.sf.ehcache:ehcache-core:2.6.11"
testImplementation "org.ehcache:ehcache:$ehcacheVersion"
testImplementation "org.hibernate:hibernate-ehcache:$hibernate5Version"

// groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
Expand Down
12 changes: 6 additions & 6 deletions grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ configurations.all {
}

dependencies {
documentation ("org.grails:grails-core:$pluginGrailsVersion")
documentation ("org.grails:grails-bootstrap:$pluginGrailsVersion")
documentation ("org.grails:grails-spring:$pluginGrailsVersion")
documentation ("org.grails:grails-core:$grailsVersion")
documentation ("org.grails:grails-bootstrap:$grailsVersion")
documentation ("org.grails:grails-spring:$grailsVersion")
documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")

compileOnly("org.grails:grails-bootstrap:$pluginGrailsVersion")
compileOnly("org.grails:grails-core:$pluginGrailsVersion")
compileOnly("org.grails:grails-bootstrap:$grailsVersion")
compileOnly("org.grails:grails-core:$grailsVersion")
compileOnly "org.spockframework:spock-core:$spockVersion", {
exclude group: "junit", module: "junit-dep"
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
Expand All @@ -44,7 +44,7 @@ dependencies {
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testRuntimeOnly "com.h2database:h2:$h2Version"
testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2"
testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
testRuntimeOnly "org.springframework:spring-aop:$springVersion"
testRuntimeOnly "org.springframework:spring-expression:$springVersion"
}
Expand Down
Loading