From a68cf77386a136167613d8484dc5b6281809ebaf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Sep 2016 14:59:05 +0100 Subject: [PATCH] Upgrade to Tomcat 8.5.5 As part of the upgrade, Tomcat now requires a keystore to contain an X.509 certificate. The two stores used in our tests have been updated by exporting their private keys and adding them as certificates. For example: $ keytool -exportcert -keystore test.jks -alias tomcat > exported $ keytool -importcert -keystore test.jks -file exported Closes gh-6703 Closes gh-6657 --- spring-boot-dependencies/pom.xml | 2 +- spring-boot/src/test/resources/test.jks | Bin 2248 -> 3173 bytes spring-boot/src/test/resources/test.p12 | Bin 2336 -> 3136 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 794b15a7b4a..1c147e29e06 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -175,7 +175,7 @@ 1.4.0 1.3 2.1.0.RELEASE - 8.5.4 + 8.5.5 1.3.23.Final 1.7 2.0 diff --git a/spring-boot/src/test/resources/test.jks b/spring-boot/src/test/resources/test.jks index cc0d7081c2e213f41f30aaba7611d55982968852..b10103d0d9dbe5505c895bad6dff9b2d8b52fa4b 100644 GIT binary patch delta 67 zcmX>h_*8=D-`jt085kItKzJk13Jzf~hc&k{JGGL5fiYa;gX*izTC82nB5t+r(`4qV S8(fGkeCc}C{S#|e=q&)nPZpa1 delta 42 xcmaDVaYB&i-`jt085kItfS7S3&k7Eaq>xA@(cD!#{qCfk4|AFpc2`SV9sp3;4}|~# diff --git a/spring-boot/src/test/resources/test.p12 b/spring-boot/src/test/resources/test.p12 index 5726ff02f4bec25e4f8cab48aa6f300694ec010e..de3664b9d7d32a971fa971ad7146219238703ed3 100644 GIT binary patch delta 1783 zcmVgav`oC9f8mw0$a5st(#7Ku&QE|C3#+l{P-RU8fB}Vg{KZP zPK5eBO&OHf_@hB}1}5BY6x^%McNZpE`J=Yl`!>q}n!%(Y!M!``grLx-*Gc<-r*32F z>>!JQs%CC_SjKo3eidZYBOlW!eY%Qjhk(0D z>W?BoOczqE^bAu`uMe^?eGFEAY#;t$;=d@Gh+-$kf)5LaV1=^ckz?ST%;f)}sNvIM zGobm#(+upBL31>Ye2}`lmV(3Ms)xMzC47&WvOro%FZYkZ-eB!`otdB%uzs&!_Qn~@ zzPz#$R{2!0v%;;VNK+6&SuSku*7y(#F}|Je@h7Y3veb5H&Ak=cpeZ_kJ9pC{9XI^| zvXOi#MM=FOGR@7z;@|wkBqyR|0Iphm*g8X(+fG3I)-J3jH^y2&yD!cgdqr zSZeq~1^;Se0;|emPL}k4MDdn#v43cF^d9|td6@&u!}nPU3<|qQiG^u!wgXhZW>@sd z00=})G@>`IOEWRs35S!DLu6T>V{4=pnI<$F049V}=Gr=~==H{Zbo9!n#zO}@S7twR#_L!tH zS=sm0-@u9h=2s4X(V3pgYRJJ&2l}zdXS8+Wo@%%naVUbytEKj3T^5V$7YFeE@_C{) zqx)5%S{UxXE`=!#BL-7ebc~VpDs4&r-7QT~*P;DKA6;{z! z&KvrzKSin^>Cgs?fQUoq! zOi0`Azf#tJj8F~qI?4PaUu5N)N!YQftT`(i!~ej88MeTuBK^WZ+6Beg3p2+^QKIMQ zi0Zkhdq>Y%>pl1f?rPPq(?AZsVMtR!>nU+Ii@FGJLiZ7s%rN4elbS#&_F=MugmV918Di8MEV_;&=~)&}C7s}>MCIO_u(q6h$? zf!HHbqDG)~{`!r$jURq`Q)`Q9jRU@|AOr`FOvY0XS1OT9emb$W-LyJf|E%SU_+F(+ zhb&_jq}1}5Vak)}TJuadMmA#rb^Vqz`u&N4zAr(_)qQCR&J46EtMN?-#4N{MNtMrm z?p%F;r`+F6QlW0*ZH$Brt@szu`|Q$|feI&bYBa1o&PruDmF>z(_Nzlp(hrohnp3lk z;$J(;{6#0FJK&~7>gDJHhjTy~<#E>K?(6)tEql+m7eh@t9MknW?y@fNf(w|+4>cY- zY#&^q>#oPbmKoD#@Lv0LncIZ)HQDkf*@a1e&*E29jwajx5UI;tO|n4&UV12*Qe|Y1 zFa2lBVx!S)@Ru+Sj@ZvLp)`+2O=^~ccapRC*7GX57g)nKTOTSQb0o6`5mX_ElSl#r1OSA8SFiv8 delta 976 zcmV;>126o*7@!h=FoFpj0s#Xsf(YUU2`Yw2hW8Bt2LYgh2-5_D2+uHr2+J^n17`*a zDuzgg_YDCD2B3liSTKSER0072FoFY31_>&LNQU`T~7Fo3V$4sQ)EIc@|c1GOE>@2Eq* zd#t%&fo;?6MSRRIEcdkeTT7R{>GieyZPfGEPtrD6^p@Mts7r{*ApTLw*O(E`ToESS z$u!)#0QSv)x+PFrN|0tMWfKcH3=4TIJN4`+>a_y>NG>k&5{bLcgDxm3i(knWeA}g* zg!`&v`QpAn)7y=(c%-I~(;Q#43Mh4*mCw@8RcUN{;XhGMb6O4(-is}SX|2&~2zpd{ z^nPd)Z@4D`f;==ZB*Qd4%D3Wt2nP-7Ly$>A_<4dK}3@ze44$?v+J~$ zh#qf)%aFwPG#VuJ(HV5HR#t$6o#7(j$R@ZNNI~(@X5 zi!m#Iyf9<6{_(VRbv1>@%Y+sm_^T~Z3yBZ=6_?7+Zq1FY_Xm2MESF+WxPW4bsq?PD zVVMSFxrGcrU;w&6O3xDP6Ef@ksEI*p56(d20KgL1(5#LVL$`F5b0Bt!as};6Wgpx~ zp_M){!T2c^NW$r?^u7g*ZOuNMQYJQeE2{f{iw5LDXD@WHl*GX-@^6Ly#tOkrPqqr# z2jOm_i~ZX=ZkQr6n9P36r877^92T{%juWR| zrzKmmZ%$W$`v?$A)-%_Rfdx{aRVWk`azI4_9oToFpDKWd^)b3vTMl}Ru_9pwGBGeA yFbM_)D-Ht!8U+9Z6kxfA&sN)AXxUl5Zy2fNMBHu~Tm%UJ#>?1-_|YH&0tf)0vBC8K