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

Upgrade to Tomcat 9.0.21, Undertow 2.0.21, RxJava 2.2.9, Checkstyle 8.21, Mockito 2.28.2, Hibernate ORM 5.4.3 

Centralizes rsocketVersion declaration in build.gradle; also includes upgrade to Reactor Dysprosium M2 proper.
This commit is contained in:
Juergen Hoeller 2019-06-11 18:26:13 +02:00
parent 1af43d7164
commit 9f92b42d69
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.gradle
View File

@ -39,14 +39,15 @@ ext {
kotlinVersion = "1.3.31"
log4jVersion = "2.11.2"
nettyVersion = "4.1.36.Final"
reactorVersion = "Dysprosium-BUILD-SNAPSHOT"
reactorVersion = "Dysprosium-M2"
rsocketVersion = "0.12.2-RC4-SNAPSHOT"
rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.8"
rxjava2Version = "2.2.9"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.19"
undertowVersion = "2.0.20.Final"
tomcatVersion = "9.0.21"
undertowVersion = "2.0.21.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = {
@ -142,13 +143,13 @@ configure(allprojects) { project ->
}
checkstyle {
toolVersion = "8.20"
toolVersion = "8.21"
configDir = rootProject.file("src/checkstyle")
}
repositories {
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/snapshot" } // Reactor
maven { url "https://repo.spring.io/milestone" } // Reactor
maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket
mavenLocal()
}
@ -157,7 +158,7 @@ configure(allprojects) { project ->
testCompile("junit:junit:4.13-beta-3") {
exclude group: "org.hamcrest", module: "hamcrest-core"
}
testCompile("org.mockito:mockito-core:2.27.0") {
testCompile("org.mockito:mockito-core:2.28.2") {
exclude group: "org.hamcrest", module: "hamcrest-core"
}
testCompile("io.mockk:mockk:1.9.3")

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

@ -7,8 +7,6 @@ dependencyManagement {
}
}
def rsocketVersion = "0.12.2-RC4-SNAPSHOT"
dependencies {
compile(project(":spring-beans"))
compile(project(":spring-core"))

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

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