Browse Source

Upgrade to Apache HttpClient 4.5.8 and Jetty Reactive HttpClient 1.0.3

pull/23050/head
Juergen Hoeller 7 years ago
parent
commit
95232d5bf8
  1. 2
      spring-test/spring-test.gradle
  2. 4
      spring-web/spring-web.gradle
  3. 4
      spring-webflux/spring-webflux.gradle
  4. 2
      spring-webmvc/spring-webmvc.gradle

2
spring-test/spring-test.gradle

@ -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.7") { testCompile("org.apache.httpcomponents:httpclient:4.5.8") {
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

@ -37,9 +37,9 @@ dependencies {
optional("org.eclipse.jetty:jetty-servlet") { optional("org.eclipse.jetty:jetty-servlet") {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
optional("com.squareup.okhttp3:okhttp:3.14.0") optional("com.squareup.okhttp3:okhttp:3.14.0")
optional("org.apache.httpcomponents:httpclient:4.5.7") { optional("org.apache.httpcomponents:httpclient:4.5.8") {
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") {

4
spring-webflux/spring-webflux.gradle

@ -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.7") { optional("org.apache.httpcomponents:httpclient:4.5.8") {
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}")
@ -50,7 +50,7 @@ dependencies {
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("com.squareup.okhttp3:mockwebserver:3.14.0")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")

2
spring-webmvc/spring-webmvc.gradle

@ -50,7 +50,7 @@ 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.7") { testCompile("org.apache.httpcomponents:httpclient:4.5.8") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("commons-fileupload:commons-fileupload:1.4") testCompile("commons-fileupload:commons-fileupload:1.4")

Loading…
Cancel
Save