Skip to content

Commit 3616e96

Browse files
committed
Upgrade to SLF4J 1.7.28, Groovy 2.5.8, RxJava 2.2.12, Joda-Time 2.10.4, Rome 1.12.2, OkHttp 3.14.3, Apache HttpClient 4.5.10, Apache Johnzon 1.1.13
1 parent 357beb2 commit 3616e96

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ext {
3030

3131
aspectjVersion = "1.9.4"
3232
freemarkerVersion = "2.3.28"
33-
groovyVersion = "2.5.7"
33+
groovyVersion = "2.5.8"
3434
hsqldbVersion = "2.4.1"
3535
jackson2Version = "2.9.9"
3636
jettyVersion = "9.4.20.v20190813"
@@ -41,8 +41,8 @@ ext {
4141
reactorVersion = "Californium-SR12"
4242
rxjavaVersion = "1.3.8"
4343
rxjavaAdapterVersion = "1.2.1"
44-
rxjava2Version = "2.2.10"
45-
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
44+
rxjava2Version = "2.2.12"
45+
slf4jVersion = "1.7.28" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
4747
tomcatVersion = "9.0.26"
4848
undertowVersion = "2.0.26.Final"

spring-context/spring-context.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
2020
optional("org.codehaus.groovy:groovy:${groovyVersion}")
2121
optional("org.beanshell:bsh:2.0b5")
22-
optional("joda-time:joda-time:2.10.1")
22+
optional("joda-time:joda-time:2.10.4")
2323
optional("org.hibernate:hibernate-validator:5.4.3.Final")
2424
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
2525
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")

spring-test/spring-test.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ dependencies {
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.11.1")
70-
testCompile("com.rometools:rome:1.12.1")
70+
testCompile("com.rometools:rome:1.12.2")
7171
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
7272
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
7373
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
7474
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
75-
testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
75+
testCompile("org.apache.httpcomponents:httpclient:4.5.10") {
7676
exclude group: "commons-logging", module: "commons-logging"
7777
}
7878
testCompile("io.projectreactor.netty:reactor-netty")

spring-web/spring-web.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies {
3838
exclude group: "javax.servlet", module: "javax.servlet-api"
3939
}
4040
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
41-
optional("com.squareup.okhttp3:okhttp:3.14.2")
42-
optional("org.apache.httpcomponents:httpclient:4.5.9") {
41+
optional("com.squareup.okhttp3:okhttp:3.14.3")
42+
optional("org.apache.httpcomponents:httpclient:4.5.10") {
4343
exclude group: "commons-logging", module: "commons-logging"
4444
}
4545
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
@@ -58,7 +58,7 @@ dependencies {
5858
optional("com.google.code.gson:gson:2.8.5")
5959
optional("com.google.protobuf:protobuf-java-util:3.6.1")
6060
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
61-
optional("com.rometools:rome:1.12.1")
61+
optional("com.rometools:rome:1.12.2")
6262
optional("com.caucho:hessian:4.0.51")
6363
optional("org.codehaus.groovy:groovy:${groovyVersion}")
6464
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@@ -75,13 +75,13 @@ dependencies {
7575
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
7676
testCompile("org.eclipse.jetty:jetty-server")
7777
testCompile("org.eclipse.jetty:jetty-servlet")
78-
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2")
78+
testCompile("com.squareup.okhttp3:mockwebserver:3.14.3")
7979
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
8080
testCompile("org.skyscreamer:jsonassert:1.5.0")
8181
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
8282
testRuntime("com.sun.mail:javax.mail:1.6.2")
8383
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
8484
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
8585
testRuntime("javax.json:javax.json-api:1.1.4")
86-
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.12")
86+
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.13")
8787
}

spring-webflux/spring-webflux.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
3535
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
3636
}
37-
optional("org.apache.httpcomponents:httpclient:4.5.9") {
37+
optional("org.apache.httpcomponents:httpclient:4.5.10") {
3838
exclude group: "commons-logging", module: "commons-logging"
3939
}
4040
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@@ -51,7 +51,7 @@ dependencies {
5151
testCompile("org.eclipse.jetty:jetty-server")
5252
testCompile("org.eclipse.jetty:jetty-servlet")
5353
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
54-
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2")
54+
testCompile("com.squareup.okhttp3:mockwebserver:3.14.3")
5555
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
5656
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
5757
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
optional("javax.el:javax.el-api:3.0.1-b04")
2323
optional("javax.xml.bind:jaxb-api:2.3.1")
2424
optional("org.webjars:webjars-locator-core:0.37")
25-
optional("com.rometools:rome:1.12.1")
25+
optional("com.rometools:rome:1.12.2")
2626
optional("com.github.librepdf:openpdf:1.2.21")
2727
optional("org.apache.poi:poi-ooxml:4.1.0")
2828
optional("org.freemarker:freemarker:${freemarkerVersion}")
@@ -50,12 +50,12 @@ dependencies {
5050
testCompile("org.eclipse.jetty:jetty-server") {
5151
exclude group: "javax.servlet", module: "javax.servlet"
5252
}
53-
testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
53+
testCompile("org.apache.httpcomponents:httpclient:4.5.10") {
5454
exclude group: "commons-logging", module: "commons-logging"
5555
}
5656
testCompile("commons-fileupload:commons-fileupload:1.4")
5757
testCompile("commons-io:commons-io:2.5")
58-
testCompile("joda-time:joda-time:2.10.2")
58+
testCompile("joda-time:joda-time:2.10.4")
5959
testCompile("org.mozilla:rhino:1.7.10")
6060
testCompile("dom4j:dom4j:1.6.1") {
6161
exclude group: "xml-apis", module: "xml-apis"

0 commit comments

Comments
 (0)