Skip to content

Commit 9f92b42

Browse files
committed
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.
1 parent 1af43d7 commit 9f92b42

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,15 @@ ext {
3939
kotlinVersion = "1.3.31"
4040
log4jVersion = "2.11.2"
4141
nettyVersion = "4.1.36.Final"
42-
reactorVersion = "Dysprosium-BUILD-SNAPSHOT"
42+
reactorVersion = "Dysprosium-M2"
43+
rsocketVersion = "0.12.2-RC4-SNAPSHOT"
4344
rxjavaVersion = "1.3.8"
4445
rxjavaAdapterVersion = "1.2.1"
45-
rxjava2Version = "2.2.8"
46+
rxjava2Version = "2.2.9"
4647
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
4748
tiles3Version = "3.0.8"
48-
tomcatVersion = "9.0.19"
49-
undertowVersion = "2.0.20.Final"
49+
tomcatVersion = "9.0.21"
50+
undertowVersion = "2.0.21.Final"
5051

5152
gradleScriptDir = "${rootProject.projectDir}/gradle"
5253
withoutJclOverSlf4J = {
@@ -142,13 +143,13 @@ configure(allprojects) { project ->
142143
}
143144

144145
checkstyle {
145-
toolVersion = "8.20"
146+
toolVersion = "8.21"
146147
configDir = rootProject.file("src/checkstyle")
147148
}
148149

149150
repositories {
150151
maven { url "https://repo.spring.io/libs-release" }
151-
maven { url "https://repo.spring.io/snapshot" } // Reactor
152+
maven { url "https://repo.spring.io/milestone" } // Reactor
152153
maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket
153154
mavenLocal()
154155
}
@@ -157,7 +158,7 @@ configure(allprojects) { project ->
157158
testCompile("junit:junit:4.13-beta-3") {
158159
exclude group: "org.hamcrest", module: "hamcrest-core"
159160
}
160-
testCompile("org.mockito:mockito-core:2.27.0") {
161+
testCompile("org.mockito:mockito-core:2.28.2") {
161162
exclude group: "org.hamcrest", module: "hamcrest-core"
162163
}
163164
testCompile("io.mockk:mockk:1.9.3")

spring-messaging/spring-messaging.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ dependencyManagement {
77
}
88
}
99

10-
def rsocketVersion = "0.12.2-RC4-SNAPSHOT"
11-
1210
dependencies {
1311
compile(project(":spring-beans"))
1412
compile(project(":spring-core"))

spring-orm/spring-orm.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
optional(project(":spring-context"))
1010
optional(project(":spring-web"))
1111
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4")
12-
optional("org.hibernate:hibernate-core:5.4.2.Final")
12+
optional("org.hibernate:hibernate-core:5.4.3.Final")
1313
optional("javax.servlet:javax.servlet-api:3.1.0")
1414
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
1515
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

0 commit comments

Comments
 (0)