diff --git a/build.gradle b/build.gradle index 785158c43b8..4b0803a21f4 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,6 @@ ext { nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' } -def spockDependency = "org.spockframework:spock-core:$spockVersion" - def isGroovyProject(project) { !project.name.contains("grails-plugins") } @@ -113,32 +111,33 @@ subprojects { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + api platform("org.grails:grails-bom:$grailsVersion") api "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion" - implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationVersion" - compileOnly "com.github.spotbugs:spotbugs-annotations:$jsr305Version" + implementation "jakarta.validation:jakarta.validation-api" + compileOnly "com.github.spotbugs:spotbugs-annotations" if (isStandardGroovyMavenProject) { - documentation "org.fusesource.jansi:jansi:$jansiVersion" + documentation platform("org.grails:grails-bom:$grailsVersion") + documentation "org.fusesource.jansi:jansi" documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" documentation "info.picocli:picocli:$picocliVersion" - documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion") + documentation "com.github.javaparser:javaparser-core" compileOnly "org.apache.groovy:groovy:$groovyVersion" testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion" - testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion" - testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion" - testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.junit.platform:junit-platform-runner" - testImplementation(spockDependency) { transitive = false } + testImplementation "org.spockframework:spock-core" } if (project.name == "grails-datastore-gorm-tck") { api "org.apache.groovy:groovy-test-junit5:$groovyVersion" - api "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion" - api "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion" - runtimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion" - implementation(spockDependency) { transitive = false } + api "org.junit.jupiter:junit-jupiter-api" + api "org.junit.platform:junit-platform-runner" + runtimeOnly "org.junit.jupiter:junit-jupiter-engine" + implementation "org.spockframework:spock-core" } } @@ -248,8 +247,8 @@ configurations { dependencies { build "org.openclover:clover:$cloverVersion" - build "org.apache.ant:ant-junit:$antVersion" - build "org.apache.ant:ant:$antVersion" + build "org.apache.ant:ant-junit" + build "org.apache.ant:ant" } task install(dependsOn: subprojects*.tasks*.withType(PublishToMavenLocal)) diff --git a/gradle.properties b/gradle.properties index 3b0ad1ff61f..14caed7c99a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,6 @@ projectUrl=https://gorm.grails.org/ githubSlug=grails/grails-data-mapping developers=Graeme Rocher,Jeff Brown,Burt Beckwith,James Kleeh,Puneet Behl,James Fredley -antVersion=1.10.15 -caffeineVersion=3.1.8 cloverVersion=4.5.2 commonsValidatorVersion=1.9.0 hibernateVersion=5.6.15.Final @@ -17,24 +15,11 @@ gradleNexusPublishPluginVersion=1.3.0 grailsAsyncVersion=6.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT groovyVersion=4.0.24-SNAPSHOT -h2Version=2.3.232 hibernateValidatorVersion=7.0.5.Final -jansiVersion=2.4.1 -jakartaValidationVersion=3.0.2 -javaParserCoreVersion=3.25.10 javassistVersion=3.30.2-GA -jakartaPersistenceVersion=3.1.0 -jakartaTransactionVersion=2.0.1 jakartaAnnotationApiVersion=3.0.0 -jsr305Version=4.8.6 -junitJupiterVersion=5.11.0 -junitJupiterPlatformVersion=1.11.0 picocliVersion=4.7.6 rxjavaVersion=1.3.8 -servletApiVersion=6.0.0 -slf4jVersion=2.0.16 -spockVersion=2.3-groovy-4.0 -springVersion=6.1.14 org.gradle.caching=true org.gradle.parallel=true diff --git a/grails-datastore-async/build.gradle b/grails-datastore-async/build.gradle index cca52e99b0f..2a5ee818122 100644 --- a/grails-datastore-async/build.gradle +++ b/grails-datastore-async/build.gradle @@ -1,6 +1,3 @@ dependencies { - api "org.grails:grails-async:$grailsAsyncVersion", { - exclude group:'io.projectreactor',module:'reactor-core' - exclude group:'io.projectreactor',module:'reactor-stream' - } + api "org.grails:grails-async:$grailsAsyncVersion" } diff --git a/grails-datastore-core/build.gradle b/grails-datastore-core/build.gradle index 6d459403e23..dde44be576f 100644 --- a/grails-datastore-core/build.gradle +++ b/grails-datastore-core/build.gradle @@ -1,35 +1,17 @@ dependencies { - api "jakarta.transaction:jakarta.transaction-api:$jakartaTransactionVersion" - api "org.slf4j:slf4j-api:$slf4jVersion" - api "org.slf4j:jcl-over-slf4j:$slf4jVersion" - api "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion" - api "org.springframework:spring-core:$springVersion" , { - exclude group:'commons-logging',module:'commons-logging' - } - api "org.springframework:spring-beans:$springVersion", { - exclude group:'org.springframework', module:'spring-core' - exclude group:'commons-logging',module:'commons-logging' - } - api "org.springframework:spring-tx:$springVersion", { - exclude group:'commons-logging',module:'commons-logging' - exclude group:'org.springframework', module:'spring-context' - exclude group:'org.springframework', module:'spring-core' - exclude group:'org.springframework', module:'spring-beans' - exclude group:'org.springframework', module:'spring-aop' - } - api "org.springframework:spring-context:$springVersion", { - exclude group:'commons-logging',module:'commons-logging' - exclude group:'org.springframework', module:'spring-core' - exclude group:'org.springframework', module:'spring-expression' - exclude group:'org.springframework', module:'spring-aop' - exclude group:'org.springframework', module:'spring-beans' - exclude group:'org.springframework', module:'spring-asm' - } - implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" + api "jakarta.transaction:jakarta.transaction-api" + api "org.slf4j:slf4j-api" + api "org.slf4j:jcl-over-slf4j" + api "jakarta.persistence:jakarta.persistence-api" + api "org.springframework:spring-core" + api "org.springframework:spring-beans" + api "org.springframework:spring-tx" + api "org.springframework:spring-context" + implementation "com.github.ben-manes.caffeine:caffeine" implementation "org.javassist:javassist:$javassistVersion" testImplementation project(":grails-datastore-gorm") // we need the Grails @Entity annotation to test GORM syntax mapping - testImplementation("org.springframework:spring-context:$springVersion") - testImplementation("org.springframework:spring-web:$springVersion") + testImplementation "org.springframework:spring-context" + testImplementation "org.springframework:spring-web" } diff --git a/grails-datastore-gorm-rx/build.gradle b/grails-datastore-gorm-rx/build.gradle index 9d4d067b6d7..71f3618c754 100644 --- a/grails-datastore-gorm-rx/build.gradle +++ b/grails-datastore-gorm-rx/build.gradle @@ -7,6 +7,6 @@ dependencies { api project(":grails-datastore-core") implementation "org.javassist:javassist:$javassistVersion" compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion") - documentation "org.springframework:spring-beans:$springVersion" + documentation "org.springframework:spring-beans" documentation "org.grails:grails-async:$grailsAsyncVersion" } diff --git a/grails-datastore-gorm-support/build.gradle b/grails-datastore-gorm-support/build.gradle index 6ee48a081c8..7830c27cc86 100644 --- a/grails-datastore-gorm-support/build.gradle +++ b/grails-datastore-gorm-support/build.gradle @@ -1,51 +1,12 @@ dependencies { api project(':grails-datastore-gorm') - api("org.grails:grails-core:$grailsVersion") { - exclude group:'org.hibernate.jakarta.persistence', module:'hibernate-jpa-2.1-api' - exclude group:'aopalliance',module:'aopalliance' - exclude group:'commons-logging',module:'commons-logging' - // TODO: When the commons-collection dependency on grails-core is removed, then uncomment this -// exclude group:'commons-collections',module:'commons-collections' - exclude group:'commons-io',module:'commons-io' - exclude group:'org.grails',module:'grails-spring' - exclude group:'org.grails',module:'grails-bootstrap' - exclude group:'org.aspectj',module:'aspectjweaver' - exclude group:'org.aspectj',module:'aspectjrt' - exclude group:'oro',module:'oro' - exclude group:'asm',module:'asm' - exclude group:'cglib',module:'cglib' - exclude group:'cglib', module:'cglib-nodep' - exclude group:'xalan',module:'serializer' - exclude group:'org.springframework',module:'spring-aspects' - exclude group:'org.springframework',module:'spring-beans' - exclude group:'org.springframework',module:'spring-context' - exclude group:'org.springframework',module:'spring-context-support' - exclude group:'org.springframework',module:'spring-expression' - exclude group:'org.springframework',module:'spring-web' - exclude group:'org.springframework',module:'spring-aop' - exclude group:'commons-logging',module:'commons-logging' - exclude group:'commons-validator',module:'commons-validator' - exclude group:'com.googlecode.concurrentlinkedhashmap',module:'concurrentlinkedhashmap-lru' - } - api("org.grails:grails-bootstrap:$grailsVersion") { - exclude group:'org.apache.groovy', module:'groovy-ant' - exclude group:'org.apache.groovy', module:'groovy-xml' - exclude group:'org.apache.ant',module:'ant' - exclude group:'org.apache.ant',module:'ant-launcher' - exclude group:'org.apache.ant',module:'ant-trax' - exclude group:'org.apache.ant',module:'ant-junit' - exclude group:'org.apache.ant',module:'ant' - exclude group:'org.apache.ivy',module:'ivy' - exclude group:'org.codehaus.gant',module:'gant_groovy1.8' - exclude group:'jline',module:'jline' - exclude group:'org.fusesource.jansi',module:'jansi' - exclude group:'net.java.dev.jna',module:'jna' - } + api "org.grails:grails-core:$grailsVersion" + api "org.grails:grails-bootstrap:$grailsVersion" - compileOnly "org.springframework:spring-orm:$springVersion" - compileOnly "org.springframework:spring-webmvc:$springVersion" - compileOnly "org.grails:grails-web-url-mappings:$grailsVersion", { transitive = false } - compileOnly "org.grails:grails-web-common:$grailsVersion", { transitive = false } + compileOnly "org.springframework:spring-orm" + compileOnly "org.springframework:spring-webmvc" + compileOnly "org.grails:grails-web-url-mappings:" + compileOnly "org.grails:grails-web-common" compileOnly("org.hibernate:hibernate-core-jakarta:$hibernateVersion") { exclude group:'commons-logging', module:'commons-logging' exclude group:'commons-collections', module:'commons-collections' diff --git a/grails-datastore-gorm-tck/build.gradle b/grails-datastore-gorm-tck/build.gradle index ffe5fdbae64..eb2704c788e 100644 --- a/grails-datastore-gorm-tck/build.gradle +++ b/grails-datastore-gorm-tck/build.gradle @@ -1,8 +1,8 @@ dependencies { - api "org.springframework:spring-expression:$springVersion" + api "org.springframework:spring-expression" api project(":grails-datastore-gorm-async") api project(":grails-datastore-gorm-support") - api("jakarta.servlet:jakarta.servlet-api:$servletApiVersion") + api("jakarta.servlet:jakarta.servlet-api") runtimeOnly "org.apache.groovy:groovy-dateutil:$groovyVersion" } diff --git a/grails-datastore-gorm-test/build.gradle b/grails-datastore-gorm-test/build.gradle index da8ec6aa308..d083ed244f0 100644 --- a/grails-datastore-gorm-test/build.gradle +++ b/grails-datastore-gorm-test/build.gradle @@ -2,11 +2,11 @@ dependencies { api project(":grails-datastore-gorm"), project(":grails-datastore-core") - implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" + implementation "com.github.ben-manes.caffeine:caffeine" testImplementation project(":grails-datastore-gorm-rx") testImplementation project(":grails-datastore-gorm-tck") testImplementation "org.apache.groovy:groovy-json:$groovyVersion" - testRuntimeOnly "org.springframework:spring-aop:$springVersion" + testRuntimeOnly "org.springframework:spring-aop" } //compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'] diff --git a/grails-datastore-gorm/build.gradle b/grails-datastore-gorm/build.gradle index 2f111fb5cea..6c9d62bb6fd 100644 --- a/grails-datastore-gorm/build.gradle +++ b/grails-datastore-gorm/build.gradle @@ -2,7 +2,7 @@ dependencies { api project(":grails-datastore-core") api project(":grails-datastore-gorm-validation") - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" // :grails-datastore-gorm:compileGroovy requires jakarta.el.ExpressionFactory // required by gorm-hibernate5 test compilation @@ -10,11 +10,11 @@ dependencies { runtimeOnly "org.glassfish:jakarta.el:$jakartaElGlassfishImplVersion" compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion") - compileOnly("org.springframework:spring-jdbc:$springVersion") - compileOnly("org.springframework:spring-web:$springVersion") - testImplementation("org.springframework:spring-jdbc:$springVersion") + compileOnly("org.springframework:spring-jdbc") + compileOnly("org.springframework:spring-web") + testImplementation("org.springframework:spring-jdbc") testImplementation("org.hibernate:hibernate-validator:$hibernateValidatorVersion") - testRuntimeOnly("com.h2database:h2:$h2Version") + testRuntimeOnly("com.h2database:h2") } //compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'] diff --git a/grails-datastore-web/build.gradle b/grails-datastore-web/build.gradle index 187c4ffd49d..57ea159c712 100644 --- a/grails-datastore-web/build.gradle +++ b/grails-datastore-web/build.gradle @@ -1,22 +1,9 @@ dependencies { api project(":grails-datastore-core") - api "org.springframework:spring-web:$springVersion", { - exclude group:'commons-logging',module:'commons-logging' - exclude group:'org.springframework', module:'spring-context' - exclude group:'org.springframework', module:'spring-core' - exclude group:'org.springframework', module:'spring-beans' - exclude group:'org.springframework', module:'spring-aop' - } - api "org.springframework:spring-context:$springVersion", { - exclude group:'commons-logging',module:'commons-logging' - exclude group:'org.springframework', module:'spring-core' - exclude group:'org.springframework', module:'spring-expression' - exclude group:'org.springframework', module:'spring-aop' - exclude group:'org.springframework', module:'spring-beans' - exclude group:'org.springframework', module:'spring-asm' - } - compileOnly("jakarta.servlet:jakarta.servlet-api:$servletApiVersion") + api "org.springframework:spring-web" + api "org.springframework:spring-context" + compileOnly "jakarta.servlet:jakarta.servlet-api" - testImplementation("jakarta.servlet:jakarta.servlet-api:$servletApiVersion") - testImplementation "org.springframework:spring-test:$springVersion" + testImplementation "jakarta.servlet:jakarta.servlet-api" + testImplementation "org.springframework:spring-test" }