Skip to content

Commit 60e342e

Browse files
committed
Latest dependency updates (Commons Pool 2.3, TestNG 6.9.4, Undertow 1.2.6)
Includes an ajc downgrade to AspectJ 1.8.5 due to Gradle 2.4 not working on JDK 9.
1 parent 6418b54 commit 60e342e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ configure(allprojects) { project ->
5757
ext.slf4jVersion = "1.7.12"
5858
ext.snakeyamlVersion = "1.15"
5959
ext.snifferVersion = "1.14"
60-
ext.testngVersion = "6.8.21"
60+
ext.testngVersion = "6.9.4"
6161
ext.tiles2Version = "2.2.2"
6262
ext.tiles3Version = "3.0.5"
6363
ext.tomcatVersion = "8.0.22"
6464
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
65-
ext.undertowVersion = "1.2.5.Final"
65+
ext.undertowVersion = "1.2.6.Final"
6666
ext.woodstoxVersion = "4.4.1"
6767
ext.xmlunitVersion = "1.6"
6868
ext.xstreamVersion = "1.4.8"
@@ -118,7 +118,7 @@ configure(allprojects) { project ->
118118

119119
repositories {
120120
maven { url "https://repo.spring.io/libs-release" }
121-
maven { url "https://repo.spring.io/milestone" }
121+
// maven { url "https://repo.spring.io/milestone" }
122122
}
123123

124124
dependencies {
@@ -413,7 +413,7 @@ project("spring-aop") {
413413
compile("aopalliance:aopalliance:1.0")
414414
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
415415
optional("commons-pool:commons-pool:1.6")
416-
optional("org.apache.commons:commons-pool2:2.2")
416+
optional("org.apache.commons:commons-pool2:2.3")
417417
optional("com.jamonapi:jamon:2.81")
418418
}
419419
}
@@ -1054,7 +1054,8 @@ project("spring-aspects") {
10541054

10551055
dependencies {
10561056
aspects(project(":spring-orm"))
1057-
ajc("org.aspectj:aspectjtools:1.9.0.BETA-1") // for the ability to build on JDK 9, not exposed in the POMs yet
1057+
// ajc("org.aspectj:aspectjtools:1.9.0.BETA-1") // for the ability to build on JDK 9, not exposed in the POMs yet
1058+
ajc("org.aspectj:aspectjtools:${aspectjVersion}") // alternative to the above while Gradle fails on JDK 9 anyway
10581059
rt("org.aspectj:aspectjrt:${aspectjVersion}") // regular AspectJ version here, to be exposed in the POMs
10591060
compile("org.aspectj:aspectjweaver:${aspectjVersion}")
10601061
provided("org.eclipse.persistence:javax.persistence:2.0.0")

0 commit comments

Comments
 (0)