Skip to content

Commit 29dcd19

Browse files
committed
Upgrade to AspectJ 1.9.4, RxJava 2.2.10, Jetty 9.4.19, Undertow 2.0.22
Includes Hibernate Validator 6.0.17 and renames "withoutJclOverSlf4j".
1 parent 594c580 commit 29dcd19

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@ ext {
2828
!it.name.equals("spring-build-src") && !it.name.equals("spring-framework-bom")
2929
}
3030

31-
aspectjVersion = "1.9.3"
31+
aspectjVersion = "1.9.4"
3232
freemarkerVersion = "2.3.28"
3333
groovyVersion = "2.5.7"
3434
hsqldbVersion = "2.4.1"
3535
jackson2Version = "2.9.9"
36-
jettyVersion = "9.4.18.v20190429"
36+
jettyVersion = "9.4.19.v20190610"
3737
junit5Version = "5.3.2"
3838
kotlinVersion = "1.2.71"
3939
log4jVersion = "2.11.2"
4040
nettyVersion = "4.1.36.Final"
4141
reactorVersion = "Californium-SR9"
4242
rxjavaVersion = "1.3.8"
4343
rxjavaAdapterVersion = "1.2.1"
44-
rxjava2Version = "2.2.9"
44+
rxjava2Version = "2.2.10"
4545
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
4747
tomcatVersion = "9.0.21"
48-
undertowVersion = "2.0.21.Final"
48+
undertowVersion = "2.0.22.Final"
4949

5050
gradleScriptDir = "${rootProject.projectDir}/gradle"
51-
withoutJclOverSlf4J = {
51+
withoutJclOverSlf4j = {
5252
exclude group: "org.slf4j", module: "jcl-over-slf4j"
5353
}
5454
}

spring-context-support/spring-context-support.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
optional("org.freemarker:freemarker:${freemarkerVersion}")
1717
testCompile(project(":spring-context"))
1818
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
19-
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
19+
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
2020
testCompile("javax.annotation:javax.annotation-api:1.3.2")
2121
testRuntime("org.ehcache:jcache:1.0.1")
2222
testRuntime("org.ehcache:ehcache:3.4.0")

spring-test/spring-test.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ dependencies {
6161
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
6262
testCompile("javax.mail:javax.mail-api:1.6.2")
6363
testCompile("org.hibernate:hibernate-core:5.3.10.Final")
64-
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
64+
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
6565
// Enable use of the JUnit Platform Runner
6666
testCompile("org.junit.platform:junit-platform-runner")
6767
testCompile("org.junit.jupiter:junit-jupiter-params")
6868
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
6969
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
7070
testCompile("com.rometools:rome:1.12.0")
7171
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
72-
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
73-
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
72+
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
73+
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
7474
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
7575
testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
7676
exclude group: "commons-logging", module: "commons-logging"

spring-webflux/spring-webflux.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
optional("com.google.protobuf:protobuf-java-util:3.6.1")
4343
testCompile("javax.xml.bind:jaxb-api:2.3.1")
4444
testCompile("com.fasterxml:aalto-xml:1.1.1")
45-
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
45+
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
4646
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
4747
testCompile("io.projectreactor:reactor-test")
4848
testCompile("io.undertow:undertow-core:${undertowVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ dependencies {
3030
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
3131
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
3232
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
33-
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4J)
34-
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
35-
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
36-
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4J)
37-
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4J)
33+
optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4j)
34+
optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
35+
optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
36+
optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4j)
37+
optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4j)
3838
optional("org.apache.tiles:tiles-extras:${tiles3Version}") {
3939
exclude group: "org.springframework", module: "spring-web"
4040
exclude group: "org.slf4j", module: "jcl-over-slf4j"
@@ -66,7 +66,7 @@ dependencies {
6666
exclude group: "xerces", module: "xercesImpl"
6767
}
6868
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
69-
testCompile("org.hibernate:hibernate-validator:6.0.16.Final")
69+
testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
7070
testCompile("io.projectreactor:reactor-core")
7171
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
7272
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

0 commit comments

Comments
 (0)