root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to RxJava 2.1.13, Hibernate ORM 5.2.17, AspectJ 1.9.1

This commit is contained in:
Juergen Hoeller 2018-05-02 16:32:55 +02:00
parent be4c07fc32
commit fa27130b82
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -56,8 +56,8 @@ configure(allprojects) { project ->
ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT" ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT"
ext.rxjavaVersion = "1.3.8" ext.rxjavaVersion = "1.3.8"
ext.rxjavaAdapterVersion = "1.2.1" ext.rxjavaAdapterVersion = "1.2.1"
ext.rxjava2Version = "2.1.12" ext.rxjava2Version = "2.1.13"
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8" ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.30" ext.tomcatVersion = "8.5.30"
ext.undertowVersion = "1.4.24.Final" ext.undertowVersion = "1.4.24.Final"

4
spring-aspects/spring-aspects.gradle
View File

@ -80,8 +80,8 @@ compileTestJava {
dependencies { dependencies {
aspects(project(":spring-orm")) aspects(project(":spring-orm"))
ajc("org.aspectj:aspectjtools:1.9.0") // for JDK 9+ build compatibility ajc("org.aspectj:aspectjtools:1.9.1") // for JDK 9+ build compatibility
rt("org.aspectj:aspectjrt:1.9.0") // for JDK 9+ build compatibility rt("org.aspectj:aspectjrt:1.9.1") // for JDK 9+ build compatibility
compile("org.aspectj:aspectjweaver:${aspectjVersion}") // for Maven POM exposure compile("org.aspectj:aspectjweaver:${aspectjVersion}") // for Maven POM exposure
optional(project(":spring-aop")) // for @Async support optional(project(":spring-aop")) // for @Async support
optional(project(":spring-beans")) // for @Configurable support optional(project(":spring-beans")) // for @Configurable support

2
spring-orm/spring-orm.gradle
View File

@ -9,7 +9,7 @@ dependencies {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1") optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1")
optional("org.hibernate:hibernate-core:5.2.16.Final") optional("org.hibernate:hibernate-core:5.2.17.Final")
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

2
spring-test/spring-test.gradle
View File

@ -65,7 +65,7 @@ dependencies {
testCompile("javax.ejb:javax.ejb-api:3.2") testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.1") testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.1") testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.16.Final") testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.9.Final") testCompile("org.hibernate:hibernate-validator:6.0.9.Final")
// Enable use of the JUnit Platform Runner // Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}") testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")