Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Apache HttpClient 4.5.9 and Tomcat 8.5.42

Browse Source
This commit is contained in:
Juergen Hoeller
2019-06-12 00:51:26 +02:00
parent 8d5c36269e
commit 53b53e21be
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -54,7 +54,7 @@ ext {
rxjava2Version = "2.1.17" rxjava2Version = "2.1.17"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "8.5.40" tomcatVersion = "8.5.42"
undertowVersion = "1.4.27.Final" undertowVersion = "1.4.27.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"

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

@@ -71,7 +71,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.8") { testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("io.projectreactor.ipc:reactor-netty") testCompile("io.projectreactor.ipc:reactor-netty")

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

@@ -37,7 +37,7 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
optional("com.squareup.okhttp3:okhttp:3.12.3") optional("com.squareup.okhttp3:okhttp:3.12.3")
optional("org.apache.httpcomponents:httpclient:4.5.8") { optional("org.apache.httpcomponents:httpclient:4.5.9") {
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") {

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

@@ -33,7 +33,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.8") { optional("org.apache.httpcomponents:httpclient:4.5.9") {
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}")

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

@@ -49,7 +49,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") { testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.apache.httpcomponents:httpclient:4.5.8") { testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
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.3.3")