From bb40bc9dc23e864849ca015e8155d83dd0708336 Mon Sep 17 00:00:00 2001 From: thenatog Date: Wed, 28 Aug 2019 14:57:46 -0400 Subject: [PATCH] MINIFI-507 - Upgraded jetty, jackson-databind, zookeeper, h2database, spring and spring-security MINIFI-507 - Upgrading jersey MINIFI-507 - Updated okhttp, and in turn had to update the keystores and truststores to use a 'DNS:localhost' SAN in order for tests to pass. This closes #169. Signed-off-by: Aldrin Piri --- .../PullHttpChangeIngestorSSLTest.java | 2 +- .../src/test/resources/localhost-ks.jks | Bin 3512 -> 3517 bytes .../src/test/resources/localhost-ts.jks | Bin 1816 -> 1820 bytes .../minifi-framework-core/pom.xml | 14 +++++++------- pom.xml | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java index 470b380e9..8fe90044e 100644 --- a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java +++ b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java @@ -32,7 +32,7 @@ public class PullHttpChangeIngestorSSLTest extends PullHttpChangeIngestorCommonT public static void setUp() throws Exception { PullHttpChangeIngestorCommonTest.init(); - SslContextFactory ssl = new SslContextFactory(); + SslContextFactory.Server ssl = new SslContextFactory.Server(); ssl.setKeyStorePath("./src/test/resources/localhost-ks.jks"); ssl.setKeyStorePassword("localtest"); diff --git a/minifi-bootstrap/src/test/resources/localhost-ks.jks b/minifi-bootstrap/src/test/resources/localhost-ks.jks index df36197d92ab8e9870f42666d74c47646fd56f26..1e3989fef9afd8a5d0086491c28150d5dc01c497 100755 GIT binary patch delta 2149 zcma)(c{J1uAI4`fGc+^VmuRewkt{RDk|bo`WwM5AY-6&Mxz>L6r4T8MNQy%Cn@aX2 zTiMqvp=?)WnS|lSy`A@c&w1bf-akK|bH3+!&hvdO)FhNH4ETt_(>{PeFbF<|USj7KH1Gq(Xf--D_KD|0+sK9$}+M+2bx7 z*YLd;HQ+Ud&iu}0cw%A3qu`b9{8ntL#=|hrtMafn!95RmY#qG(e8(*!V^EfGvP-4>9u(Qn+6|%S$=C8Ws#bW z6IwOUCU4Rz3f*HpAtd@i{6I^`^~5CH33E7ggJ%k;uJPHFlBmq18gRu%vj3HV zaJ8c{5!s@F(p#OmfqF{`lBbUxlH!ZTU-=rDov9vDEU%kI7pXA;yEm+tCfCCAaIa`9 z%5HV0R@{7^Pw0dFrRoBI2Fjope_Yd_jsj*;9<4g6;)H zp{niTPREm8yCdNfk1OJ>8n^ZI6T~&JL+W`^uztL5lqu3s->vuZ8kGTv#-R|PcdOHM zrJa!+1C4aT^Pm+C$(e@FIn>@_k&O&{!8uB$sZIBnFtJj!dDS+!Yx@8jXj(HAcrJ?< zYtP#rneF5Mo__({y$F_@%xVxzJ-hwry1BwTDLwg(*8pzx{G98@zZB2db*AZzo+@Lh>kq5s zt_Ui-F7NFeqcQfluUBW^n2dk9@=YnMFwvUmJv#VQB$kW^oHRQ{G==>)bV(pZTxYqH zW4xGsy|s5k#HxVC29HY%SFx1`=LKKc4te(OLhGhxKFs_{lbZl?;Ea$ZdsAS9A#~kv zd@1=cY0Yw70v{~Bl4#mS;rDM8DQw&qIEw0}E*XO2+b=$GHzQ`KwIM&iO0wF1XMVZs zWK(~NtaiY}rA%Y&l>=;ic)M=n1p8=tF%ZjE`A4YpObrm~wb@9?hY%9bz_xwu|r z30C{PdzNRTiZ4(xi0QC(55QemXYh_0EWI?oX2sx31A#zb5X@Fi39kwQK>>UWG#noT zaeV}ZfFTeT$539*Od}ZXBnqOfMc~DA!=Y9z2vjBj;{#A|Eq}7Br#pcM&-F_qQOJJ@ zQ8TI@mB5AP_+_CeHg7*yvbU#S&<(sWKboM5S0xY#O2qR@D)#(n1^hpV|2N{j2}nHK zuPZn=#ESGEVEx~46p8G6gDjev0ArW>e>-Fv!_NUb0v#ykVPtsg0i{bH4RWS`+i@nf zd10v}jSkqV&v8jtU%&H962iGX>siw$x5<|&o)fDnOZ7YIJi%NqWOL8DjMTcz^M=qH zeWhtPy=x*mATr~WoMVjKN^-fgcB+_3@U(QO+_6?;VRnHIZXv1bMy2@&%Kf+w+~pd5 zCBR8u#(%+@RAQDdwo#XF`w?sGAbDiidCRUuLRM$@ypv)99YgG)u+MKVK+1^b;mvJF zxPjz6D!uOJ>@cJSg_Bd?7+F5q8;H)gWRxcUq?XTlFsO-LHCG;31x3 z+}~EYH$23DWZoY?POs*VzrHnhSAGBngi1i5U=a8T7B7M4`DbMeCkq;njQOwsAb(kQ z78WQ3@)sTrXOm7aNZ3Pz!AKYg8UqG{nw+nwodd3mAaK|2rw4GAeY%o#YFoYKgTL~} zX1Sr2cT5$Dv04h|U>80FE9#tT!Qw%UInQRb#xB$D%>We-=GKg+vo%e{fm^jB`>ay5 zf-13~uPP%9wJg!f+Y9@9f3Atgi^ZH`AAWnQIpY1%q+h9-3stvR)`CcYUuP!^@1+(v zdrp!k6tHgEv>Kr>F+0B}2aV&UQr;z-cm~A@Q(y52O7e~M=^Pk9d2j@&4g_JEOjEc8 z;#QZnbh16$NYVXun%JPPuq6rb8&lB`uQ;AB$BdW?x=6huU9AaoNr=Zlc;y>2JZ6KJ zXfyDKPD1w%Jy~(!ds0LBt`Z~4?vGkl1`7{d$-JdVycSc@d+~ei;oHQmeOcMR0oRAZ A9{>OV delta 2144 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 Z{@CNK^?A>^*#FW$7MFyxp8EIg82}KSSQP*O diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml index efa3c6702..202ae29c6 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml @@ -29,7 +29,7 @@ limitations under the License. org.eclipse.jetty jetty-server - 9.3.9.v20160517 + ${jetty.version} @@ -40,37 +40,37 @@ limitations under the License. org.eclipse.jetty jetty-servlet - 9.3.9.v20160517 + ${jetty.version} org.eclipse.jetty jetty-webapp - 9.3.9.v20160517 + ${jetty.version} org.eclipse.jetty jetty-servlets - 9.3.9.v20160517 + ${jetty.version} org.eclipse.jetty jetty-annotations - 9.3.9.v20160517 + ${jetty.version} org.eclipse.jetty apache-jsp - 9.3.9.v20160517 + ${jetty.version} org.eclipse.jetty apache-jstl - 9.3.9.v20160517 + ${jetty.version} diff --git a/pom.xml b/pom.xml index a6b769eb9..32b958289 100644 --- a/pom.xml +++ b/pom.xml @@ -100,11 +100,11 @@ limitations under the License. 1.7.25 1.8.0 1.2.3 - 9.4.11.v20180605 - 2.26 + 9.4.19.v20190610 + 2.29 2.2.0 - 4.3.10.RELEASE - 4.2.4.RELEASE + 4.3.25.RELEASE + 4.2.13.RELEASE 1.16.1 1.11.172 @@ -636,7 +636,7 @@ limitations under the License. com.squareup.okhttp3 okhttp - 3.4.1 + 3.12.3 @@ -1074,7 +1074,7 @@ limitations under the License. com.h2database h2 - 1.3.176 + 1.4.199 org.codehaus.jackson @@ -1084,7 +1084,7 @@ limitations under the License. com.fasterxml.jackson.core jackson-databind - 2.9.7 + 2.9.9.3 org.apache.spark @@ -1094,7 +1094,7 @@ limitations under the License. org.apache.zookeeper zookeeper - 3.4.6 + 3.5.5 org.apache.curator