Skip to content

Commit badd26c

Browse files
codeconsolecodeconsole
committed
dependency cleanup
1 parent e94d5a5 commit badd26c

File tree

10 files changed

+49
-138
lines changed

10 files changed

+49
-138
lines changed

‎build.gradle‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ext {
2020
nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
2121
}
2222

23-
def spockDependency = "org.spockframework:spock-core:$spockVersion"
24-
2523
def isGroovyProject(project) {
2624
!project.name.contains("grails-plugins")
2725
}
@@ -113,32 +111,33 @@ subprojects {
113111

114112

115113
dependencies {
116-
implementation platform("org.grails:grails-bom:$grailsVersion")
114+
api platform("org.grails:grails-bom:$grailsVersion")
117115
api "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
118-
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationVersion"
119-
compileOnly "com.github.spotbugs:spotbugs-annotations:$jsr305Version"
116+
implementation "jakarta.validation:jakarta.validation-api"
117+
compileOnly "com.github.spotbugs:spotbugs-annotations"
120118

121119
if (isStandardGroovyMavenProject) {
122-
documentation "org.fusesource.jansi:jansi:$jansiVersion"
120+
documentation platform("org.grails:grails-bom:$grailsVersion")
121+
documentation "org.fusesource.jansi:jansi"
123122
documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
124123
documentation "info.picocli:picocli:$picocliVersion"
125-
documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")
124+
documentation "com.github.javaparser:javaparser-core"
126125

127126
compileOnly "org.apache.groovy:groovy:$groovyVersion"
128127
testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
129-
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
130-
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
131-
testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
128+
testImplementation "org.junit.jupiter:junit-jupiter-api"
129+
testImplementation "org.junit.jupiter:junit-jupiter-engine"
130+
testImplementation "org.junit.platform:junit-platform-runner"
132131

133-
testImplementation(spockDependency) { transitive = false }
132+
testImplementation "org.spockframework:spock-core"
134133
}
135134

136135
if (project.name == "grails-datastore-gorm-tck") {
137136
api "org.apache.groovy:groovy-test-junit5:$groovyVersion"
138-
api "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
139-
api "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
140-
runtimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
141-
implementation(spockDependency) { transitive = false }
137+
api "org.junit.jupiter:junit-jupiter-api"
138+
api "org.junit.platform:junit-platform-runner"
139+
runtimeOnly "org.junit.jupiter:junit-jupiter-engine"
140+
implementation "org.spockframework:spock-core"
142141
}
143142
}
144143

@@ -248,8 +247,8 @@ configurations {
248247

249248
dependencies {
250249
build "org.openclover:clover:$cloverVersion"
251-
build "org.apache.ant:ant-junit:$antVersion"
252-
build "org.apache.ant:ant:$antVersion"
250+
build "org.apache.ant:ant-junit"
251+
build "org.apache.ant:ant"
253252
}
254253

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

‎gradle.properties‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ projectUrl=https://gorm.grails.org/
55
githubSlug=grails/grails-data-mapping
66
developers=Graeme Rocher,Jeff Brown,Burt Beckwith,James Kleeh,Puneet Behl,James Fredley
77

8-
antVersion=1.10.15
9-
caffeineVersion=3.1.8
108
cloverVersion=4.5.2
119
commonsValidatorVersion=1.9.0
1210
hibernateVersion=5.6.15.Final
@@ -17,24 +15,11 @@ gradleNexusPublishPluginVersion=1.3.0
1715
grailsAsyncVersion=6.0.0-SNAPSHOT
1816
grailsVersion=7.0.0-SNAPSHOT
1917
groovyVersion=4.0.24-SNAPSHOT
20-
h2Version=2.3.232
2118
hibernateValidatorVersion=7.0.5.Final
22-
jansiVersion=2.4.1
23-
jakartaValidationVersion=3.0.2
24-
javaParserCoreVersion=3.25.10
2519
javassistVersion=3.30.2-GA
26-
jakartaPersistenceVersion=3.1.0
27-
jakartaTransactionVersion=2.0.1
2820
jakartaAnnotationApiVersion=3.0.0
29-
jsr305Version=4.8.6
30-
junitJupiterVersion=5.11.0
31-
junitJupiterPlatformVersion=1.11.0
3221
picocliVersion=4.7.6
3322
rxjavaVersion=1.3.8
34-
servletApiVersion=6.0.0
35-
slf4jVersion=2.0.16
36-
spockVersion=2.3-groovy-4.0
37-
springVersion=6.1.14
3823

3924
org.gradle.caching=true
4025
org.gradle.parallel=true

‎grails-datastore-async/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
dependencies {
2-
api "org.grails:grails-async:$grailsAsyncVersion", {
3-
exclude group:'io.projectreactor',module:'reactor-core'
4-
exclude group:'io.projectreactor',module:'reactor-stream'
5-
}
2+
api "org.grails:grails-async:$grailsAsyncVersion"
63
}

‎grails-datastore-core/build.gradle‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
11
dependencies {
2-
api "jakarta.transaction:jakarta.transaction-api:$jakartaTransactionVersion"
3-
api "org.slf4j:slf4j-api:$slf4jVersion"
4-
api "org.slf4j:jcl-over-slf4j:$slf4jVersion"
5-
api "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion"
6-
api "org.springframework:spring-core:$springVersion" , {
7-
exclude group:'commons-logging',module:'commons-logging'
8-
}
9-
api "org.springframework:spring-beans:$springVersion", {
10-
exclude group:'org.springframework', module:'spring-core'
11-
exclude group:'commons-logging',module:'commons-logging'
12-
}
13-
api "org.springframework:spring-tx:$springVersion", {
14-
exclude group:'commons-logging',module:'commons-logging'
15-
exclude group:'org.springframework', module:'spring-context'
16-
exclude group:'org.springframework', module:'spring-core'
17-
exclude group:'org.springframework', module:'spring-beans'
18-
exclude group:'org.springframework', module:'spring-aop'
19-
}
20-
api "org.springframework:spring-context:$springVersion", {
21-
exclude group:'commons-logging',module:'commons-logging'
22-
exclude group:'org.springframework', module:'spring-core'
23-
exclude group:'org.springframework', module:'spring-expression'
24-
exclude group:'org.springframework', module:'spring-aop'
25-
exclude group:'org.springframework', module:'spring-beans'
26-
exclude group:'org.springframework', module:'spring-asm'
27-
}
28-
implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
2+
api "jakarta.transaction:jakarta.transaction-api"
3+
api "org.slf4j:slf4j-api"
4+
api "org.slf4j:jcl-over-slf4j"
5+
api "jakarta.persistence:jakarta.persistence-api"
6+
api "org.springframework:spring-core"
7+
api "org.springframework:spring-beans"
8+
api "org.springframework:spring-tx"
9+
api "org.springframework:spring-context"
10+
implementation "com.github.ben-manes.caffeine:caffeine"
2911
implementation "org.javassist:javassist:$javassistVersion"
3012

3113
testImplementation project(":grails-datastore-gorm")
3214
// we need the Grails @Entity annotation to test GORM syntax mapping
33-
testImplementation("org.springframework:spring-context:$springVersion")
34-
testImplementation("org.springframework:spring-web:$springVersion")
15+
testImplementation "org.springframework:spring-context"
16+
testImplementation "org.springframework:spring-web"
3517
}

‎grails-datastore-gorm-rx/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies {
77
api project(":grails-datastore-core")
88
implementation "org.javassist:javassist:$javassistVersion"
99
compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
10-
documentation "org.springframework:spring-beans:$springVersion"
10+
documentation "org.springframework:spring-beans"
1111
documentation "org.grails:grails-async:$grailsAsyncVersion"
1212
}

‎grails-datastore-gorm-support/build.gradle‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,12 @@
11
dependencies {
22
api project(':grails-datastore-gorm')
3-
api("org.grails:grails-core:$grailsVersion") {
4-
exclude group:'org.hibernate.jakarta.persistence', module:'hibernate-jpa-2.1-api'
5-
exclude group:'aopalliance',module:'aopalliance'
6-
exclude group:'commons-logging',module:'commons-logging'
7-
// TODO: When the commons-collection dependency on grails-core is removed, then uncomment this
8-
// exclude group:'commons-collections',module:'commons-collections'
9-
exclude group:'commons-io',module:'commons-io'
10-
exclude group:'org.grails',module:'grails-spring'
11-
exclude group:'org.grails',module:'grails-bootstrap'
12-
exclude group:'org.aspectj',module:'aspectjweaver'
13-
exclude group:'org.aspectj',module:'aspectjrt'
14-
exclude group:'oro',module:'oro'
15-
exclude group:'asm',module:'asm'
16-
exclude group:'cglib',module:'cglib'
17-
exclude group:'cglib', module:'cglib-nodep'
18-
exclude group:'xalan',module:'serializer'
19-
exclude group:'org.springframework',module:'spring-aspects'
20-
exclude group:'org.springframework',module:'spring-beans'
21-
exclude group:'org.springframework',module:'spring-context'
22-
exclude group:'org.springframework',module:'spring-context-support'
23-
exclude group:'org.springframework',module:'spring-expression'
24-
exclude group:'org.springframework',module:'spring-web'
25-
exclude group:'org.springframework',module:'spring-aop'
26-
exclude group:'commons-logging',module:'commons-logging'
27-
exclude group:'commons-validator',module:'commons-validator'
28-
exclude group:'com.googlecode.concurrentlinkedhashmap',module:'concurrentlinkedhashmap-lru'
29-
}
30-
api("org.grails:grails-bootstrap:$grailsVersion") {
31-
exclude group:'org.apache.groovy', module:'groovy-ant'
32-
exclude group:'org.apache.groovy', module:'groovy-xml'
33-
exclude group:'org.apache.ant',module:'ant'
34-
exclude group:'org.apache.ant',module:'ant-launcher'
35-
exclude group:'org.apache.ant',module:'ant-trax'
36-
exclude group:'org.apache.ant',module:'ant-junit'
37-
exclude group:'org.apache.ant',module:'ant'
38-
exclude group:'org.apache.ivy',module:'ivy'
39-
exclude group:'org.codehaus.gant',module:'gant_groovy1.8'
40-
exclude group:'jline',module:'jline'
41-
exclude group:'org.fusesource.jansi',module:'jansi'
42-
exclude group:'net.java.dev.jna',module:'jna'
43-
}
3+
api "org.grails:grails-core:$grailsVersion"
4+
api "org.grails:grails-bootstrap:$grailsVersion"
445

45-
compileOnly "org.springframework:spring-orm:$springVersion"
46-
compileOnly "org.springframework:spring-webmvc:$springVersion"
47-
compileOnly "org.grails:grails-web-url-mappings:$grailsVersion", { transitive = false }
48-
compileOnly "org.grails:grails-web-common:$grailsVersion", { transitive = false }
6+
compileOnly "org.springframework:spring-orm"
7+
compileOnly "org.springframework:spring-webmvc"
8+
compileOnly "org.grails:grails-web-url-mappings:"
9+
compileOnly "org.grails:grails-web-common"
4910
compileOnly("org.hibernate:hibernate-core-jakarta:$hibernateVersion") {
5011
exclude group:'commons-logging', module:'commons-logging'
5112
exclude group:'commons-collections', module:'commons-collections'

‎grails-datastore-gorm-tck/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
dependencies {
2-
api "org.springframework:spring-expression:$springVersion"
2+
api "org.springframework:spring-expression"
33
api project(":grails-datastore-gorm-async")
44
api project(":grails-datastore-gorm-support")
5-
api("jakarta.servlet:jakarta.servlet-api:$servletApiVersion")
5+
api("jakarta.servlet:jakarta.servlet-api")
66
runtimeOnly "org.apache.groovy:groovy-dateutil:$groovyVersion"
77
}
88

‎grails-datastore-gorm-test/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ dependencies {
22
api project(":grails-datastore-gorm"),
33
project(":grails-datastore-core")
44

5-
implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
5+
implementation "com.github.ben-manes.caffeine:caffeine"
66
testImplementation project(":grails-datastore-gorm-rx")
77
testImplementation project(":grails-datastore-gorm-tck")
88
testImplementation "org.apache.groovy:groovy-json:$groovyVersion"
9-
testRuntimeOnly "org.springframework:spring-aop:$springVersion"
9+
testRuntimeOnly "org.springframework:spring-aop"
1010
}
1111

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

‎grails-datastore-gorm/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ dependencies {
22
api project(":grails-datastore-core")
33
api project(":grails-datastore-gorm-validation")
44

5-
implementation "org.slf4j:slf4j-api:$slf4jVersion"
5+
implementation "org.slf4j:slf4j-api"
66

77
// :grails-datastore-gorm:compileGroovy requires jakarta.el.ExpressionFactory
88
// required by gorm-hibernate5 test compilation
99
compileOnlyApi("jakarta.el:jakarta.el-api:$jakartaElVersion")
1010
runtimeOnly "org.glassfish:jakarta.el:$jakartaElGlassfishImplVersion"
1111

1212
compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
13-
compileOnly("org.springframework:spring-jdbc:$springVersion")
14-
compileOnly("org.springframework:spring-web:$springVersion")
15-
testImplementation("org.springframework:spring-jdbc:$springVersion")
13+
compileOnly("org.springframework:spring-jdbc")
14+
compileOnly("org.springframework:spring-web")
15+
testImplementation("org.springframework:spring-jdbc")
1616
testImplementation("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
17-
testRuntimeOnly("com.h2database:h2:$h2Version")
17+
testRuntimeOnly("com.h2database:h2")
1818
}
1919

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

‎grails-datastore-web/build.gradle‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
11
dependencies {
22
api project(":grails-datastore-core")
3-
api "org.springframework:spring-web:$springVersion", {
4-
exclude group:'commons-logging',module:'commons-logging'
5-
exclude group:'org.springframework', module:'spring-context'
6-
exclude group:'org.springframework', module:'spring-core'
7-
exclude group:'org.springframework', module:'spring-beans'
8-
exclude group:'org.springframework', module:'spring-aop'
9-
}
10-
api "org.springframework:spring-context:$springVersion", {
11-
exclude group:'commons-logging',module:'commons-logging'
12-
exclude group:'org.springframework', module:'spring-core'
13-
exclude group:'org.springframework', module:'spring-expression'
14-
exclude group:'org.springframework', module:'spring-aop'
15-
exclude group:'org.springframework', module:'spring-beans'
16-
exclude group:'org.springframework', module:'spring-asm'
17-
}
18-
compileOnly("jakarta.servlet:jakarta.servlet-api:$servletApiVersion")
3+
api "org.springframework:spring-web"
4+
api "org.springframework:spring-context"
5+
compileOnly "jakarta.servlet:jakarta.servlet-api"
196

20-
testImplementation("jakarta.servlet:jakarta.servlet-api:$servletApiVersion")
21-
testImplementation "org.springframework:spring-test:$springVersion"
7+
testImplementation "jakarta.servlet:jakarta.servlet-api"
8+
testImplementation "org.springframework:spring-test"
229
}

0 commit comments

Comments
 (0)