Skip to content

Commit 48f330d

Browse files
committed
AspectJ 1.9 beta 1 for ajc task (for JDK 9 build compatibility)
Plus latest dependency updates (Hibernate ORM 5.0 RC2, Jackson 2.6 RC4, Reactor 2.0.4, Tomcat 8.0.24, C3P0 0.9.5.1, Rome 1.5.1, FreeMarker 2.3.23, JRuby 1.7.21) Issue: SPR-13012
1 parent 649d145 commit 48f330d

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,37 @@ configure(allprojects) { project ->
3232
ext.ehcacheVersion = "2.10.0"
3333
ext.ehcachejcacheVersion = "1.0.1"
3434
ext.fileuploadVersion = "1.3.1"
35-
ext.freemarkerVersion = "2.3.22"
35+
ext.freemarkerVersion = "2.3.23"
3636
ext.groovyVersion = "2.4.3"
3737
ext.gsonVersion = "2.3.1"
3838
ext.hibernate3Version = "3.6.10.Final"
3939
ext.hibernate4Version = "4.3.10.Final"
40-
ext.hibernate5Version = "5.0.0.CR1" // to be upgraded to 5.0 final in time for Spring Framework 4.2 GA
40+
ext.hibernate5Version = "5.0.0.CR2" // to be upgraded to 5.0 final in time for Spring Framework 4.2 GA
4141
ext.hibval4Version = "4.3.2.Final"
4242
ext.hibval5Version = "5.2.0.CR1" // to be upgraded to 5.2 final in time for Spring Framework 4.2 GA
4343
ext.hsqldbVersion = "2.3.2"
4444
ext.httpclientVersion = "4.5"
4545
ext.httpasyncVersion = "4.1"
46-
ext.jackson2Version = "2.6.0-rc3" // to be upgraded to 2.6 final in time for Spring Framework 4.2 GA
46+
ext.jackson2Version = "2.6.0-rc4" // to be upgraded to 2.6 final in time for Spring Framework 4.2 GA
4747
ext.jasperreportsVersion = "6.1.0"
4848
ext.javamailVersion = "1.5.4"
4949
ext.jettyVersion = "9.3.0.v20150612"
5050
ext.jodaVersion = "2.8.1"
51-
ext.jrubyVersion = "1.7.20.1"
51+
ext.jrubyVersion = "1.7.21"
5252
ext.jtaVersion = "1.2"
5353
ext.junitVersion = "4.12"
5454
ext.nettyVersion = "4.0.29.Final"
5555
ext.openjpaVersion = "2.4.0"
5656
ext.poiVersion = "3.12"
5757
ext.protobufVersion = "2.6.1"
58-
ext.reactorVersion = "2.0.3.RELEASE"
58+
ext.reactorVersion = "2.0.4.RELEASE"
5959
ext.slf4jVersion = "1.7.12"
6060
ext.snakeyamlVersion = "1.15"
6161
ext.snifferVersion = "1.14"
6262
ext.testngVersion = "6.9.4"
6363
ext.tiles2Version = "2.2.2"
6464
ext.tiles3Version = "3.0.5"
65-
ext.tomcatVersion = "8.0.23"
65+
ext.tomcatVersion = "8.0.24"
6666
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
6767
ext.undertowVersion = "1.2.8.Final"
6868
ext.woodstoxVersion = "5.0.1"
@@ -120,7 +120,7 @@ configure(allprojects) { project ->
120120

121121
repositories {
122122
maven { url "https://repo.spring.io/libs-release" }
123-
// maven { url "https://repo.spring.io/milestone" }
123+
maven { url "https://repo.spring.io/milestone" }
124124
}
125125

126126
dependencies {
@@ -614,7 +614,7 @@ project("spring-jdbc") {
614614
compile(project(":spring-tx"))
615615
optional(project(":spring-context")) // for JndiDataSourceLookup
616616
optional("javax.transaction:javax.transaction-api:${jtaVersion}")
617-
optional("com.mchange:c3p0:0.9.2.1")
617+
optional("com.mchange:c3p0:0.9.5.1")
618618
optional("org.hsqldb:hsqldb:${hsqldbVersion}")
619619
optional("com.h2database:h2:1.4.187")
620620
optional("org.apache.derby:derby:10.11.1.1")
@@ -701,7 +701,7 @@ project("spring-web") {
701701
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
702702
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
703703
optional("com.google.code.gson:gson:${gsonVersion}")
704-
optional("com.rometools:rome:1.5.0")
704+
optional("com.rometools:rome:1.5.1")
705705
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
706706
exclude group: "javax.servlet", module: "javax.servlet-api"
707707
}
@@ -1058,8 +1058,7 @@ project("spring-aspects") {
10581058

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

0 commit comments

Comments
 (0)