Upgrade to Gradle 4.4 (and Apache HttpClient 4.5.4)

jhoeller · jhoeller · commit d198626618b0 · 2017-12-07T07:28:07.000+01:00
Issue: SPR-16237
diff --git a/build.gradle b/build.gradle
@@ -274,7 +274,7 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = '4.3.1'
+		gradleVersion = '4.4'
 
 		doLast() {
 			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
@@ -43,7 +43,7 @@ dependencies {
 	}
 	optional("io.undertow:undertow-core:${undertowVersion}")
 	optional("com.squareup.okhttp3:okhttp:3.9.1")
-	optional("org.apache.httpcomponents:httpclient:4.5.3") {
+	optional("org.apache.httpcomponents:httpclient:4.5.4") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ dependencies {`
`43`	`43`	`}`
`44`	`44`	`optional("io.undertow:undertow-core:${undertowVersion}")`
`45`	`45`	`optional("com.squareup.okhttp3:okhttp:3.9.1")`
`46`		`- optional("org.apache.httpcomponents:httpclient:4.5.3") {`
	`46`	`+ optional("org.apache.httpcomponents:httpclient:4.5.4") {`
`47`	`47`	`exclude group: "commons-logging", module: "commons-logging"`
`48`	`48`	`}`
`49`	`49`	`optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {`