From 1b9aba0ddcc14edd08d69e8530d24c173127b441 Mon Sep 17 00:00:00 2001 From: su622b Date: Wed, 25 Mar 2020 15:41:44 -0400 Subject: [PATCH] update cert Issue-ID: DMAAP-1411 Change-Id: Id5228e5957dd970f38d61d946461308be95ae2fc Signed-off-by: su622b --- ajsc-shared-config/etc/org.onap.dmaap.mr.jks | Bin 3598 -> 3619 bytes pom.xml | 4 +- src/main/config/org.onap.dmaap.mr.keyfile | 54 +++++++++++++-------------- src/main/config/org.onap.dmaap.mr.p12 | Bin 4133 -> 4149 bytes src/main/config/org.onap.dmaap.mr.trust.jks | Bin 1413 -> 1413 bytes src/main/resources/docker/startup.sh | 10 ++++- version.properties | 2 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/ajsc-shared-config/etc/org.onap.dmaap.mr.jks b/ajsc-shared-config/etc/org.onap.dmaap.mr.jks index 2b825a04d082b6f2d24a71f48f3b17f64509cc1f..34cb01f44ef3c89b66216856e0ef29cadfbd3b51 100644 GIT binary patch delta 2071 zcmV+y2#leITk*DMk@pEuQpZ&xJpk#W(R^9IxoU?N|qK(CuUip0h$ zV`}jgi{e{L1DiLqQd#xWZgrJd~2EMaZdhsD# zc0VG5IYLc7QGab+zN_9wG_uwr!MBYSOQ;*NTR1W1G*caM(k`pB>wMtV>L{@nUj+?> z&;{+7&1@a%;L36{Z#uZ%Xs?~~rr)`_McJPHG)}jqjG_C;R68Ixf@dfZki|AHN(;1O z>WInr1!n%w6O+H5)L1+fr+3>H-?rw?#rf^XYOQ#K9)FLxzn3OS7g~zN8$onxcgpQ| z`gbsbZNp5$u^I1_svMFODpkOeCdw-!}ho|DdeLDAE{KTH+Fz`I_sl5jK zbK^%!h}|Z(z44od{E8WghE77O(MDcwG2;xx3Mi!3ynY)|aq4fSfO7#*;tT%0F>`J1 zjyBW4Ix`~CD0{Jl{?MXW=ht4ic;dj}pNjKNBs2fKOs>A6am2xbesI!3x ziois-Qgc)Jth)}sX+H8TU0jPlc$hI3E2h z5H$HV@w8}hB?DzZEl#`8F&8QmUM~}VKU} zlG!llKhAUrQhOem1(b9FSnJ~ahT#1Q%}KBe9aoFo{niMJ`&ibf;Uy+3<>hMHw1;lJ z#mh1msyLmvK&f$)iiw`4`&^E%!J+Gdq@+NLQ&bp|DhN(%mArjiT}3;pFviX~Z?ST! zLmW#U+z62Q$1WPu@I~x%sSd6OD1Q*L4b^8CqWqK)gIyaYZ}c83O@~}_l>9dBD zUIkoOGB7YRGBq$XGBY$eS{Ds6F)%YSH83ZE`?uaxP?TVPSACZ*F05E^l&YIz&ZQlOG06f0r0ypr)Tp zKj|qx9g4F6Eq6EQB3phtbGUIn*Bo2?4Uy7y(#f+kyPi6pJp)R&5N_Gzc53T2Q15wN zBrSW;T90Z3Bw28%4_>B>z}@LH6470KGt;7`shQg{?m>JX#4HphNC3?%-dvtU4Mj_5 zUNlSf*PDJuz^a)X)9eXLe+4QxItQYe{qvo_pfS;z$ntMibqRd)3Fp>UJk|?S#!O%x57v7E0|5X5qk;ht zFoFRLlXnN6Ku+*#kh+OHG`ZYctT}EGROlGyATU@4163Un1W_KyYPmaBO8RZ*yT`W-eoIZId(zLVqdi3c(!YB`9NgrD)Va_(|^6mo9{|7ut(4mu<;R=#~X?BhLHzXNhfs?tZ$^3h@HGG zUA?}QL%QDr&`C>GKP=@KuieS!{_I5diRKw9X>nY70%;AsakqQ^Fl6iOugdPLQ-5oo zZ>u#cy~HehrZL1Z^3$oR?1tciV;p~GVD54wKUh}FbP*rY0&QW3<=wAPf15EqIb zWLV&SVz~ff78kmxX3vxSZMF#c0yP22a)hb%cmb9S(IH03%6wsV}4Ln{rW?s0f zt#*i?R^k9~a!V8TG)?I}#l$U;>*O)vKu-8k*9pO1Fd(yY>VL_8Pw2)I>o9fD?JP3b zO_~V$_@{Eg*Yvzg+!*cR^}e7>Ahp*lQSaMg*C{I^v$+fV+q0au#|uEEB~f-&u)=%g z;682BF?#>!rcJG7qtBUcSWC|ED8Sn1fuxyA3;*;XSX=n znkiDL9z41Hdw=kA2G?Thr&Xf?=$Oe*mE?(6Od$9eo=_E-q6>@1;`JnKHv+TV>Y%b+ zEqa?fxfEv^Sq+N`03EEc4~WpGu%psFNzKdGKlPU)@);@N_^qq&P^0RxM4zSk++N2; z!g*k6CE2dyzs=uWwySefe$()FKn5;^N2)fAFz8aDhkxR?UEgz^xfa=BD~mMv=i71mhT0{w#gr3w{e=gDgr=JejKRl-(q@*AVa`OQVVy;!6vB0p%gX;Yo4Nqg6j zsrVL}W^D5Hbwky0(A`r(Q%t(-N2ckb#K$I3(-4Em`o?p8EBf4u#_nF7bKD8<70RhQ zi~NEy74PUVq;0~#X}?#K_5|+TcaS;q{h=m*^ts+Xx8ml=bt{iL+MlLmKR7E5e}8Ye zG~z1#In~k8;gC9YS!9tH)?ssD%22gi*V}`nmWa1m>|b=_Mag{M(EKRmsh3k-zoJu9 zvZ(UgZO)Luu$tZJ9jnU^=WMn|q_LyFp`S&1*WU4FrdF7WL~Hr;c1%tX3t{uEs}lFe zXyAHig+Cz$aR>(oZF_4M80vSl$A3dXekl^>6Gh+c6Fno+f|;5e(3 zD*p*jqcif)><P|VJBL=rhK;HV}*Ah2`eD&^ydSQKoI$$BN zD4(9@Qzn`PfZ&c5*+3J*nC4@D_o$p}vnls6QBbE0RjRDd^80mPAZ6A zlU)T|OEEbxH83 zaxo7u4F(A+hDe6@4FL%O7636KFdzm4RRjwRkr5h`5e7|vpQsx<)QnE!U4NgqwVy}W z!%X3ukZ%4WzeB*HGYM}RuiEi4ES|t9y$5rV(|KF7k!)1eENl|V5!Rs2GWa4{-}Xvp z{!aaU`$vW*wWhzOcp-_#Bwp1qMAp~e`1oj1y5+W?nu%#(~$`(SrM6XWeC#TZneJ`R7j(GwD0RRD`f$lJY>yv8-o*z}B zE_8IvghsK0EOwl?#_SPYijFWh1_MDBmsW0 zgY8A&Sbxd5)n5niEJfvN!FhV2fosQiM%^M(8U_S4CvtEOoN~%*zJz5y&JhZM*fncU zowAkn6eo)N+B6SoX!y0bMH{ogBWq;Vgir~vx^CY1QdRhp8%<*w+fr79s`h5 JWLaFHG9&4a!?6GW diff --git a/pom.xml b/pom.xml index b283193..97457f4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.onap.dmaap.messagerouter.messageservice dmaapMR1 - 1.1.17-SNAPSHOT + 1.1.18-SNAPSHOT dmaap-messagerouter-messageservice Message Router - Restful interface built for kafka @@ -398,7 +398,7 @@ org.onap.dmaap.messagerouter.msgrtr msgrtr - 1.1.21 + 1.1.22 org.slf4j diff --git a/src/main/config/org.onap.dmaap.mr.keyfile b/src/main/config/org.onap.dmaap.mr.keyfile index 8d07c91..72d3b73 100644 --- a/src/main/config/org.onap.dmaap.mr.keyfile +++ b/src/main/config/org.onap.dmaap.mr.keyfile @@ -1,27 +1,27 @@ -7Fyq0ekAS4OuD_1ceEI_yRJkXkUrwXxuAg8iwuA8VGsHHsSHQ4K3qOMpohP80HTeCvCi9nlLCHHq -FSiHDcGSaK3Dd0yY33PvYbaQ1117JonMrLxkkXt2452NodIpqcmzEBUdSP9QospaenQoECzD0Ddd -H-R8yn5l3g96nqoDFf6rC8p_baT9u2ysRg9XSAbRPd96v73bSUXOJ39YWBepQU112yPghJk4OUNw -wnugkhmgkllGuxyWLhz7xuiCPJi5Pa8ZKm8ClStV_rRVzJ-zfhwEwcAARni5BryQfFtk7v2kK8KO -ECGQTJTbfItp1jJx16gYHNxc-BJd_XJ_8Ygx6qQntSLV5e4GmN8lSKNwFmPrWnd3EEahuC-p3no- -RNr1JfV4y-3FDsbghiMAvVza2W61mthx26IHhhZYQuGvMSYNX3eawHADK129H9QyxBluN3lyKEQb -FkVXOw2__uvDQ3-yhZ-g1JdcWDAprZqrNICt1Q8bvEEQqQuHAAbmQjNLu8DdVtTwhe6GFiZ2PteI -YMsdIH2eqrJ7pUlRtVFY4mzRLviDvhqxGEqdzPHgXkcC7SsT-XzK2dKRpbVf3VF7xszLw5FB6Wjn -4K-emWVhWFLklUk0QCipkbH2fYiFytG-WD0L9WTKFHXOUfhBz4lvnvZtKWvlIueNXI3ojuzNNjXo -j-NWd6eUqLlhD016hOlQrebgp4RC4oOoqba5RLqGv6byEqwNniYMFPyuE3dnX6s_o9TEuJ4he3lY -8WG4UP2ncvhBEjJfv4eXmjyYcETG_xVDm--7PBELBQupEnnO7pn4mI83irL9gjxn139GcIv_CL_U -unlzIAVi703fUF-zE4xZMbjLxqvm2R2KkoXqZgfK6ZLMVa4kaH0yJ06j_rtkRhJOhYxB08eI_VBr -BE65dpbHrVxFJnR-BRNQsgFkJ6UhH2yHN5Y7OxsAOGKLBeyD2efm5KFEdFWzdgPjBsCaCIbiROvQ -fypV0rgeD8YD_N6zjIIIm8LoQt6XueNTyKKsMB7EuiOjphTZ0eVui9sUB3jUHqq_glQuJbqPNClY -lGa4nQquUXB5RgJPQ-Ydcd8SDLvfBAAzqZ7_2ZBvWjn39qbdg0EEAjuEGuHEX7ZmK40aTgMq86FY -ltclqODvPLKzcNcZtsiAidP78vtFsapPBbGAXA2Y1w4y5y-FNfiTkllWnnw-Fc-kKuv7M3nKwQVm -12w7d4hYIcqrBdzjMwvp6m2VlPGMHfy4ABJmHfBy0hCkBFp1eD7qCDUljFpf_xJ1vZt1lix35BLO -04spUGLihthH1yIAd_3CUI_JSMVMs5aNBwQymwmgs8kg3ton60TXbQjLTLRzmybpPrNwKMcXVCDS -5DQLvLwpk2snME7e3mb2jk-MWN7QddA-i0DqPKM5iiqIFwfmyvE7SXM3epR3bmrhAAmEVCxdTYh8 -Xp-DJAx9R7EhQLZlz_ynnykTZDjbjgYoCzgEVzgcs8E6uWEZoT4ajgTfrAN9SQIi99xiNCHYo0BF -InuVAx_HSE8nrGgJOAsUxvs8BTuKvvi_6zPD4zJB0UodKXlkn1nnckeU-cwVo0oIME17Rrr3zjlD -1kJfqN0Xteixj8kYx6qUyPg1wB0nu5JoWZ_8oAAppevFcU-H8TyCoIzxh0I3SBZ-9G9nQZjfhsz0 -KKZfVjaYpuWYQ_eDmMRQ84HZYabcZ7mRbWCHuW1-iecIQbB8UmLf3_5W2BO2Cy0sY_jgTUx8YOgC -_rh-kjhwnt8_k-0mpxSlf1TxGSP7_6_rEjtYaxYoSo4Wdc3rdQwbZWOcUYytyivbxIkA45Q0qG2N -GyDEfV9hH6XxZn5M3aZsKVfGW95Gre7vvkMlWZi0NoifCJ-JTebJsvBglTUn-Vy0vXfQ5_88DyN5 -E-3BakAtTlYrcIrt1Cp6SjkPFA6Ia96dYoEk-Eto_3GulHb1cA-BiAwvsnXA6MVAWXPfvUc6M0Rl -GiBQBMNds-g8u4ldGHJ_Wbu1O5RZxvjsRz4VWyXVh-ii3fBcs_YFGH8Ggmr_l1_uUH3z1jJE \ No newline at end of file +yJhToh1HtF7641JOeljPtn4ECRn7dncPKtUh9XN4Hv1GX2q1MSVsDI2qQ7i2Q8hH1G3Ko_x0fl1p +PLn2bOh9cOOGKxQrWxY0724Cme1MMc_drOl7TNk5DPmiw-teI6BdpS_wPtfDGLql9xuxIMWPdv_P +Id9LSzdW_Fa4FepgcxAj6jOK7jQBmJIsedxIpAVFU0bjmMwybe_BRe1x8yEBrfQo8Si0cfjYdQYP +XBTAnJ46zejAPJh2U4MyBhYzz2Zr1nMux2wjHc52z8J7_YpfveNSpr9UwOzSo0VqAEORISQDS7Cb +Cc9jeYmxPkVCEraHWq5jtOpVdwxwTSh1PJ8_pgnhQ4AgQS-5JyRdHWvzwGa2RW8i3ZF1qfJBP4wb +lyXiNYKSU5jDd-wNP0b9WDILGFRKuAHjz1wKB1IHyQTBX7dpjouuZysEkZS348NVLfAmb1klKp5Q +1lq2H4TdQnPaG6tV_wyI0ZrZsf4TCeDxYRxEAZc3ILefM_72Zc-UWEHQ_Q4Qck30fJzoHFgEm5Rm +8XofzAfHOcjoa7o8mEVi9veNpqTeNa8b2DLqYehcE_rMYU_y1AgWsnWgiIX1AEzLyUyfliS2PxQh +ZI3HLMrzfV--pOuQp_CnrcHclvkX3u5ZJ01a6jq7ONpr712YNmUEoD6s1UR0wEEeO61Cun8zfty8 +m-qXD3k-re64WDizw-pHXHYmIS9a4jL7D0R4KysJRf6iZTAUy4ROy6aS-wMYGgy0r7sEOZY6zp4h +MBczN5-3O7r-dKjOrr1RWXS3zt71oJNSGcnG41KKOnUeNpFBmIzVfoIp9KR5zdcg-gGrA8Xi_tBj +-rAqYfaNMBUDDtFCLhCHwuhKpR0Y0gG_-8J43yi3bfWOYMWkgPRHrJIiIO-SNUW_pobbRqQzIT3h +V5IcEc5pa-lnJnBNS5b_-cHsA0x4g1FPmDmjsGBYZmiaPSvXPzhpZVsww1p9nVL63rYLMOTSps1V +Lj9_UYWef7jD409vZRqeLQGi7lMNeC7oLv_hi_l05rZUkpegMLYmIWzjhzW8OuYdiHGuboV9TyUR +QWn5e_bypQBAJhYqaYNADzV9duW0v3SW89zP9TlkJ6tfvhcVXRQn4MUzIC9h_0q3cf_9Wemx7UPW +tGML52lYWcEbVbGF9yFtOm3qVPi4sVFO61vOtIoQhIIL3oa9gOWO9yPCjNm4lD-C4jAWHjtJdMr8 +cGtBplAHGly63VQs9RRUr42A95JMtsuJIPNDWP5-I-9R77NALdzjKEJE2FngGW8Ud4pJQ1sikPH3 +F4kVn1L2NpAilVrjlyb_y89mskrWaSdHCE2P1_gtkWHXfXIfKK0UFQt17s8hk0MfL6JSUDUE4IKN +tK70iHwmqY9VbYKYLf-8Gl7CW_Q9MumHjGsktwVZinpH4kOUREr6tyve4rZv8wN6mbNPVJ5gw_PE +I4bvSiEstMgelbkheMC4l-zc3q9C_fNZmLmdav8PLUrkS_NxnZ4hJQCDTjhbMqLIwknXU9SkDyPb +Dgh049PyJrYzv2_TpYoS6M_o3HjApMkRKlV_TEcbGoX06gAUYTiEWAQU6wm0TdsIdxjEXAWeTiX7 +ddI_vEioFemoKjE5iRWNaKL85xsTsQj6bQi1eSj1F0lxqnSGRldiMAPMrfqKDJ7xFpXS7nyQfLjY +m1H-Y3bk0iBBZbU0JKXerE_jlr3s7rcdarpwY1pdODoUJBk-EiKezm6zWuG9o3IisPNSqqOs4Cax +QAE3dt-1TpCxkw7Rpgm8eTwPMPOD3gj7Szcs2sEh-0UIk8y7uZCSRz0ZCsQj-jJl97WQV1ky89xS +c9ECqzDTgl2cVrih9aQu863_yHnjm9tNTxMH4DudB5JcmM96BX4CfS9qgVzAqCGvW9KS37wy0bK_ +iSCAhAWNT5L9E3fUyg--V_gmVjxGb8Y020cc4_pkqSbAAC8qjQhDWHLy_M2RzQrPmQMdP2PZ5-AU +Pw6HdHmVTOLZeYuVS1rXx4AYWXkgKHiSRqO6bal1opzOnSpbw-Q1bQu0wZ1MarXodEtJFaOr \ No newline at end of file diff --git a/src/main/config/org.onap.dmaap.mr.p12 b/src/main/config/org.onap.dmaap.mr.p12 index 1cffc61146d23d0cff82f03e8eeee9f15810fa60..1a0e8a49ce7440f213ed2e4beb50f743462174c3 100644 GIT binary patch delta 4047 zcmV;=4>0hhAhjSOFoF;<0s#Xsf)DBj2`Yw2hW8Bt2LYgh58DKS57#h)57Ut%Mt`jp z0Lg-g@+K`C+nLSI2j+-`encB9|3p)|)Y4K*V|%;_e~?)jb8%<{e#YtWGVW=2toxem zOt?{_>e@Zz=9&M~z zhf@n-zjvH*2P22h;*Us-0b8-&RzB(^hSMJHtx1!!ad+GyU%}MJ5ZQ~ORMNvGA;u>N zOJFE;#eJ-V(FHu6Mfc#<`5%7$21A=y*&rA#NeD^B>FN~+m0t4zp>jfK;YvUgPO76W zUW3F-Y{fqidO-h34LLtP=YQtqY1jOo4C;R|aT$sUsx=R{mSpITqEHx z|673=S`{IRzVpY-qRcpYb^`0pN4b^>i%Zh`5TmhGqeGH}Kk?@OYePUx5N(gtgu<;!@kr+JBQ%a*=<| z8g<8k^@xI-Ky;2J z#JwP=+~Yi8S4A43J7jZ@Md!#WlhAW5ZVpGYjVt);M>Tm6dA|)*v*PN&0ycf|$%}Yl zRKTesl>{b(975?)GWMC{PWU0qomLgv7_rsC+b19Ix-l-=!+%oj=ig)BJcF2=X!L4o zk{KqKX$EV)S2S=7i_<9sOkffCj}icE{GSC3k@EBs*_1oLv~NJ}?4C;iKt3wT>{Tx4GRK`t*co)&EB8PfU!jYxWbRylmV_J70N*qO^`<_)v(Lgn6(b(Kod z7~fy}LC^+xy5}xKQa_pf;|#g=X8FSXq&xZIq+8A`r)aO{Vp@u`{9ymu{t3q&P& z7Z;IB5#pg%KaD5WpRmpzmbqFlVR1ErH?7BB%HATF?C<2v3XUoa3z$Z$xk9Fq;%k$d zz}K*XdVeDJ^J?hWVcjvE9>nyW!rsvlW0*M*vv_ZR<}euUVyC!J1x2AoC~JQ7ME~KH zTvs>PPD-~O)DFYQW8lSKX%scVcxpWgNzXzd0l>m-pZk||(M z;HYo3FgEf73IPM+F=jA91_>&LNQUJO&9W zhDe6@4FLxRpn?i5FoFsx0s#Opf(jxA2`Yw2hW8Bt2LUiC1_~;MNQU?p+ z<-;0p-+xs(GE#3{oasaGO6NP|GP*`k`yvs;E>@h9GubTRpH=9I0{`x51ze}sHq$Ll zG51ZaL%$nX?+Ri)3w%zOe}5r z5RI7t(s{+l&(rfx2W!k#8j?=Vu6Kx0@-532^nV$ZG&dsFqhtYs-Wbl<3=u%&~#;7JfqSp(|sSE(17rhj>_S2@Eti zClz^iYpv4WkUZ6hqso_Ruk<1)K0PJKrVZoon|K0UN?0Vs7XYBY+{0t>9&^!Of$-mj zF@L~v+G0VNOcZzRbCIi>VJ!*NJuZxGP--s1502$Gzr7zQl4WE)+r(6VN7<$j@tB$u8gXliTKjvZdHvaFco8lUzD6eLZ!hkx6g z0?gSVFuZ{_?#)~@1#^^X=BZm%`k7V}Mg{o@th)Y9Yoe#&2GU4N~N=3htv zE!|&65)q+1OH#1}SfH(QxW+6w;!NU9`BP!s=L}BMK>c30hm#MdN8hGm`Aj&M4UPdU zdjPWL!`wZHcFH4m!z!yvj23Bje&l;p4hbtVy(=y?LH|t9ereZ>Feww4)`Hn!jt|E+ zE>gq5pPQlhSZbK`Y?in;O@BOHrv^>mz4PZ%EvQNUS(U4Hio1kg4tPAN{KFdbu=VB> zHw=EfjFs=qFX=5ko!yd$tB7?H~tXi`uzNXr*6bOkH5`n8)Y@?6|2yFi z)l#uB_%!{PNj>yL#D8T7sgrn?Y>NP8^8Ve^kXKd>PyP<>dZ?rTBB7V~oqWAc@|a3$ z5W1Xy1$iv{9q-p|lV+UjJxp^hqol`Vgyv+){n?U@>;TFLnI7siWATDdAtJjS{5 z33obC?Xh1~xWEI2F7lNEL0mezYHFCd@Nh0`P0>!XeF=25kbgy*_8YiIKxO3+{jjy^ z!U!yXx%v)A#p)$xN~FI;dsx5`zBAG>l6Zgyq^I?xc9i6ffU_KLADY{}4c4a8BMxxEx3-@et!={j?YlltJ7vwo9^3ae+d} z^3Sm*@a{c@OAPyq8Gv^p?y$-OS*4oc3M!K$UGUF|Fz41#4%;kzw>N(VOGKe#HfIQu zi+1if={2RxCCC3(X?tyTMoBn>MlUyoer0_1-(ON@-hW_EG}!^riS{4RE?of#0zh_t z?T_sQN!ME~gh3dr5KgWgO+|s za&I$P2kdeXuwfVT{U}6FSIR#!JNbebdE?Zjy$}{w^d*~1z|81wkx}9Ac#SdGw`Slk z#H$qaO@GR(4ti;8fXWXVsL(afjs}{x9$m_bFc=9}AI+NP;>;5~jd7Uatu3X`F#4bA z6X@aZtfWD-@z%~#WWuDgx&d|{ku2{M3xv-ix)uE8KJ!^hT+wV13$5UdRGJC8pdwL4 zFWM2*7o~BGLp(E>e;Nn#|L5lPm3wVpFMYMM^?wlX9dxd?93?%fwL^hC6N*)+oeWiI zIDrFOb%_aB*)IWrcrd{xWz*yu#Af#7a1AZ<1 zNB%SC{IH4JUkWwm?S2TUhH)b!^fnTlnvmKESqnR@1NRd5&sEv^udI`Vw7OmV+!Be6 z^?z|4Wq6Fra!VCKPP1-g8kMZeXkX%JoQ9wOVyb>`}FqDx_Y5lP74$}i6k!=6u7&m3k``ve-KnV=?H8NsAMZ34^3%^v2Pj>{8- z(4vv`+APIR=;8}Iug6xXYKm14xq^wed{Qh3V*qG|M^Q7e9N0bXky!p zT0`jFyq0{$V9yuogR!oBuxs;Xh<{IfQ#D7|2n~6?NzX$*H||^jo7>pp0vujOn>}Yn z)%99jcV?*b3?nIc;{bFPOlucOM3>sYu?<6({>L}_zl)9IRlL=M0`Vpe@}|1+ZzGc` z>AuLk5?9`_N`NyM0jMKj4Y|IJmLhC@ZV1q%FDjJNq&JD68C-~IxEQ=-hJW&6T^cL0 zs*K3zZ{zl>5-warN}j5?FcIsRZPY15c5MP0ICEVKwdmN$SKfY(U~;yV=z82AutIB1uG5%0vZJX z1QbvqA$}Yh|35wPzYb&8=^&Q6a77vf6s>)e*{u~DPf@*2`iS8%HztFw`~m|3hM+RN BobUhu delta 4031 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 diff --git a/src/main/config/org.onap.dmaap.mr.trust.jks b/src/main/config/org.onap.dmaap.mr.trust.jks index 5fccb668ff59126282765b4089f7378a4d7bc5da..aae6d81d70cbeaaa76125c7a8a5fbb84824f903e 100644 GIT binary patch delta 37 tcmZqWZsndJ&sxa;Zjt;(6<=176Xqq}*TWcHcOO%|FWaj*watCK4*>Zd4kZ8p delta 37 tcmZqWZsndJ&zjZX>MpiX#g|ni<;~pv%cnmp$kfaESGsV=)F-QpGyw_>5NZGb diff --git a/src/main/resources/docker/startup.sh b/src/main/resources/docker/startup.sh index 3898d86..9fb3414 100644 --- a/src/main/resources/docker/startup.sh +++ b/src/main/resources/docker/startup.sh @@ -1,3 +1,4 @@ +#!/bin/bash #******************************************************************************* # ============LICENSE_START======================================================= # org.onap.dmaap @@ -27,5 +28,12 @@ echo "AJSC HOME directory is " $root_directory echo "AJSC Conf Directory is" $config_directory echo "Starting using" $runner_file +if [ -z "${MR_JVM_ARGS}" ]; then -java -jar -XX:MaxPermSize=256m -XX:PermSize=32m -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m $runner_file context=/ port=3904 sslport=3905 +java -jar -Xmx512m -Xms512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=5555 -Dcom.sun.management.jmxremote.port=5555 -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m $runner_file context=/ port=3904 sslport=3905 + +else + +java -jar $MR_JVM_ARGS -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m $runner_file context=/ port=3904 sslport=3905 + +fi \ No newline at end of file diff --git a/version.properties b/version.properties index 8d21b0b..dba8f85 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=17 +patch=18 base_version=${major}.${minor}.${patch} -- 2.16.6