From d198626618b0cc744de9a11ad13c328e8e69a2ff Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 7 Dec 2017 07:28:07 +0100 Subject: [PATCH] Upgrade to Gradle 4.4 (and Apache HttpClient 4.5.4) Issue: SPR-16237 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54731 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- spring-web/spring-web.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2323d2f534a..ab774843f2c 100644 --- 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 index ed88a042a287c140a32e1639edfc91b2a233da8c..6b6ea3ab4ff4f69d55c5fd9c0a6ac70f47d41008 100644 GIT binary patch delta 1771 zcmVlyNL@p1tGkQ%YJ9d8N?8pdv=1pol$4U>PO zAd`^I43i0P8h=nIgj*maK+>ck(4yF08T7A84n9Ntx;NiHFYg zPxObh{f?~2vSpV{Clj4Lt3A8l?tXjZKmPvpHvli=+bFhSO2r#dv|*|PTQS{%8N4Z_ zS^2mg!yInJa1(FI$J;7y#h_zeMOH;Fiq7gOA*FYulz*4ff_xYe+>YQ~sWc;4l&XR} zYsp7Z#T^y40@W&(4XaR6&^2~jzpG~|Wy8!&it@06j!7e5(90EDDA-;9_IPz`>Vx(SPj%wF;s}AzPWJPHvRz1f937N^!<0FDN+J2->pqnY^v%Op(c&MrOoXT+|D> zF{2!auj)I|NfH(uIsmsy8IZ3Wn9qmu9%1ra&WXhe) z|BRow8&>kIr*7C5rHaYSHU-|Et{7%cNCtG$cb&7t$)K-Qp^OvODbuv>`LVVq2RI&^ zy?YfB15E zIcZhwtT<;#_V)y=4oI&W_CvC^7U6#;d8nDfX1*&-xk@j!;$F~+|G+>%ODj(Q?pmj zvPZ$2K|#cD?=Tj+uJ^vXEgsbJ%R{=4i~EckDmY91>{KD~@Y*^G5Tl-x>`Vr2C4axe zda)=9G#G3;JguiMY>Gl&GMF_ORj@TV@?X}GvQ<^dh`AgminHx!>xgBV#3U){z_P`n zbyr{~zsB46=?^0=Sq3(WyEf|EB+^j%DOKf$QI=wU89iDj5r&QThr#Y?nE(P9`e{=C`ClS#gL1qX?b zsBj2FfFo_kVIn_5S>syO9QE>gmC`YKsb-boPTH)I&>lMm8K;O+xyK1wb$_zP4N!G* zoVwR=!gX?$s|2B@(y|hdy}Y81dVq&hj;o%knTJ(%J5$3dHT@pelTMh|`IKRfP$O+R zQtJ_03Do8bbb!Y*KFl3%AO)wII$7Jy$w3ESGbg7p;yU@$O;|ibC!5|i#_DxHhnAM> z64uRdjXy^+y@d7OA)4;)TYtianRI-kd?$_Kju7v0Z4(dC+i2VCm@Hva4d5~U&;(l< zVH3N!>t!Eyut0m+i9u#~hdV)m2*)2NLeRxz4&zQ#}|MbNh zr%yDQK3*$cQT&G!jg>H(9G2Z{Huq{{O6c2@4v=ZlwhP0OgZm&1C|vb(3*{Ba`dRF#?))lW~C~lg4%$ zlUvRz0x)`$ae*U~TzV3dyv`~DBz=={fg_VpeH)Wo&JdF}&l&+}lTpue0tSSWae*U~ z>CZ+1D3dVIX#y&blQEYmlU$D$lRncBlj_hK0v(c*F_$TmFVQ*zE0vQmmnoB7l@XIZ z(-4!j(Ha3LlhDy%0t=dxF_$lsVbVGR<(!jofg_W^(mMh?pObNcBaS}R001EVT{r*$ delta 1810 zcmYk6cTm&W7Jx%AYltWq1tpNMfIvi)zEqzOR;q#s0SUbeC_?ChL=hNC^y));|cg}b3oSE~-d0j2oRxOyJeP~1TihItl_Q05SK+q5K;3xuMzpa&u$K1R1^Rm{n2 zZT*4yP2TMfl;f>UN5A*yS<=r|doH(bwNqlOU#(=UKYRP@Eq06eyHcF1_eqF;qos-C zgNI$P?PODvn@X^?MRMvM4CQ`>wzp%5iS)Aej;(qt7dv!p+&TS|4^@AxbOyHV(L;#0 zUVj=dh}jh`Ca#|PqUIKeS#XzDX?23JPrJWc4va*GyLsBt9CmOtZP|zgq7pVK7XL0S zH`4j~P|ae5+t3ZY7-UG{*&gZN$O`WgarR|2Z7v6k{oLOIQS)ZhPNkd3hhF`iaKdz`S!d-J_1P1hbPFDnj{ zk~tQdQCpVlAqr5+kGvkwt?58SY;AQsT-Zft#rwFIwFQ=SUlnC8eBCN84E`WEKUf!f z6?S1a!ZB_@9v+>sDH9N9sxRxT;zPy^8W_*a+O}LWI#ij*^#oQM z12aO2=#B!oOFN;Nv2^tiJxcqI$jIC*!AR+8a zcwZaI`2Nn}C(zJTgvV&+R5Cq)LN%lq8<3B=vXU0TrxeVw!D@JpJGkY*9kiq(B zp%=l#h-GJR;Y)~0t1ZnnBI%h1&DDzfvEs4PyU()!;KC#N&P8a4rsA!-lcb^(%=Xfc z{$2p%bj;KfzE*JKCZ9{=c1X8ZmhoFlStUzc(kxS)fn3kB+`EFt zy>fd|1NTsnCn{4q_izADuuc={^5;gwJU&cuHpZJBS{f~8E~MDmM%@g6d-_6V(BpMg zR&~8_6=`6s5sbC?XY%^|3nxjx62|WP*c`T&gJAnNmFBweY%5{5#v#x(%frxmG0t_s zif+wc-vlG?0&2r(pl?_keEc5Yp++u) zu@Cr|JYo&rddSEBj+lVOQu*k|x(q&*&PV@rDPWbQ1cqhtQ-e2#;L|yL49GckU_^me zZxCRyJbuX{Ul=&SRt4{n{+~(#wIiZHHX8wE7ao)}`5!EbMTJ2>&)H)B+n8b$UnZCS zTl$qANLiqGR8;^DutsgcE1iH*t1O`3B@EOvMFB4k0=(V>5IDX9bbxzs=K)v8)Fpom aN$jA*iGw)(v(pdw2;`5Q`^A|4gZ~HOz+3bH diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 34c937c91d2..933b6473ce1 100644 --- 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 index 223996e8cd4..e3266744388 100644 --- 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") {