Skip to content

Commit 581b9e0

Browse files
authored
Move all versions to gradle.properties, update dependencies to latest compatible version and remove unused (#1825)
1 parent 3268c9b commit 581b9e0

File tree

7 files changed

+30
-23
lines changed

7 files changed

+30
-23
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
maven { url "https://plugins.gradle.org/m2/" }
55
}
66
dependencies {
7-
classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
8-
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
7+
classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
8+
classpath "com.bmuschko:gradle-nexus-plugin:$gradleNexusPluginVersion"
99
}
1010
}
1111

@@ -119,12 +119,12 @@ subprojects {
119119
dependencies {
120120
api "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
121121
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationVersion"
122-
compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.6"
122+
compileOnly "com.github.spotbugs:spotbugs-annotations:$jsr305Version"
123123

124124
if (isStandardGroovyMavenProject) {
125-
documentation "org.fusesource.jansi:jansi:2.4.0"
125+
documentation "org.fusesource.jansi:jansi:$jansiVersion"
126126
documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
127-
documentation 'info.picocli:picocli:4.6.3'
127+
documentation "info.picocli:picocli:$picocliVersion"
128128
documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")
129129

130130
api "org.apache.groovy:groovy:$groovyVersion"
@@ -250,9 +250,9 @@ configurations {
250250
}
251251

252252
dependencies {
253-
build "com.cenqua.clover:clover:3.3.0"
254-
build "org.apache.ant:ant-junit:1.10.12"
255-
build "org.apache.ant:ant-nodeps:1.8.1"
253+
build "org.openclover:clover:$cloverVersion"
254+
build "org.apache.ant:ant-junit:$antVersion"
255+
build "org.apache.ant:ant:$antVersion"
256256
}
257257

258258
task install(dependsOn: subprojects*.tasks*.withType(PublishToMavenLocal))

clover.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CloverPluginConvention {
1919
}
2020

2121
dependencies {
22-
testRuntimeOnly "com.cenqua.clover:clover:3.3.0"
22+
testRuntimeOnly "org.openclover:clover:$cloverVersion"
2323
}
2424

2525
test.doFirst {

gradle.properties

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
1+
projectVersion=9.0.0-SNAPSHOT
12
title=Grails GORM
23
projectDesc=GORM - Grails Data Access Framework
34
projectUrl=https://gorm.grails.org/
4-
projectVersion=9.0.0-SNAPSHOT
55
githubSlug=grails/grails-data-mapping
66
developers=Graeme Rocher,Jeff Brown,Burt Beckwith,James Kleeh,Puneet Behl,James Fredley
77

8-
hibernateVersion=5.6.15.Final
9-
grailsVersion=7.0.0-SNAPSHOT
10-
grailsAsyncVersion=5.0.2
11-
8+
antVersion=1.10.15
129
caffeineVersion=3.1.8
10+
cloverVersion=4.5.2
11+
commonsLangVersion=3.17.0
1312
commonsValidatorVersion=1.9.0
13+
hibernateVersion=5.6.15.Final
1414
jakartaElVersion=4.0.0
15+
gradleNexusPluginVersion=2.3.1
16+
gradleNexusPublishPluginVersion=1.3.0
17+
grailsAsyncVersion=7.0.0-SNAPSHOT
18+
grailsVersion=7.0.0-SNAPSHOT
1519
groovyVersion=4.0.23
1620
h2Version=2.2.224
1721
hibernateValidatorVersion=7.0.5.Final
22+
jansiVersion=2.4.1
1823
jakartaValidationVersion=3.0.2
19-
javaParserCoreVersion=3.25.9
24+
javaParserCoreVersion=3.25.10
2025
javassistVersion=3.30.2-GA
2126
jakartaPersistenceVersion=3.1.0
2227
jakartaTransactionVersion=2.0.1
2328
jakartaAnnotationApiVersion=3.0.0
24-
junitJupiterVersion=5.9.3
25-
junitJupiterPlatformVersion=1.9.3
29+
jsr305Version=4.8.6
30+
junitJupiterVersion=5.11.0
31+
junitJupiterPlatformVersion=1.11.0
32+
picocliVersion=4.7.6
33+
rxjavaVersion=1.3.8
2634
servletApiVersion=6.0.0
27-
slf4jVersion=1.7.36
35+
slf4jVersion=2.0.16
2836
spockVersion=2.3-groovy-4.0
2937
springVersion=6.1.13
3038

3139
org.gradle.caching=true
3240
org.gradle.parallel=true
33-
org.gradle.daemon=true
41+
org.gradle.daemon=true

grails-datastore-gorm-rx/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
api 'io.reactivex:rxjava:1.3.8'
2+
api "io.reactivex:rxjava:$rxjavaVersion"
33
api project(":grails-datastore-gorm"), {
44
exclude group:"org.grails", module:'grails-async'
55
exclude group:"org.grails", module:'grails-datastore-core'

grails-datastore-gorm-tck/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
api "org.springframework:spring-expression:$springVersion"
3-
api 'commons-lang:commons-lang:2.6'
3+
api "org.apache.commons:commons-lang3:$commonsLangVersion"
44
api project(":grails-datastore-gorm-async")
55
api project(":grails-datastore-gorm-support")
66
api("jakarta.servlet:jakarta.servlet-api:$servletApiVersion")

grails-datastore-gorm-test/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies {
77
testImplementation project(":grails-datastore-gorm-tck")
88
testImplementation "org.apache.groovy:groovy-json:$groovyVersion"
99
testRuntimeOnly "org.springframework:spring-aop:$springVersion"
10-
testRuntimeOnly "log4j:log4j:1.2.17"
1110
}
1211

1312
//compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']

grails-datastore-gorm/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ dependencies {
33
api project(":grails-datastore-gorm-validation")
44

55
implementation "org.slf4j:slf4j-api:$slf4jVersion"
6+
// :grails-datastore-gorm:compileGroovy requires jakarta.el.ExpressionFactory
67
implementation("jakarta.el:jakarta.el-api:$jakartaElVersion")
7-
runtimeOnly('org.glassfish:jakarta.el:4.0.2')
88

99
compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
1010
compileOnly("org.springframework:spring-jdbc:$springVersion")

0 commit comments

Comments
 (0)