Move all versions to gradle.properties, update dependencies to latest…

… compatible version and remove unused (#1825)
grails · Sep 22, 2024 · 581b9e0 · 581b9e0
1 parent 3268c9b
commit 581b9e0
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
-        classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
+        classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
+        classpath "com.bmuschko:gradle-nexus-plugin:$gradleNexusPluginVersion"
     }
 }
 
@@ -119,12 +119,12 @@ subprojects {
     dependencies {
         api "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
         implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationVersion"
-        compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.6"
+        compileOnly "com.github.spotbugs:spotbugs-annotations:$jsr305Version"
 
         if (isStandardGroovyMavenProject) {
-            documentation "org.fusesource.jansi:jansi:2.4.0"
+            documentation "org.fusesource.jansi:jansi:$jansiVersion"
             documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
-            documentation 'info.picocli:picocli:4.6.3'
+            documentation "info.picocli:picocli:$picocliVersion"
             documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")
 
             api "org.apache.groovy:groovy:$groovyVersion"
@@ -250,9 +250,9 @@ configurations {
 }
 
 dependencies {
-    build "com.cenqua.clover:clover:3.3.0"
-    build "org.apache.ant:ant-junit:1.10.12"
-    build "org.apache.ant:ant-nodeps:1.8.1"
+    build "org.openclover:clover:$cloverVersion"
+    build "org.apache.ant:ant-junit:$antVersion"
+    build "org.apache.ant:ant:$antVersion"
 }
 
 task install(dependsOn: subprojects*.tasks*.withType(PublishToMavenLocal))

diff --git a/clover.gradle b/clover.gradle
@@ -19,7 +19,7 @@ class CloverPluginConvention {
 }
 
 dependencies {
-	testRuntimeOnly "com.cenqua.clover:clover:3.3.0"
+	testRuntimeOnly "org.openclover:clover:$cloverVersion"
 }
 
 test.doFirst {

diff --git a/gradle.properties b/gradle.properties
@@ -1,33 +1,41 @@
+projectVersion=9.0.0-SNAPSHOT
 title=Grails GORM
 projectDesc=GORM - Grails Data Access Framework
 projectUrl=https://gorm.grails.org/
-projectVersion=9.0.0-SNAPSHOT
 githubSlug=grails/grails-data-mapping
 developers=Graeme Rocher,Jeff Brown,Burt Beckwith,James Kleeh,Puneet Behl,James Fredley
 
-hibernateVersion=5.6.15.Final
-grailsVersion=7.0.0-SNAPSHOT
-grailsAsyncVersion=5.0.2
-
+antVersion=1.10.15
 caffeineVersion=3.1.8
+cloverVersion=4.5.2
+commonsLangVersion=3.17.0
 commonsValidatorVersion=1.9.0
+hibernateVersion=5.6.15.Final
 jakartaElVersion=4.0.0
+gradleNexusPluginVersion=2.3.1
+gradleNexusPublishPluginVersion=1.3.0
+grailsAsyncVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-SNAPSHOT
 groovyVersion=4.0.23
 h2Version=2.2.224
 hibernateValidatorVersion=7.0.5.Final
+jansiVersion=2.4.1
 jakartaValidationVersion=3.0.2
-javaParserCoreVersion=3.25.9
+javaParserCoreVersion=3.25.10
 javassistVersion=3.30.2-GA
 jakartaPersistenceVersion=3.1.0
 jakartaTransactionVersion=2.0.1
 jakartaAnnotationApiVersion=3.0.0
-junitJupiterVersion=5.9.3
-junitJupiterPlatformVersion=1.9.3
+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=1.7.36
+slf4jVersion=2.0.16
 spockVersion=2.3-groovy-4.0
 springVersion=6.1.13
 
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.daemon=true
+org.gradle.daemon=true
diff --git a/grails-datastore-gorm-rx/build.gradle b/grails-datastore-gorm-rx/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api 'io.reactivex:rxjava:1.3.8'
+    api "io.reactivex:rxjava:$rxjavaVersion"
     api project(":grails-datastore-gorm"), {
         exclude group:"org.grails", module:'grails-async'
         exclude group:"org.grails", module:'grails-datastore-core'

diff --git a/grails-datastore-gorm-tck/build.gradle b/grails-datastore-gorm-tck/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api "org.springframework:spring-expression:$springVersion"
-    api 'commons-lang:commons-lang:2.6'
+    api "org.apache.commons:commons-lang3:$commonsLangVersion"
     api project(":grails-datastore-gorm-async")
     api project(":grails-datastore-gorm-support")
     api("jakarta.servlet:jakarta.servlet-api:$servletApiVersion")

diff --git a/grails-datastore-gorm-test/build.gradle b/grails-datastore-gorm-test/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     testImplementation project(":grails-datastore-gorm-tck")
     testImplementation "org.apache.groovy:groovy-json:$groovyVersion"
     testRuntimeOnly "org.springframework:spring-aop:$springVersion"
-    testRuntimeOnly "log4j:log4j:1.2.17"
 }
 
 //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
@@ -3,8 +3,8 @@ dependencies {
     api project(":grails-datastore-gorm-validation")
 
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
+    // :grails-datastore-gorm:compileGroovy requires jakarta.el.ExpressionFactory
     implementation("jakarta.el:jakarta.el-api:$jakartaElVersion")
-    runtimeOnly('org.glassfish:jakarta.el:4.0.2')
 
     compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
     compileOnly("org.springframework:spring-jdbc:$springVersion")