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

Upgrade to Apache HttpClient 4.5.7 and Commons FileUpload 1.4 

Includes RxJava 2.2.6, Netty 4.1.33, Undertow 2.0.17.
This commit is contained in:
Juergen Hoeller 2019-02-05 00:46:07 +01:00
parent d27bae245a
commit 165d2511b9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -37,15 +37,15 @@ ext {
junit5Version = "5.3.2" junit5Version = "5.3.2"
kotlinVersion = "1.2.71" kotlinVersion = "1.2.71"
log4jVersion = "2.11.1" log4jVersion = "2.11.1"
nettyVersion = "4.1.32.Final" nettyVersion = "4.1.33.Final"
reactorVersion = "Californium-SR4" reactorVersion = "Californium-SR4"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.5" rxjava2Version = "2.2.6"
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "9.0.14" tomcatVersion = "9.0.14"
undertowVersion = "2.0.16.Final" undertowVersion = "2.0.17.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"
withoutJclOverSlf4J = { withoutJclOverSlf4J = {

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

@ -72,7 +72,7 @@ dependencies {
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J) testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.apache.httpcomponents:httpclient:4.5.6") { testCompile("org.apache.httpcomponents:httpclient:4.5.7") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("io.projectreactor.netty:reactor-netty") testCompile("io.projectreactor.netty:reactor-netty")

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

@ -39,13 +39,13 @@ dependencies {
} }
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2")
optional("com.squareup.okhttp3:okhttp:3.12.1") optional("com.squareup.okhttp3:okhttp:3.12.1")
optional("org.apache.httpcomponents:httpclient:4.5.6") { optional("org.apache.httpcomponents:httpclient:4.5.7") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") { optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("commons-fileupload:commons-fileupload:1.3.3") optional("commons-fileupload:commons-fileupload:1.4")
optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0") optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
optional("com.fasterxml.woodstox:woodstox-core:5.2.0") { // woodstox before aalto optional("com.fasterxml.woodstox:woodstox-core:5.2.0") { // woodstox before aalto
exclude group: "stax", module: "stax-api" exclude group: "stax", module: "stax-api"

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

@ -34,7 +34,7 @@ dependencies {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
} }
optional("org.apache.httpcomponents:httpclient:4.5.6") { optional("org.apache.httpcomponents:httpclient:4.5.7") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

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

@ -50,10 +50,10 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") { testCompile("org.eclipse.jetty:jetty-server") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.apache.httpcomponents:httpclient:4.5.6") { testCompile("org.apache.httpcomponents:httpclient:4.5.7") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("commons-fileupload:commons-fileupload:1.3.3") testCompile("commons-fileupload:commons-fileupload:1.4")
testCompile("commons-io:commons-io:2.5") testCompile("commons-io:commons-io:2.5")
testCompile("joda-time:joda-time:2.10.1") testCompile("joda-time:joda-time:2.10.1")
testCompile("org.mozilla:rhino:1.7.10") testCompile("org.mozilla:rhino:1.7.10")