From 7704d3079906a4fb51cd58f12d56bd3100fca6b2 Mon Sep 17 00:00:00 2001 From: econwar Date: Wed, 3 Apr 2019 10:40:26 +0000 Subject: [PATCH] Add AAF certs with year duration to DR Remove console logs during unit tests Disable checkstyle warnings Change-Id: Ie57e792e9616fe348be1931aacc274d28a9798bc Issue-ID: DMAAP-1143 Signed-off-by: econwar --- datarouter-docker-compose/pom.xml | 2 +- .../node_data/aaf_certs/org.onap.dmaap-dr.jks | Bin 3645 -> 3647 bytes .../node_data/aaf_certs/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../src/main/resources/node_data/node.properties | 6 +-- .../prov_data/aaf_certs/org.onap.dmaap-dr.jks | Bin 3645 -> 3647 bytes .../prov_data/aaf_certs/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../main/resources/prov_data/provserver.properties | 6 +-- datarouter-node/aaf_certs/org.onap.dmaap-dr.jks | Bin 3645 -> 3647 bytes .../aaf_certs/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes datarouter-node/pom.xml | 2 +- datarouter-node/src/main/resources/node.properties | 6 +-- .../dmaap/datarouter/node/DeliveryQueueTest.java | 27 ++--------- datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks | Bin 3645 -> 3647 bytes .../aaf_certs/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes datarouter-prov/pom.xml | 2 +- .../src/main/resources/provserver.properties | 6 +-- .../src/test/resources/logback-test.xml | 7 +-- datarouter-subscriber/pom.xml | 2 +- pom.xml | 13 ++++- version.properties | 4 +- 24 files changed, 144 insertions(+), 155 deletions(-) mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.keyfile mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.keyfile mode change 100755 => 100644 datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks mode change 100755 => 100644 datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile mode change 100755 => 100644 datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks mode change 100755 => 100644 datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile mode change 100755 => 100644 datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks diff --git a/datarouter-docker-compose/pom.xml b/datarouter-docker-compose/pom.xml index 73e8c7e6..4c261423 100644 --- a/datarouter-docker-compose/pom.xml +++ b/datarouter-docker-compose/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 2.0.2-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml datarouter-docker-compose diff --git a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks old mode 100755 new mode 100644 index 4bbd3580195608f99c8e3367407d4586b15f6522..2320dc9fe6b64cfcf7e3a9476ef868ed6198f059 GIT binary patch delta 1921 zcmV-{2Y&dy9KRfpH4NA`p49*V1p+XF1pbjh6MyPB0Rue? z)_*=fOZ(@W!)4Z`V-RC9a3O3$8uA7K*IZ}-+Ctsn8;ZFDZjlrVnsw=-U zK00j;{m|9KGEcnDJKs-po=1;=Zxa!2xQA^Hnw&(lChi_VGk74Q%o4gwRDIQwDqeR zFL~*f@FnszN#NQoyJ@5i6tzJf#V>-OyVeVg?CPP2k?5YS)xQW1bgcmO0&C2xPO;f zJ+Zzql@r_Gsii2V8cm-|a{Q^Y8HmORQ@syqgpbJCH%M7#@qgO|lD)M?m6VH{%lLsD%k1zFu_wu z674**rRZ@^^QZB0q?qa z#J->~rUCqqzMFr-l{%Uj3VhsKtJ-V&@X2utn|3u;vaq ztXSvo#Q?+7F(8ldqJxcQ;eXD!6e`i$TW8Qk#~mm#v!3q(^CZ5*D!2TVYTPzyT{Bw~ z7x(8ehpc#17l|C(V#PgFQ!V8L5|j0yASsot8X4fCX5NLfHy7Fq|69c8hyyFt@Ka{R zBf%yb#9@@&KF6khf!9)frtp#{--Wj@w8Pbvx|)Y*8-0!5j{*9md4Cp}x30|3ch8l_ z2W21D1R2ALn$I97IeIBC*7w>RMQ8_fG-W5%oYbTaZv}v~wUyHBzNlrBQH%fQJ1bIq|mW?BN@E zr^Gv3*fbKHXM(;}got_K&wLfg`I?HElbeUs3s>s3z+*aM5Pw?;>#$90k{&T9cBfxh zb&IoK`d(B(_SsJ?%jc&kK_m7+Vxsvi8~Q69`$4xsnI}P=}La1z#96FflMWGBhzUS{Ds6FfcSQF)%qYG%+!g z+6AM3qgnC^?Tc7}-;m)Q-f}|NLlDplr1{YT=73p}{n4{7_6m{fd%n4r(F=Uq{GkNv zmU|8uRR?ZEmb(@ti=gERK-r8ssmRn?ABhj%sAi^c%3(Mqr+k4`Z1||Z*jY9p4roR%5n>62T}M%9Xcye_lX4I(3a<46pEDRI&(PN}&H%!z9@6=>{Dez}FI$&CjB#J97h34{a`35upXKiaBzS%P9k;*hpa HMzWcisAjEu delta 1921 zcmV-{2Y&d!9K9TnH4GKyX*mD@1pqLD1pJXf6MyLU1i`tWjGLwChmQTtXpMnHga1)J zkjnSp4Vy{nIm4diW2yEUPbXzr4fvO@!e%+YEncf;4jpnS!`;=|aI0>X-bCbeKvxD0=djPatZE`2Ug`8)Vy#%*iq{KT-Al2p#W1IQfDJ^@vwJk5RfsF*L0Dtb zFMouKsh1qtamgFI&1SIU6>ahXm{*gkQ9b02&J(xPoYgqsNXhMG06ZHc9FPnrf)Ro& z0zdV13<43QZIb?OS_Gf=yH-%n`9y*Snjp!}WJZ-1i}Tj?-xd^V9jxG=NL+?NI|f3r zl&L_J1aZrLw3S@)VFN16{(r+z z8$B@t0!*GTTnY_^!OuG;zw6`YbE-VoTBHE01q7yX^UGX!GnJz3+->kWXJgcMqqo9f z1X8cXB;*zST>YR<6>2E^n<=!bfw@hes1A@gLw$uksOdlD7}F$!;bQG8Gte)FfN9=npfv*4D&4i{q_~G~iCB%|FmJWiXa-i4InN zyekXw4E!W8urt?Cnbl!NJr#>XBZh7>mk2;#VF+RJ-O)DIB0E&Ycwv$D1rSQeli^Z= zx=J^**@n)T(oK+XS|!y3n4_k*zy3NO}|HGD5n6q+rJnkCZJ3Q#S*f{{|UU80GXIz8qPB@*_jjp z0NMBKBW^4C?v|d8CQ#=tLtPPAyatwD#ds_{>cqb-TAj0uP5|NM+UO4UbFpn7#$RF?F#>lvJ z4mM)e^{Qx%6|rt$*&}j9)Dr`F>9+S%RP<552hSKm8sa3u8@TW7MEwpEkY~)1#2mR@nIQc znpjs$E4>H|e$dBmJkYOKe!juDj^gGukhB_~`pmU5(&cOKn9Y6S^xX5H24wF}Jfj}Y z8LB!YCS>!8Y%TZh#~J}Ip;bWR{5a1+0kudY{n-=ynXQ*81%JHbFEpET?H0G|eYYON zL-iNPE5GuPNXBH|HL_s8s9Z%NUS1fDL_xdALF~y21|zI#5=XnJ)LtW~LoDztZFY^A zEK;7;o_L?tmDsJ`=bMV=rEb_)`hmA%L&`fyB2U#yl%r*P$C4orC}pfn^VOH2~)N30a3w|Q?f*=2zU;OL5Cnc3Vyg`T(b zN$-axLd#b=WDGj<7CMGvOsBvTnJ0WJAGfT33$MoPr{{DrksA?ZrJMo0;+^UKB9;H+ zL|Li__)j-i&`Q0f&V3Js!%r^FK@}CUY2%n>p0ln5DxwrFhYKWn84^-5{tSVkbX}kR zyY>?389(hp^e!=+&eWi1p+{yMZUlh{h*)%wcm;P`zZu6Tax$! zm+_N-2dfmf+$=c${xv4M!4eWEQeJ?Y^^Zf7J_u=l0ItK5kN9CgKu-dRuvF$=xPJB6 z3(mSf#S1AGhZbs=);Z9>Q4 zlk$7- zyqoZUcF}h;awWl+lMv8IMt{;w7TZg^*L)gz@|bofMRS0#X77D+jp!Osy$Tz>oe#I} z`R*vmM}+Z_zQR#!9s4}3H%HS-imixkWj4p-=?YToOXT2 zn&i}(f|n#lF6&Q}C$$(z|ALnBYxprr8^*{29^td634{a`;YI5`ZZiasfw4^@uTTLR HY)N-6X(h3F diff --git a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.keyfile old mode 100755 new mode 100644 index 85bfa61f..0d187ccf --- a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.keyfile +++ b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -j4IkjDmzOE_ZdHuN_cePYmySXrhmqM4WuGp86_RTiBlJ1TTvUaP_SOSZOqH0fxjk32gRvxJ01_iO -mLtbQ-wZKk-fwCK_o6xrXJcN0G_Y8VGK2OMeqypm98ji25CSMvTdFLaohdPJwiRNMdmwwyF5q1Od -pKviCISBlQ49ytwy3Mv0x7aV3kjkDWSgpx9TiMbWoAKlddcdQMUTEMh0CT0nLGv9uhwmRQ4I8UuE -IzvR1Rit9HayMlXFND6n0IWggYqtAeRV-8wDrI2rAXGOrfLF0RC5-c0Wd0N000BWXvsT_nCYBCM6 -ffA5eAKCJmOVjJFzQTRXJq7Zhwij0CtEPgqqaipKUQhHaft9xeKXW3SPhREIn75F2u2uCcU1sNmd -ytAk7yBPwdEcCQD-KVE9ZB3_57H0WIEr45SpU5ZePJkt2YV85H2Tlc_hGK18gTAcvGqDO3qELmV5 -SBHX5X_ZNL93mOkt37R0SGRdMZVIPJXNTgl4fGAsapvU7Y7sGMYrf2Ea0D-3hctk-aOKuuPEI1Ug -0lqKjghJdvHYRFbm4C_7H-ai7UcBuixBd54Mp-hyBX-gjnFZuMHazFX2toKNe9RgDXIavHzTfF-l -8fjdQpTplc2ECLINf-X6gs7w0zPYv04kLKixwlFff4ZocoxelGDEBlYYGNNxQBZvQtUX_dZetXF1 -VPNnwTB7Sp0fqaXR2aVaZNFSZYeL7VdxkiT0becNRa9QE9s2gU7oO_KTE8JyAiJyO-ojAvSUi-p_ -rq2Ivmab_L4t6GwMpv-EmRcntUQ_PM4s_XvJL2RmmSPWoNvbgCS0IilpYi2CPnEEgxqX37-Unx8m -tYoNkiN-j9rA3Hr4EjEhrbOLf2wAh6RUeULerBpLKnf0Ans6UhjT7XVDaNvzxtAE-GrUCKHQ0ml2 -P_vzDBlGKobaRo-WQzQA-mZKGo1W4Q-qwFdusUflgfJ7iTrvw62jn30f4xGZcaP5Oa-9JvdZJggW -1UvAM-85LdjGTxuI9KXbqRLWZk46B-UF7mDOce6dbRXjY48bZWIHEXcpzPQg6QA02cO10TN5K89V -qXeCnz03ePf0u6YhMAOt5xiUvJpd1y_WI0jh4SH2dT26SegcuRTVLnEG0aL6ClypObwj3FLB1Pek -UESqziiG4mQf_rzBAdPqcjbP8oeM2-mz09VYNyUOQ-7gk6bMAMWVqBx0uDxgIwUzr2UMbahB2Kg6 -9V7yE7obAKZa8x5oMiDGnvgjL9QeHwhUsNbwhhgqTDnB10vj4gh8RkNK8OsxQ53Nofj2PQZfY0GJ -a6It7DCmnAgQ9N51RvCeodmmK9Zh3n_zoxt8gA-eV8zbidXZYQwYWx6ai7ooP7yol2bE_TLDDY9l -_oYO_db73wSmqgTvoAdmrQGO4NI_g2iYN-Gd4XK4V_xgYPKyY5tHNSd4OKr_UuYiSioyNxE4IK1t -zWyJ3tUXAyeq_ZjUDjabsnGnxmgujShRfK-rBh_1AapY3Oh99-aehETtcXihUmFX4lohowniWTA3 -MF1MMlRM5N1phF7xFgkAaZJfkQ-inqgWYvQ9XuW0LfumN4QeO8KnfknukSSgZ86PYTrgJKDIOKWn -UYsxSoE_U02WxQThW8ayrFtKRLGR2x9bMaKzaON0tfltwyQO7ttsKlSyORIWVrGO48CyEDxpDs8U -RDvN_SgFq1gWarCKLL0HDUdLGMfimZP7sPfVEKkprMlDp_gpx7kD7SaB1m7xuNjhBd-6I3gqSR7g -lizTgKmuGalPRGorxX72vlTEYqLtgNWok6e9qjMGhEYCf02li6Ksoxp4ZejN_9S1-FGlcuq3SE9f -Pm0HckGtPJ8u3u2mmLpT1QzzS0RG3XJU5kNJvZcSEG0GOsU7OnWTXoZnleFJvEoQrOuQeZJLyuxn -mnmd49xrTirtxkLB83L8HQdAHvY5Phx8LbR9NJYvkH1MIEbBrrfUUx-x_llROOAYdPxvtpYcMkSt -ApZwRgyvaBiwUirWbnlpmf8QV1MYMlZeBbbqPZIC4eaqcxOSmZa8ox4aR3XQg9zjCxm_jXdE \ No newline at end of file +6-tNRI8kimOFIXwcTbENGrkJzim1NFAcA4iRrbWVSteGmgX0-RzgwYEy4wnNju7jlOUfRVKqJSYL +0qcHP1Z9AbX_K5zqJ2CATFO_0tlvNbocvoh6IecTlvL6V00hlVzP1JjCedUN0cO13TSnc4_NpWWj +nVZ9EaFQTmFL0NiYj-TPqRolhnQCIMDruBI6ImOIrnWxIcOEpH_6zmivzHhzRVbKVRNFEDq_F5J9 +fp2P3PXrYWU7rglKQtWcJpo3kMyC65zoPNVc-gMr4pfnpTTqzim5vVQyv-9w0QSwzvpKaydWPkm8 +E-kTotAQJ7r843U67U16-JTVb4n-7NummoNwshHo60BUb2xZd418VnIURD79QWt1zzOVFIs5f_LB +pebds0dtdL_cPGzuY23Z4SBWU2LTihziJDzYCIo-6PIL5-XeWqkwBrLRcy9-JffHYbaNVCf9g0Ml +cbnteUjuET-ea2-M-d1PwOIIr_ziU3UpMClQJ1GRZEuy4Aco9qJgMUqoJVJfEI_4CdLNVMTRwg1- +T81PoIf0nN_cje8pQlu3LX_B0oozdJd5yfGqsM021jsXPs0uJ5KuLPHP8NvY_uDqaqANXRUEG2ke +d57X6nF2CXcXXFKO0cf8-L35UrzbYgaZt5XsPP_sDl4WkKqJxKjREvrzjE4DXHfwrGqCMg7E767O +y9-uPF5SpfgUer8jtQcFlREAl050CwMzv90TBb2UqM3Ydi6qq80miKBqXVbKMgqdBs7qIVxXLm43 +TR-krMmMnimWBI6SVxEFREXnzHePItLazefHwZTqn7_0Tu_WPqZltLIKo_waKV57nrnH3EJtd7lu +GI5vIp46XQ6k-5LHOkfibKmImEKl19pFUvJehEjgVE6C3_2RnEmpG3T779_KJZKEy1sMqrud2QPX +2rZPnfEJEaEkYW8jibKwZtNQ0HpRarg1sc0p4mrl6dGGqLbdPBSsxLdAkm9gLRKkMPsS_gtfjjWZ +oPmUydEHu2fhUOjqsADpa76QSlPsun2-aL1CEiUAwzow9e68gxmnMQz02rc_cXElhskH2dDPod2w +h2c6PfVkji5rvk-nDFJQ0MwMbpl1ctSI4_gZU4j_OD6nSh4RbXgC4wwzfqAGe_A-9UNq2bkmC1BA +CDzjZXZRtZTCjgyaAH9yt6bsGTNxCfqD_OiRv7rQrO0yy-o4kGTidlW9Xwk_THgVn9-hF76JiDc- +bw9DxTzJwQxHxrg7JNicFbpXP071rdaXRrXWxUQ7X7ZRWrZuCJ87qhOqfd3iE2VylI3vwEaqrDGD +AULLczDd50X594-_pN8bCW_Nya5vjvRWNZmv1Uh0_YtbmotCj4Fz9vlTs5bIbfnyUp5sCk7jZZrv +RGGFTU3mwa7jq-0uzY-jYdosDyU2PXMI0WZsSiSF08g_K7y0nnoSEa9kPtOWPTcotEXsTeZ5cgpj +Bufi_U1SoW-kKG5-eyNDbputpvEFy00zrcSj3U8A6m2YkCxRQ7m_s9wnISiwVdVKuSCQ08MvyOrs +10a3HHPB7T1BDA6sPVpDrGBjq7piVDQZvEgA9CGIrcyHrRR8_96DGKbMboUaY9vNG2NBJc7zcBRw +AHs6cc-LKxB1mMUPNJZHxDNQOCk_nnbzGSG2AWppZHEmTpmB0tg0ZM03aqDrGgOK07xREZSZaAMY +TmVNJSgEIOA2mEDoP2qOHdT5eQmn7xK34HSWJBKR6l1N30K626oomF70DVgqRSqkSZ0rhDBZzNzy +VlZ4hG_ZZCJOcm_AUShWOsS6JJ11s23uJKkZQeaTZCWc0KVqhtWbKTE8CVyRzm1XcyRONdJVnvXN +P4ANxGMzsaRZDC31gJYbSirZoTobLQ5OZxgNaNY9cBsEuK6r3sznPORG98d9y33x4Xa5HUedrHju +HxAAADMCZwK0ITdWPPsk9lsag-tNor16nfLXj20y2JdLaZfx2PnluQjCitwskuZhTcWmHRZ0Ry7t +ZxfxCSh5IOnAowFu1G2t0RiooKh4v26wOLTCzFiV0ZSmw1VSflkabxsIY9K2rh4-24QwQaAt \ No newline at end of file diff --git a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks old mode 100755 new mode 100644 index db9eae39e33c1475a4e210e4cc91af60007c92d8..808c1b92945bb1394787a2506ce70c11ab184cfd GIT binary patch delta 36 ucmV+<0NekC3xx}iAOzSppHi_TO$8K@O;exsiq?2Ht&~>e$hYbRpS&FjVGu+B delta 36 scmZqWZsne!z#{rID|DlZFRRFnnV;CtZEQE6s1_01bYX_%;*N|60Q?6I$^ZZW diff --git a/datarouter-docker-compose/src/main/resources/node_data/node.properties b/datarouter-docker-compose/src/main/resources/node_data/node.properties index 62b0f824..c692b906 100644 --- a/datarouter-docker-compose/src/main/resources/node_data/node.properties +++ b/datarouter-docker-compose/src/main/resources/node_data/node.properties @@ -63,10 +63,10 @@ KeyStoreType = jks KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks # # The password for the https keystore -KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL +KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8 # # The password for the private key in the https keystore -KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL +KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8 # # The type of truststore for https TrustStoreType = jks @@ -75,7 +75,7 @@ TrustStoreType = jks TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks # # The password for the https truststore -TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g +TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1& # # The path to the file used to trigger an orderly shutdown QuiesceFile = etc/SHUTDOWN diff --git a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks old mode 100755 new mode 100644 index 509004c5e24e7d7944d2bf5602a17f03fc46da52..17027970e4560d4ab6fe9c59439eb2aa7bbd9831 GIT binary patch delta 1921 zcmV-{2Y&dy9KRfpH4NBI+#vt}1p+XF1pbjh6MyO&Lns{%KlSo7IZ58_FJT^5q-*=E zzmm`V-732%9iMxm(&FU$--@LeoeiGCtouXRI?zPV+zm}heX+^A6Gc|IJ~cG=3E#zn zhH;i|B`8D}QWnb~^xht=6x>D2@{BrsVdwQcwMx?^e5yJVt;*dcZ^0n&Mi~=bXRc_f> z@rWM)j+JwJr4U2sL8qldIAl?Wu)j(gnxjgmf3rqlGMkc(P#(>qi*xkXKGJVCP?0US zeTG5f!zyo)D*7@5*ZL5fxdX^GHQeMp4X3%8d5G*nB61S%CbegOFIkH9w4+KK-+xlf zHo$0GqbC6tS-FibD{IXkRMUkc*tDMJeOs=1oC)&UmW+p`J4SvOLnMKL=4+Wr(af8D z!``e3kYar8T8rB$UB)Et%x6R9r_^6*C#6_^yf_YHzVIY5?UZ}4J;j5hD9C}R_^BFn z_|T{Qu1pdB`b)Msc=2ChW~_k^wB4y}JW(KIAd$m|5I&DcoC8!#AcqQ#HfO_d%E%lp(f@op zLtNPdNfDXip|(7=VqSOSTD!P40Hfva=&oN)MtUuEh5$&(^!A6ul^+!vfqxn)>0=hX z1Z`VMuVr`iR+yEE7Vu+K6KP4@zuBcv< zOB?OYddgEM6Ws&E=If=3>Ef z!4Bc|U|TD4ul+Q!g-7by_pM=7Sk*ULshwm?=kIfo40Eia=)IKIft_VxGtS0d$@^6+ z=K|qPOJA86%%C!M;n651TP}J0LthwJSA3LNTg#!Pm6jX>mJUyztbaR(Y8&Sjo7vhr zlUE+{82Euh0w}kMpQ0;8TQxF!T53l=J&L0Zp@@40vSN{lJ*J1m29KnoMq#X{rJK=F z+Z;Qkqe`jwHiDz2>K@YA%)fa)#WI(aWE{$yvqcP$EZlDQ?uj56R*IEgR#Sku{9lT zk{0i7f806D?+PNwfSF(PR4Fv=J8lTmcX3cxLE=QSb`MvAyMMaTYS@+36V6;hV*J1G z6No#@dIE=Fi<(G#L!wi}pB30=}|5A0<&Sp;4Un*4O|5 z00IC7SS~d%Ig>~Q69`$4xsnI}P>7Rb1z#96FflMWG&wUgS{Ds6FfcSQF)%qaIWshq z+6AM3wbo}driV+{C9;=n-DruS5RLfh4vZ{yykqbf2nh^?U%mvc)~@OD(P`_kZp$X| zTyw4r=w>E1=?Saf^>U>6tB^xfhe|`gFYJV4iD;Cj5a!k#fZvs^75`!=y>UmK+guRe z=SQNt*z?N1MAd~@-+FlHR2%wq{hzbpv>xDp!o#6WpIBQB)fP*Ee>&~#xpp{gLmIHn zV)Qni7WXM`cp;hKy~4qI3)?31N`qlV(ejP|u7RE+D5TXF)!G%H>)BhgVDR>9!Z{Pt z(9k_q2(^$u#{}^v{r`OSn zaJf}=VD}IX@0&0pYFQ}IW^yeC4MN)q7FPT_2BQd?2#hZb>1a60tV(60`@*U9l0+=< zEa@5^O!|h_T&|S{cN^O>8nu5DN%(0 z6^s#o4Fz>QoIcMLpX7uvFSi;PRZw6(%Q=!iuybMYfxsax0H_#CfRdR{c ziQ`PMDZspl?hI0ZyW{EShN}jH!sn}=+*R#NQYVg}dmB{2vD;U_D?1u$mu_Nbv9Twm z#tb@$HZXuC_Lz_e5@U#ulV*&4BOa6EWeL&({CKma34{a`%P-MTM#!Va)1rgp6G+C5 Hl#prx8*#1b delta 1921 zcmV-{2Y&d!9K9TnH4GK$`zQba1pqLD1pJXf6MyJ0n-(dmxuwm#8Hv_6Yxx3SutKd3 zspvwcG>{$x@Y67qMLo9aD%RS$V{M(+d3xF`Ui1;6oW-~Ai0O67@yEYV+)J8k(NcM9 zIJm!gtnC1WWiYU%yNpv|;M?=Cy+ml8YMgmC2W;u+GOygW#BE z9e)d%1ru^#Q$+BeW&sup_p9xyCZ*#of;NK7F}=AI5QL$aXB;CSCr?L7$Lg()8uM15 zyT`g&%hBNe$o`XE;DwU8=-RX~9CE$tW`Ui_jZl8_>?A7(RtWn*O$QEhC{I4b$KzGB z;740|Q7g&^Z<0^a(ocs0FhDv(OtUGdN`G1b?!l6J#cuz?QIy$qT9xv`JOX6GBe9_9`6G2L@JT`GR2zlDJTA&H zVdT`|u`319Om?JFN-@=>kxWq?usi?UZe5x9RAE6KZwY+XvdF?OjnuYb6z zMJFg+ogp{^wN$Ovvnk<2ll%lUQzi#L4jJcUERy6+F`xT9wO4wh+_O{qZwLX-7gG-^ zhKzw{d8Gr0{Pazc(jk6(yHmBkPa0bq$FFg7;`eFdW&r+TVa^KH8YFelp{+9gkj?@Y zguR^)w2I?YRQI;Z(!7>(lby--9buK1h%=0b=e(i+^d1F#`W+ z$%59vj5&|c$mw$+R>Ljzf5wzKbKYV0cD5;2$0v10xXgH|+Y$|$fbhF09%?Goz^0h8 z+^d?+wJx}2fIO#Ah#LL<X>MrIXba%VSa_#GmXxg4G zOVkX3AWR29it&BcQTM7lJ%6E<%--T!^S6Dxap9q$Hx$;Vate^LUV%%O@f5c-M*{}I zEpfnYI{zuvkh<`S@A04K6b7shtjqTtk~!R`h40qo!%=U0WKZKvb6mfXSwce6HQC@C zrEMhS#svRNFoqJXP!F0OKHbL&LUt`3-X%ns66|nDtzELVfD1q3CVxA6GM1hIz!35A zVL$K|k{3+s-_7(;E)rPteb0I1>YS(_$mQT~4b~ctY`V|5v3sJ+tZ@7R4B)+9*y4IU zeQ*-~o_HAT-Q4Tg8Oc}7+O`jChHsIq)aTXTLU9STe9)X4{V0SB->?1J%k3KU3fZ^d zf>=~iZnuxX>9MWm|9@#%t3!NO<|kkq1;`K>K2Kz5M}h#^ImsnK#+ zZHq6_79dz{Q}yf)gT=P1F2{MvMP)O=h+dgl4P={krd~YlZ<`yLfYk~K*rlv0Ol7c> zg4LatXSWsLv0pSx*P<_szmIeP`X};Ltxpvb(ra1b=UnegH-8qLsf8aXS3tkg|?tms5Tb&aGC|pr1Zm-;z|x05q-Xsl_p{M#kjGq*wv3BJHEv_k zqP&WRI9xuRgvf4YZOlBPA6h>G`}wUci!pjIroRW7)_aHUDj9~7>p<*R%k{ZJRn1-a zd!`~$ZMI!oz68^m+O%{idGU@f^wvVCI|9LfIDd?fXapx#H*I+Ew7lXa9@I;Hwc+n2 zq=F!d;5vK<*zm}cgEI71Noj=Jvjb7SvxtY7vG>*ms z%)yg?2dfmLcNnA4F|~CUVPdqlA+!1!UG zyNXQc4x|dk@;XVlU+rjV!`(v>vZvy-D{~e#c(cvo5>qUbfnU1}gyYxMz@s?`B^gG( zz2wnuzusFm5>1MO134{a``vV@zoB)J069H~I<>QQb Hv6^stq+zjw diff --git a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.keyfile old mode 100755 new mode 100644 index a586a72e..59f161f9 --- a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.keyfile +++ b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -VDu7g5rP2-JMemc6RwP0HqM4ILJnuja8R_bzdCG1u0_Z2EQJN_7ZNPDb28V6JCDF-59sX10_i9vT --nw77ViAuwJO7ffSut8ipVhESeQxTokZsErzMFpeJZDhMM16W5LLtxwUs_tgh_EQIJSc-WcFUNYS -NagugzjmNE5-hUosLgnt7mZ1nX4zFER9Nq1ce0EQS--kAB9rxcRmoywPlBlHvPmP_caiwpa1SzJp -gbFF6smyLEWhjDhJkgvM_4FwaQCbJBVGcy2a3Lc9orHsz9S1RJTZ9CExhasM0qEp3kk0fMEFE9k6 -TomOpUBGizLfHPpg18KtXyM8zErj8qdS0KMwaCKtwGzCWw08MF5rVZrMYWLKDMOs8U2ESU7x28nV -KSrAsR11QD7vX4PTVTfjEpcHSGe-9nPD7TckY8_O-9l67v_OUW1Fw4MSESCN0RtT7ZlNYwDV0syA -X94rv1Y45N41tfX76jz8PDB9G-PF36BtkICJWK24zwuQDgpkURhCLPYzvBhPmCPyQil810X9s_bX -icmV2cSN3oYQRz5dNSjUYH1CDt9edAJt4p2PQhM3A2xXyw1FVvbAIYA7iF-3qYG9csroBzsCcS5C -hX8929jZHQWU5pygtpedEWhX__tnSrd-xIpxPnhOxrb-lNLva5JGKauU2DrGoLd_7RTwbuRdCiQo -uGFtYOtjLciPz81oEEpXQTReeSnvGyGiZNxRrKWMEmq-biyQd4DuRVmTDuLAG4rd92QWS6qUz0uf -9TtJiYlN3mNkxz3ahEGWLKR79rH9juJ3xqpcF-Rb7Y1bmiCDBv3DVVFiYIpwQuto1iSIYabL34Ql -QqX65E1c3uvPksN6Nl1nvAVxSKM94wAFsMiA9Rp8AN9pDSxtj7D3kZCG8I0YaIxF_s-OeJtr1RPx -ifv8vrwN23GUQCmpGBbyNXNe6zz-hz_HJdAsBr6WjLny9LQkeYszHGF-OL5ps6K5gHBRV0Ui1C7H -Gj7egsjnV_Lu5MpBxhTrquDrZKK3t38kf0zrV-zfSGzJlGbLS91h8bR-7FAZiNEzgXPWYi26w81i -W3Csx4oqsfKswp0pO80rggkFf9LL9pjCkSUTTVyF-toa9kY2h7JsVtqntP4Mjagp4Tnj01988kne -Mj8SLm2mJySTLdH5Hi4arKW943iCqYjEaZ7wXFNJSZ6vvBm3KC1XX6C0DjRrgQoKIHw_4JcGhvOU -P5LdpBT1AOcE8lIKrGGq8hyfJKLVUMec-NkzAT2aIl0YJoUcJv4fs-lKccGL4FDrq5y_yvD3xQ6v -xt7KTanFxntqLYmM72Y2eFwJGlDEHhm0SejAV64-odksA_zMLLuYwkq_KSj0If9AVpRXz7KzIj9P -9y-WMfAWKFfIyqGWXt5sYdMTQPG4qKCcFQBx3T0E6kiQMBuOZz0dR032eFPMexrymEowjosr2jt3 -ib8rFxmPMyyUWoV1iBafFMLf5PN2oapTq76gqeQQGGwpmYJB8cWlS1Eq_ZbzZpK2PSwX-fC6NSf3 -KtOV_r2VI3e_V6csnWTY8nxCJj9FlQCvLOzp964DNsBeUwDpsD7T_pgQy0THgAnq32ZtDvQfgeUE -TUJC7oQeOEY7QBWjbZkumds51j7oTlsp2dPForlHwBk_2Nd5VCwVRNa1QMS8WcghLYbUCX5zeplc -u2bopHn9GD614gt7f7wysDgTGegOCAuMoL7wA9TXN4BSfAF9mwpdtRFE4lT3N1xmfhKt9rM6Lu8T -RGvBOmTOTT5IwJrrE5mpvmESw05sHUcCZ9ENv-VhoeC3Ffk9uXqrDggQgaDs9XcXqzEPBp9wDPTt -UJpbtBGECSSTuXAZyUh3I0WFz96kVuHmQpDYVTpy1sxPjmgjgKyhu_6jLGSsYpVBH063n7KSKVdF -ROKojZN4-FsBlPhoOhNEd7x1OBfgCG79HKGk33jhESObZkPIrcTc17jiE-ud2D1B1_Fl-OJNR7Vh -GIk4WMZrH9NeVwDuIgBxF74plqg6tSl0Cdd4m7e3Drsq-wRfsU2gNTo5oL-2SgbsO5n3ubQf \ No newline at end of file +XzAbZ4lSt3j0vgqonk1lGgt_2IvBzet-MDbt7nlxdj5vrQbUBET9eqIfjRBMlen0E815nYm6nRBi +RR2fUKzqO8JIn2s19e3fmYrp9wTbIkY9GXOzsnuSeyRxVxxW-82VrAD-gSBmqUEJvPjqjVWinadL +LVy1h9lE35EErQkBpK_GmqVp2RajjXv8N_5LcKkkc4vYJQ8WclOHwN_BnQpNS1NLBWJVXSPeVwjM +zIkQ10Q6GGEGCurBPLef9UiXD73oVnQsVyZY3E87X7RbDfCiVbfmHN1hyVkR3DX6gDfrfjTnqkqE +Hv7kw43qXx9-aRCHrqnmaGYBTscU5JgxTNpqe5hvxLJHnDwLTtHDx-vES0PljekcofQVT5pWJvRK +ltZtPQwuGlapONa_rDuMq3sSDx8gXKE01rjK0bNDurIPvFzyef0RoDYIc3m4M-KdsBMlnE7oyBAz +OXCPt42HLJX55F9boRIWwSy-8o3AsPXwQTwEKoD7ZUL4pZ2Zf45npfQLlhhs5x_ERcPTrOXrF7Uu +40HxQnMbwO_Ofz7CrlKe78UImSJbsQp0heyBbr6irHrMq6_E1DqbjWafs_a4kKNbtfN4fHHvxkA0 +9J_plrqVOoBqFaeUc9MJt_6WBYq2vDFbHSvBf9QZKnaVZ3aKU2MzV2Y5xjw7V6rgDQHwmXXeAmfV +-Z3JT5ocQhyG4SqyKhSrzh4nGOMt51yy68hPPHMrYnpW8VF99qTLqSmQfLAeNqog413Efj75oQDW +JLw1BR56ABvCPdcR5wZruo2Egwak1UyiRL0Mjd8txrjc4uojiiqddqalEQrORvn4BgP0OKQOOdUx +dArQ4HqjBGwvurQUM0XjBvyqki1h1pxhSNeuyOY3mofVB2NNi-ZvSHHUpwqIgQ4kVLombpsKw2W9 +AW-3h4cLYl3LgP_LRH5mS8Mo_BEKZqivM9v9YYVZCgB2Djqyn3MQXpcFSxaB1AK9wG4TmMneFP7W +_dHqJnx26njAtff1y2ud8cmW_UGgzMb33QGIjIrYo3AVX8_G8iEQ-838fDpGE7BdqLSam-BMoeo3 +WPht7-O8gx7utuYx1ceCetunKRmh3Tfga_0srBNDWMyzuiPvbLX3oUJO_F5p5734Qwm5CeqCAaJv +sU_yfzTgUPqS6jC9cuKi54h3HrzV-k7DcSdGrpsAgzYZdHwi7XFfAzFOhkpBeNUNzDCX8B7yTHjU +dKdGDezdgs7lMWbJwnSNFDyTwbZdk4XTnSrtdhmOZp4oVizEQgha0Un0ISKQ519kajTFj1rZV6ue +h8SzN4QXOw6BHYB5rsy8YEvWbkfyneQ74HeyeWRRq3p4UdBTTUn2JbGM0neErRrxnYvmKIdFlSsU +NlEgNf7dh_kqdWUBkXfud32ftazttjmiO4zkqBupsJTlxj9Tjam9aZqNhunPNI9znf4luKAiRa3v +26giSwRUX8mjlK5FvBNUbLeFM-G3Pk2jQej13q1lZ3PZMesLjUwvvMIdlu9qmDx_TCYSy72-6O2A +qmPlUeYCKgI8eVaZV79aM6YtomaopHiPCcyJGWl114Ke4j8H3-Lg3EkjfVROwQw_fKn2z4Eci7io +LetFQnibRw2ow-Z0F-Db3kuEuRTgmb6U0pMUO3njou6Sq7oa_gaND0XYHy6MKGu1uJ9aKVLZ9uy4 +m9KRxZvq71LRJkD84y9bMv14lxzUsosuzbXV7Q_uz8kceWSq_1BLXQXam9j5rxN6SKEk_Rn0jgnX +h4A4e7q6loMXUq4nPSVII9K6pHAqfi1sDLhVZ239XcLBwKY9R5f0jgYy76AI1dN-_oEMdXJf_L6w +KuRJ4jy0XSfyV_QvS6at77san2UIOkdY_tuI03Ps3fTzSaztsy5yX22t-6TnkFSoYxGkuMw9R-Rn +ZwJIanS3v_wQbgNdUB6JIlE_9kkHYCokheldHkKndV8eEc6Z6bgasNWKB3PreI1m6UrfZI3agd-n +zhsQppGFk8j7Tkq4S_9SP1OFVCgCT3-mU0UhPhDhCFPM1bladfj8RptCbPKO66evW1c_ooU2 \ No newline at end of file diff --git a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks old mode 100755 new mode 100644 index 987706d5620e07178e235648cd8efa3fc797368f..2fe06cd216fb21c2882dde477f0c1fc327beefc3 GIT binary patch delta 36 ucmV+<0NekC3xx}iAOzS=+@G-|O$8KpxFpY7??=M%=IIyJ*EtR}yWj~PR}jVk delta 36 scmZqWZsne!z#{tckNHLwUsjRT8=f<7UoyS5!1h6Io|uNG)i?f900pKFpa1{> diff --git a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties index 21b9bc49..46a1f55a 100755 --- a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties +++ b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties @@ -28,11 +28,11 @@ org.onap.dmaap.datarouter.provserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true org.onap.dmaap.datarouter.provserver.keystore.type = jks -org.onap.dmaap.datarouter.provserver.keymanager.password = AT{];bvaDiytVD&oWhMZj0N5 +org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5 +org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -org.onap.dmaap.datarouter.provserver.truststore.password = ljlS@Y}0]{UO(TnwvEWkgJ%] +org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks index 4bbd3580195608f99c8e3367407d4586b15f6522..2320dc9fe6b64cfcf7e3a9476ef868ed6198f059 100644 GIT binary patch delta 1921 zcmV-{2Y&dy9KRfpH4NA`p49*V1p+XF1pbjh6MyPB0Rue? z)_*=fOZ(@W!)4Z`V-RC9a3O3$8uA7K*IZ}-+Ctsn8;ZFDZjlrVnsw=-U zK00j;{m|9KGEcnDJKs-po=1;=Zxa!2xQA^Hnw&(lChi_VGk74Q%o4gwRDIQwDqeR zFL~*f@FnszN#NQoyJ@5i6tzJf#V>-OyVeVg?CPP2k?5YS)xQW1bgcmO0&C2xPO;f zJ+Zzql@r_Gsii2V8cm-|a{Q^Y8HmORQ@syqgpbJCH%M7#@qgO|lD)M?m6VH{%lLsD%k1zFu_wu z674**rRZ@^^QZB0q?qa z#J->~rUCqqzMFr-l{%Uj3VhsKtJ-V&@X2utn|3u;vaq ztXSvo#Q?+7F(8ldqJxcQ;eXD!6e`i$TW8Qk#~mm#v!3q(^CZ5*D!2TVYTPzyT{Bw~ z7x(8ehpc#17l|C(V#PgFQ!V8L5|j0yASsot8X4fCX5NLfHy7Fq|69c8hyyFt@Ka{R zBf%yb#9@@&KF6khf!9)frtp#{--Wj@w8Pbvx|)Y*8-0!5j{*9md4Cp}x30|3ch8l_ z2W21D1R2ALn$I97IeIBC*7w>RMQ8_fG-W5%oYbTaZv}v~wUyHBzNlrBQH%fQJ1bIq|mW?BN@E zr^Gv3*fbKHXM(;}got_K&wLfg`I?HElbeUs3s>s3z+*aM5Pw?;>#$90k{&T9cBfxh zb&IoK`d(B(_SsJ?%jc&kK_m7+Vxsvi8~Q69`$4xsnI}P=}La1z#96FflMWGBhzUS{Ds6FfcSQF)%qYG%+!g z+6AM3qgnC^?Tc7}-;m)Q-f}|NLlDplr1{YT=73p}{n4{7_6m{fd%n4r(F=Uq{GkNv zmU|8uRR?ZEmb(@ti=gERK-r8ssmRn?ABhj%sAi^c%3(Mqr+k4`Z1||Z*jY9p4roR%5n>62T}M%9Xcye_lX4I(3a<46pEDRI&(PN}&H%!z9@6=>{Dez}FI$&CjB#J97h34{a`35upXKiaBzS%P9k;*hpa HMzWcisAjEu delta 1921 zcmV-{2Y&d!9K9TnH4GKyX*mD@1pqLD1pJXf6MyLU1i`tWjGLwChmQTtXpMnHga1)J zkjnSp4Vy{nIm4diW2yEUPbXzr4fvO@!e%+YEncf;4jpnS!`;=|aI0>X-bCbeKvxD0=djPatZE`2Ug`8)Vy#%*iq{KT-Al2p#W1IQfDJ^@vwJk5RfsF*L0Dtb zFMouKsh1qtamgFI&1SIU6>ahXm{*gkQ9b02&J(xPoYgqsNXhMG06ZHc9FPnrf)Ro& z0zdV13<43QZIb?OS_Gf=yH-%n`9y*Snjp!}WJZ-1i}Tj?-xd^V9jxG=NL+?NI|f3r zl&L_J1aZrLw3S@)VFN16{(r+z z8$B@t0!*GTTnY_^!OuG;zw6`YbE-VoTBHE01q7yX^UGX!GnJz3+->kWXJgcMqqo9f z1X8cXB;*zST>YR<6>2E^n<=!bfw@hes1A@gLw$uksOdlD7}F$!;bQG8Gte)FfN9=npfv*4D&4i{q_~G~iCB%|FmJWiXa-i4InN zyekXw4E!W8urt?Cnbl!NJr#>XBZh7>mk2;#VF+RJ-O)DIB0E&Ycwv$D1rSQeli^Z= zx=J^**@n)T(oK+XS|!y3n4_k*zy3NO}|HGD5n6q+rJnkCZJ3Q#S*f{{|UU80GXIz8qPB@*_jjp z0NMBKBW^4C?v|d8CQ#=tLtPPAyatwD#ds_{>cqb-TAj0uP5|NM+UO4UbFpn7#$RF?F#>lvJ z4mM)e^{Qx%6|rt$*&}j9)Dr`F>9+S%RP<552hSKm8sa3u8@TW7MEwpEkY~)1#2mR@nIQc znpjs$E4>H|e$dBmJkYOKe!juDj^gGukhB_~`pmU5(&cOKn9Y6S^xX5H24wF}Jfj}Y z8LB!YCS>!8Y%TZh#~J}Ip;bWR{5a1+0kudY{n-=ynXQ*81%JHbFEpET?H0G|eYYON zL-iNPE5GuPNXBH|HL_s8s9Z%NUS1fDL_xdALF~y21|zI#5=XnJ)LtW~LoDztZFY^A zEK;7;o_L?tmDsJ`=bMV=rEb_)`hmA%L&`fyB2U#yl%r*P$C4orC}pfn^VOH2~)N30a3w|Q?f*=2zU;OL5Cnc3Vyg`T(b zN$-axLd#b=WDGj<7CMGvOsBvTnJ0WJAGfT33$MoPr{{DrksA?ZrJMo0;+^UKB9;H+ zL|Li__)j-i&`Q0f&V3Js!%r^FK@}CUY2%n>p0ln5DxwrFhYKWn84^-5{tSVkbX}kR zyY>?389(hp^e!=+&eWi1p+{yMZUlh{h*)%wcm;P`zZu6Tax$! zm+_N-2dfmf+$=c${xv4M!4eWEQeJ?Y^^Zf7J_u=l0ItK5kN9CgKu-dRuvF$=xPJB6 z3(mSf#S1AGhZbs=);Z9>Q4 zlk$7- zyqoZUcF}h;awWl+lMv8IMt{;w7TZg^*L)gz@|bofMRS0#X77D+jp!Osy$Tz>oe#I} z`R*vmM}+Z_zQR#!9s4}3H%HS-imixkWj4p-=?YToOXT2 zn&i}(f|n#lF6&Q}C$$(z|ALnBYxprr8^*{29^td634{a`;YI5`ZZiasfw4^@uTTLR HY)N-6X(h3F diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile old mode 100755 new mode 100644 index 85bfa61f..0d187ccf --- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile +++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -j4IkjDmzOE_ZdHuN_cePYmySXrhmqM4WuGp86_RTiBlJ1TTvUaP_SOSZOqH0fxjk32gRvxJ01_iO -mLtbQ-wZKk-fwCK_o6xrXJcN0G_Y8VGK2OMeqypm98ji25CSMvTdFLaohdPJwiRNMdmwwyF5q1Od -pKviCISBlQ49ytwy3Mv0x7aV3kjkDWSgpx9TiMbWoAKlddcdQMUTEMh0CT0nLGv9uhwmRQ4I8UuE -IzvR1Rit9HayMlXFND6n0IWggYqtAeRV-8wDrI2rAXGOrfLF0RC5-c0Wd0N000BWXvsT_nCYBCM6 -ffA5eAKCJmOVjJFzQTRXJq7Zhwij0CtEPgqqaipKUQhHaft9xeKXW3SPhREIn75F2u2uCcU1sNmd -ytAk7yBPwdEcCQD-KVE9ZB3_57H0WIEr45SpU5ZePJkt2YV85H2Tlc_hGK18gTAcvGqDO3qELmV5 -SBHX5X_ZNL93mOkt37R0SGRdMZVIPJXNTgl4fGAsapvU7Y7sGMYrf2Ea0D-3hctk-aOKuuPEI1Ug -0lqKjghJdvHYRFbm4C_7H-ai7UcBuixBd54Mp-hyBX-gjnFZuMHazFX2toKNe9RgDXIavHzTfF-l -8fjdQpTplc2ECLINf-X6gs7w0zPYv04kLKixwlFff4ZocoxelGDEBlYYGNNxQBZvQtUX_dZetXF1 -VPNnwTB7Sp0fqaXR2aVaZNFSZYeL7VdxkiT0becNRa9QE9s2gU7oO_KTE8JyAiJyO-ojAvSUi-p_ -rq2Ivmab_L4t6GwMpv-EmRcntUQ_PM4s_XvJL2RmmSPWoNvbgCS0IilpYi2CPnEEgxqX37-Unx8m -tYoNkiN-j9rA3Hr4EjEhrbOLf2wAh6RUeULerBpLKnf0Ans6UhjT7XVDaNvzxtAE-GrUCKHQ0ml2 -P_vzDBlGKobaRo-WQzQA-mZKGo1W4Q-qwFdusUflgfJ7iTrvw62jn30f4xGZcaP5Oa-9JvdZJggW -1UvAM-85LdjGTxuI9KXbqRLWZk46B-UF7mDOce6dbRXjY48bZWIHEXcpzPQg6QA02cO10TN5K89V -qXeCnz03ePf0u6YhMAOt5xiUvJpd1y_WI0jh4SH2dT26SegcuRTVLnEG0aL6ClypObwj3FLB1Pek -UESqziiG4mQf_rzBAdPqcjbP8oeM2-mz09VYNyUOQ-7gk6bMAMWVqBx0uDxgIwUzr2UMbahB2Kg6 -9V7yE7obAKZa8x5oMiDGnvgjL9QeHwhUsNbwhhgqTDnB10vj4gh8RkNK8OsxQ53Nofj2PQZfY0GJ -a6It7DCmnAgQ9N51RvCeodmmK9Zh3n_zoxt8gA-eV8zbidXZYQwYWx6ai7ooP7yol2bE_TLDDY9l -_oYO_db73wSmqgTvoAdmrQGO4NI_g2iYN-Gd4XK4V_xgYPKyY5tHNSd4OKr_UuYiSioyNxE4IK1t -zWyJ3tUXAyeq_ZjUDjabsnGnxmgujShRfK-rBh_1AapY3Oh99-aehETtcXihUmFX4lohowniWTA3 -MF1MMlRM5N1phF7xFgkAaZJfkQ-inqgWYvQ9XuW0LfumN4QeO8KnfknukSSgZ86PYTrgJKDIOKWn -UYsxSoE_U02WxQThW8ayrFtKRLGR2x9bMaKzaON0tfltwyQO7ttsKlSyORIWVrGO48CyEDxpDs8U -RDvN_SgFq1gWarCKLL0HDUdLGMfimZP7sPfVEKkprMlDp_gpx7kD7SaB1m7xuNjhBd-6I3gqSR7g -lizTgKmuGalPRGorxX72vlTEYqLtgNWok6e9qjMGhEYCf02li6Ksoxp4ZejN_9S1-FGlcuq3SE9f -Pm0HckGtPJ8u3u2mmLpT1QzzS0RG3XJU5kNJvZcSEG0GOsU7OnWTXoZnleFJvEoQrOuQeZJLyuxn -mnmd49xrTirtxkLB83L8HQdAHvY5Phx8LbR9NJYvkH1MIEbBrrfUUx-x_llROOAYdPxvtpYcMkSt -ApZwRgyvaBiwUirWbnlpmf8QV1MYMlZeBbbqPZIC4eaqcxOSmZa8ox4aR3XQg9zjCxm_jXdE \ No newline at end of file +6-tNRI8kimOFIXwcTbENGrkJzim1NFAcA4iRrbWVSteGmgX0-RzgwYEy4wnNju7jlOUfRVKqJSYL +0qcHP1Z9AbX_K5zqJ2CATFO_0tlvNbocvoh6IecTlvL6V00hlVzP1JjCedUN0cO13TSnc4_NpWWj +nVZ9EaFQTmFL0NiYj-TPqRolhnQCIMDruBI6ImOIrnWxIcOEpH_6zmivzHhzRVbKVRNFEDq_F5J9 +fp2P3PXrYWU7rglKQtWcJpo3kMyC65zoPNVc-gMr4pfnpTTqzim5vVQyv-9w0QSwzvpKaydWPkm8 +E-kTotAQJ7r843U67U16-JTVb4n-7NummoNwshHo60BUb2xZd418VnIURD79QWt1zzOVFIs5f_LB +pebds0dtdL_cPGzuY23Z4SBWU2LTihziJDzYCIo-6PIL5-XeWqkwBrLRcy9-JffHYbaNVCf9g0Ml +cbnteUjuET-ea2-M-d1PwOIIr_ziU3UpMClQJ1GRZEuy4Aco9qJgMUqoJVJfEI_4CdLNVMTRwg1- +T81PoIf0nN_cje8pQlu3LX_B0oozdJd5yfGqsM021jsXPs0uJ5KuLPHP8NvY_uDqaqANXRUEG2ke +d57X6nF2CXcXXFKO0cf8-L35UrzbYgaZt5XsPP_sDl4WkKqJxKjREvrzjE4DXHfwrGqCMg7E767O +y9-uPF5SpfgUer8jtQcFlREAl050CwMzv90TBb2UqM3Ydi6qq80miKBqXVbKMgqdBs7qIVxXLm43 +TR-krMmMnimWBI6SVxEFREXnzHePItLazefHwZTqn7_0Tu_WPqZltLIKo_waKV57nrnH3EJtd7lu +GI5vIp46XQ6k-5LHOkfibKmImEKl19pFUvJehEjgVE6C3_2RnEmpG3T779_KJZKEy1sMqrud2QPX +2rZPnfEJEaEkYW8jibKwZtNQ0HpRarg1sc0p4mrl6dGGqLbdPBSsxLdAkm9gLRKkMPsS_gtfjjWZ +oPmUydEHu2fhUOjqsADpa76QSlPsun2-aL1CEiUAwzow9e68gxmnMQz02rc_cXElhskH2dDPod2w +h2c6PfVkji5rvk-nDFJQ0MwMbpl1ctSI4_gZU4j_OD6nSh4RbXgC4wwzfqAGe_A-9UNq2bkmC1BA +CDzjZXZRtZTCjgyaAH9yt6bsGTNxCfqD_OiRv7rQrO0yy-o4kGTidlW9Xwk_THgVn9-hF76JiDc- +bw9DxTzJwQxHxrg7JNicFbpXP071rdaXRrXWxUQ7X7ZRWrZuCJ87qhOqfd3iE2VylI3vwEaqrDGD +AULLczDd50X594-_pN8bCW_Nya5vjvRWNZmv1Uh0_YtbmotCj4Fz9vlTs5bIbfnyUp5sCk7jZZrv +RGGFTU3mwa7jq-0uzY-jYdosDyU2PXMI0WZsSiSF08g_K7y0nnoSEa9kPtOWPTcotEXsTeZ5cgpj +Bufi_U1SoW-kKG5-eyNDbputpvEFy00zrcSj3U8A6m2YkCxRQ7m_s9wnISiwVdVKuSCQ08MvyOrs +10a3HHPB7T1BDA6sPVpDrGBjq7piVDQZvEgA9CGIrcyHrRR8_96DGKbMboUaY9vNG2NBJc7zcBRw +AHs6cc-LKxB1mMUPNJZHxDNQOCk_nnbzGSG2AWppZHEmTpmB0tg0ZM03aqDrGgOK07xREZSZaAMY +TmVNJSgEIOA2mEDoP2qOHdT5eQmn7xK34HSWJBKR6l1N30K626oomF70DVgqRSqkSZ0rhDBZzNzy +VlZ4hG_ZZCJOcm_AUShWOsS6JJ11s23uJKkZQeaTZCWc0KVqhtWbKTE8CVyRzm1XcyRONdJVnvXN +P4ANxGMzsaRZDC31gJYbSirZoTobLQ5OZxgNaNY9cBsEuK6r3sznPORG98d9y33x4Xa5HUedrHju +HxAAADMCZwK0ITdWPPsk9lsag-tNor16nfLXj20y2JdLaZfx2PnluQjCitwskuZhTcWmHRZ0Ry7t +ZxfxCSh5IOnAowFu1G2t0RiooKh4v26wOLTCzFiV0ZSmw1VSflkabxsIY9K2rh4-24QwQaAt \ No newline at end of file diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks index db9eae39e33c1475a4e210e4cc91af60007c92d8..808c1b92945bb1394787a2506ce70c11ab184cfd 100644 GIT binary patch delta 36 ucmV+<0NekC3xx}iAOzSppHi_TO$8K@O;exsiq?2Ht&~>e$hYbRpS&FjVGu+B delta 36 scmZqWZsne!z#{rID|DlZFRRFnnV;CtZEQE6s1_01bYX_%;*N|60Q?6I$^ZZW diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 9c82ff3a..a12164dc 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 2.0.2-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml datarouter-node diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties index 27e91c90..7c076359 100644 --- a/datarouter-node/src/main/resources/node.properties +++ b/datarouter-node/src/main/resources/node.properties @@ -63,10 +63,10 @@ KeyStoreType = jks KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks # # The password for the https keystore -KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL +KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8 # # The password for the private key in the https keystore -KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL +KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8 # # The type of truststore for https TrustStoreType = jks @@ -75,7 +75,7 @@ TrustStoreType = jks TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks # # The password for the https truststore -TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g +TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1& # # The path to the file used to trigger an orderly shutdown QuiesceFile = etc/SHUTDOWN diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java index 9a3d82e5..6dc334fc 100644 --- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java +++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java @@ -92,31 +92,14 @@ public class DeliveryQueueTest { files[0] = dirPath + FileName1; } - private void createFolder(String dirName) throws Exception { - String dirPath = dirName; - - File newDirectory = new File(dirPath); - boolean isCreated = newDirectory.mkdirs(); - if (isCreated) { - System.out.println("1. Successfully created directories, path: " + newDirectory.getCanonicalPath()); - } else if (newDirectory.exists()) { - System.out.print("1. Directory path already exist, path: " + newDirectory.getCanonicalPath()); - } else { - System.out.println("1. Unable to create directory"); - } + private void createFolder(String dirName) { + File newDirectory = new File(dirName); + newDirectory.mkdirs(); } private void createFile(String file, String dir) throws Exception { - String FileName = file; - String dirPath = dir; - - File newFile = new File(dirPath + File.separator + FileName); - boolean isCreated = newFile.createNewFile(); - if (isCreated) { - System.out.println("\n2. Successfully created new file, path: " + newFile.getCanonicalPath()); - } else { //File may already exist - System.out.println("\n2. Unable to create new file: " + newFile.getCanonicalPath()); - } + File newFile = new File(dir + File.separator + file); + newFile.createNewFile(); } private void deleteFile(String fileName) { diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks old mode 100755 new mode 100644 index 509004c5e24e7d7944d2bf5602a17f03fc46da52..17027970e4560d4ab6fe9c59439eb2aa7bbd9831 GIT binary patch delta 1921 zcmV-{2Y&dy9KRfpH4NBI+#vt}1p+XF1pbjh6MyO&Lns{%KlSo7IZ58_FJT^5q-*=E zzmm`V-732%9iMxm(&FU$--@LeoeiGCtouXRI?zPV+zm}heX+^A6Gc|IJ~cG=3E#zn zhH;i|B`8D}QWnb~^xht=6x>D2@{BrsVdwQcwMx?^e5yJVt;*dcZ^0n&Mi~=bXRc_f> z@rWM)j+JwJr4U2sL8qldIAl?Wu)j(gnxjgmf3rqlGMkc(P#(>qi*xkXKGJVCP?0US zeTG5f!zyo)D*7@5*ZL5fxdX^GHQeMp4X3%8d5G*nB61S%CbegOFIkH9w4+KK-+xlf zHo$0GqbC6tS-FibD{IXkRMUkc*tDMJeOs=1oC)&UmW+p`J4SvOLnMKL=4+Wr(af8D z!``e3kYar8T8rB$UB)Et%x6R9r_^6*C#6_^yf_YHzVIY5?UZ}4J;j5hD9C}R_^BFn z_|T{Qu1pdB`b)Msc=2ChW~_k^wB4y}JW(KIAd$m|5I&DcoC8!#AcqQ#HfO_d%E%lp(f@op zLtNPdNfDXip|(7=VqSOSTD!P40Hfva=&oN)MtUuEh5$&(^!A6ul^+!vfqxn)>0=hX z1Z`VMuVr`iR+yEE7Vu+K6KP4@zuBcv< zOB?OYddgEM6Ws&E=If=3>Ef z!4Bc|U|TD4ul+Q!g-7by_pM=7Sk*ULshwm?=kIfo40Eia=)IKIft_VxGtS0d$@^6+ z=K|qPOJA86%%C!M;n651TP}J0LthwJSA3LNTg#!Pm6jX>mJUyztbaR(Y8&Sjo7vhr zlUE+{82Euh0w}kMpQ0;8TQxF!T53l=J&L0Zp@@40vSN{lJ*J1m29KnoMq#X{rJK=F z+Z;Qkqe`jwHiDz2>K@YA%)fa)#WI(aWE{$yvqcP$EZlDQ?uj56R*IEgR#Sku{9lT zk{0i7f806D?+PNwfSF(PR4Fv=J8lTmcX3cxLE=QSb`MvAyMMaTYS@+36V6;hV*J1G z6No#@dIE=Fi<(G#L!wi}pB30=}|5A0<&Sp;4Un*4O|5 z00IC7SS~d%Ig>~Q69`$4xsnI}P>7Rb1z#96FflMWG&wUgS{Ds6FfcSQF)%qaIWshq z+6AM3wbo}driV+{C9;=n-DruS5RLfh4vZ{yykqbf2nh^?U%mvc)~@OD(P`_kZp$X| zTyw4r=w>E1=?Saf^>U>6tB^xfhe|`gFYJV4iD;Cj5a!k#fZvs^75`!=y>UmK+guRe z=SQNt*z?N1MAd~@-+FlHR2%wq{hzbpv>xDp!o#6WpIBQB)fP*Ee>&~#xpp{gLmIHn zV)Qni7WXM`cp;hKy~4qI3)?31N`qlV(ejP|u7RE+D5TXF)!G%H>)BhgVDR>9!Z{Pt z(9k_q2(^$u#{}^v{r`OSn zaJf}=VD}IX@0&0pYFQ}IW^yeC4MN)q7FPT_2BQd?2#hZb>1a60tV(60`@*U9l0+=< zEa@5^O!|h_T&|S{cN^O>8nu5DN%(0 z6^s#o4Fz>QoIcMLpX7uvFSi;PRZw6(%Q=!iuybMYfxsax0H_#CfRdR{c ziQ`PMDZspl?hI0ZyW{EShN}jH!sn}=+*R#NQYVg}dmB{2vD;U_D?1u$mu_Nbv9Twm z#tb@$HZXuC_Lz_e5@U#ulV*&4BOa6EWeL&({CKma34{a`%P-MTM#!Va)1rgp6G+C5 Hl#prx8*#1b delta 1921 zcmV-{2Y&d!9K9TnH4GK$`zQba1pqLD1pJXf6MyJ0n-(dmxuwm#8Hv_6Yxx3SutKd3 zspvwcG>{$x@Y67qMLo9aD%RS$V{M(+d3xF`Ui1;6oW-~Ai0O67@yEYV+)J8k(NcM9 zIJm!gtnC1WWiYU%yNpv|;M?=Cy+ml8YMgmC2W;u+GOygW#BE z9e)d%1ru^#Q$+BeW&sup_p9xyCZ*#of;NK7F}=AI5QL$aXB;CSCr?L7$Lg()8uM15 zyT`g&%hBNe$o`XE;DwU8=-RX~9CE$tW`Ui_jZl8_>?A7(RtWn*O$QEhC{I4b$KzGB z;740|Q7g&^Z<0^a(ocs0FhDv(OtUGdN`G1b?!l6J#cuz?QIy$qT9xv`JOX6GBe9_9`6G2L@JT`GR2zlDJTA&H zVdT`|u`319Om?JFN-@=>kxWq?usi?UZe5x9RAE6KZwY+XvdF?OjnuYb6z zMJFg+ogp{^wN$Ovvnk<2ll%lUQzi#L4jJcUERy6+F`xT9wO4wh+_O{qZwLX-7gG-^ zhKzw{d8Gr0{Pazc(jk6(yHmBkPa0bq$FFg7;`eFdW&r+TVa^KH8YFelp{+9gkj?@Y zguR^)w2I?YRQI;Z(!7>(lby--9buK1h%=0b=e(i+^d1F#`W+ z$%59vj5&|c$mw$+R>Ljzf5wzKbKYV0cD5;2$0v10xXgH|+Y$|$fbhF09%?Goz^0h8 z+^d?+wJx}2fIO#Ah#LL<X>MrIXba%VSa_#GmXxg4G zOVkX3AWR29it&BcQTM7lJ%6E<%--T!^S6Dxap9q$Hx$;Vate^LUV%%O@f5c-M*{}I zEpfnYI{zuvkh<`S@A04K6b7shtjqTtk~!R`h40qo!%=U0WKZKvb6mfXSwce6HQC@C zrEMhS#svRNFoqJXP!F0OKHbL&LUt`3-X%ns66|nDtzELVfD1q3CVxA6GM1hIz!35A zVL$K|k{3+s-_7(;E)rPteb0I1>YS(_$mQT~4b~ctY`V|5v3sJ+tZ@7R4B)+9*y4IU zeQ*-~o_HAT-Q4Tg8Oc}7+O`jChHsIq)aTXTLU9STe9)X4{V0SB->?1J%k3KU3fZ^d zf>=~iZnuxX>9MWm|9@#%t3!NO<|kkq1;`K>K2Kz5M}h#^ImsnK#+ zZHq6_79dz{Q}yf)gT=P1F2{MvMP)O=h+dgl4P={krd~YlZ<`yLfYk~K*rlv0Ol7c> zg4LatXSWsLv0pSx*P<_szmIeP`X};Ltxpvb(ra1b=UnegH-8qLsf8aXS3tkg|?tms5Tb&aGC|pr1Zm-;z|x05q-Xsl_p{M#kjGq*wv3BJHEv_k zqP&WRI9xuRgvf4YZOlBPA6h>G`}wUci!pjIroRW7)_aHUDj9~7>p<*R%k{ZJRn1-a zd!`~$ZMI!oz68^m+O%{idGU@f^wvVCI|9LfIDd?fXapx#H*I+Ew7lXa9@I;Hwc+n2 zq=F!d;5vK<*zm}cgEI71Noj=Jvjb7SvxtY7vG>*ms z%)yg?2dfmLcNnA4F|~CUVPdqlA+!1!UG zyNXQc4x|dk@;XVlU+rjV!`(v>vZvy-D{~e#c(cvo5>qUbfnU1}gyYxMz@s?`B^gG( zz2wnuzusFm5>1MO134{a``vV@zoB)J069H~I<>QQb Hv6^stq+zjw diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile old mode 100755 new mode 100644 index a586a72e..59f161f9 --- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile +++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -VDu7g5rP2-JMemc6RwP0HqM4ILJnuja8R_bzdCG1u0_Z2EQJN_7ZNPDb28V6JCDF-59sX10_i9vT --nw77ViAuwJO7ffSut8ipVhESeQxTokZsErzMFpeJZDhMM16W5LLtxwUs_tgh_EQIJSc-WcFUNYS -NagugzjmNE5-hUosLgnt7mZ1nX4zFER9Nq1ce0EQS--kAB9rxcRmoywPlBlHvPmP_caiwpa1SzJp -gbFF6smyLEWhjDhJkgvM_4FwaQCbJBVGcy2a3Lc9orHsz9S1RJTZ9CExhasM0qEp3kk0fMEFE9k6 -TomOpUBGizLfHPpg18KtXyM8zErj8qdS0KMwaCKtwGzCWw08MF5rVZrMYWLKDMOs8U2ESU7x28nV -KSrAsR11QD7vX4PTVTfjEpcHSGe-9nPD7TckY8_O-9l67v_OUW1Fw4MSESCN0RtT7ZlNYwDV0syA -X94rv1Y45N41tfX76jz8PDB9G-PF36BtkICJWK24zwuQDgpkURhCLPYzvBhPmCPyQil810X9s_bX -icmV2cSN3oYQRz5dNSjUYH1CDt9edAJt4p2PQhM3A2xXyw1FVvbAIYA7iF-3qYG9csroBzsCcS5C -hX8929jZHQWU5pygtpedEWhX__tnSrd-xIpxPnhOxrb-lNLva5JGKauU2DrGoLd_7RTwbuRdCiQo -uGFtYOtjLciPz81oEEpXQTReeSnvGyGiZNxRrKWMEmq-biyQd4DuRVmTDuLAG4rd92QWS6qUz0uf -9TtJiYlN3mNkxz3ahEGWLKR79rH9juJ3xqpcF-Rb7Y1bmiCDBv3DVVFiYIpwQuto1iSIYabL34Ql -QqX65E1c3uvPksN6Nl1nvAVxSKM94wAFsMiA9Rp8AN9pDSxtj7D3kZCG8I0YaIxF_s-OeJtr1RPx -ifv8vrwN23GUQCmpGBbyNXNe6zz-hz_HJdAsBr6WjLny9LQkeYszHGF-OL5ps6K5gHBRV0Ui1C7H -Gj7egsjnV_Lu5MpBxhTrquDrZKK3t38kf0zrV-zfSGzJlGbLS91h8bR-7FAZiNEzgXPWYi26w81i -W3Csx4oqsfKswp0pO80rggkFf9LL9pjCkSUTTVyF-toa9kY2h7JsVtqntP4Mjagp4Tnj01988kne -Mj8SLm2mJySTLdH5Hi4arKW943iCqYjEaZ7wXFNJSZ6vvBm3KC1XX6C0DjRrgQoKIHw_4JcGhvOU -P5LdpBT1AOcE8lIKrGGq8hyfJKLVUMec-NkzAT2aIl0YJoUcJv4fs-lKccGL4FDrq5y_yvD3xQ6v -xt7KTanFxntqLYmM72Y2eFwJGlDEHhm0SejAV64-odksA_zMLLuYwkq_KSj0If9AVpRXz7KzIj9P -9y-WMfAWKFfIyqGWXt5sYdMTQPG4qKCcFQBx3T0E6kiQMBuOZz0dR032eFPMexrymEowjosr2jt3 -ib8rFxmPMyyUWoV1iBafFMLf5PN2oapTq76gqeQQGGwpmYJB8cWlS1Eq_ZbzZpK2PSwX-fC6NSf3 -KtOV_r2VI3e_V6csnWTY8nxCJj9FlQCvLOzp964DNsBeUwDpsD7T_pgQy0THgAnq32ZtDvQfgeUE -TUJC7oQeOEY7QBWjbZkumds51j7oTlsp2dPForlHwBk_2Nd5VCwVRNa1QMS8WcghLYbUCX5zeplc -u2bopHn9GD614gt7f7wysDgTGegOCAuMoL7wA9TXN4BSfAF9mwpdtRFE4lT3N1xmfhKt9rM6Lu8T -RGvBOmTOTT5IwJrrE5mpvmESw05sHUcCZ9ENv-VhoeC3Ffk9uXqrDggQgaDs9XcXqzEPBp9wDPTt -UJpbtBGECSSTuXAZyUh3I0WFz96kVuHmQpDYVTpy1sxPjmgjgKyhu_6jLGSsYpVBH063n7KSKVdF -ROKojZN4-FsBlPhoOhNEd7x1OBfgCG79HKGk33jhESObZkPIrcTc17jiE-ud2D1B1_Fl-OJNR7Vh -GIk4WMZrH9NeVwDuIgBxF74plqg6tSl0Cdd4m7e3Drsq-wRfsU2gNTo5oL-2SgbsO5n3ubQf \ No newline at end of file +XzAbZ4lSt3j0vgqonk1lGgt_2IvBzet-MDbt7nlxdj5vrQbUBET9eqIfjRBMlen0E815nYm6nRBi +RR2fUKzqO8JIn2s19e3fmYrp9wTbIkY9GXOzsnuSeyRxVxxW-82VrAD-gSBmqUEJvPjqjVWinadL +LVy1h9lE35EErQkBpK_GmqVp2RajjXv8N_5LcKkkc4vYJQ8WclOHwN_BnQpNS1NLBWJVXSPeVwjM +zIkQ10Q6GGEGCurBPLef9UiXD73oVnQsVyZY3E87X7RbDfCiVbfmHN1hyVkR3DX6gDfrfjTnqkqE +Hv7kw43qXx9-aRCHrqnmaGYBTscU5JgxTNpqe5hvxLJHnDwLTtHDx-vES0PljekcofQVT5pWJvRK +ltZtPQwuGlapONa_rDuMq3sSDx8gXKE01rjK0bNDurIPvFzyef0RoDYIc3m4M-KdsBMlnE7oyBAz +OXCPt42HLJX55F9boRIWwSy-8o3AsPXwQTwEKoD7ZUL4pZ2Zf45npfQLlhhs5x_ERcPTrOXrF7Uu +40HxQnMbwO_Ofz7CrlKe78UImSJbsQp0heyBbr6irHrMq6_E1DqbjWafs_a4kKNbtfN4fHHvxkA0 +9J_plrqVOoBqFaeUc9MJt_6WBYq2vDFbHSvBf9QZKnaVZ3aKU2MzV2Y5xjw7V6rgDQHwmXXeAmfV +-Z3JT5ocQhyG4SqyKhSrzh4nGOMt51yy68hPPHMrYnpW8VF99qTLqSmQfLAeNqog413Efj75oQDW +JLw1BR56ABvCPdcR5wZruo2Egwak1UyiRL0Mjd8txrjc4uojiiqddqalEQrORvn4BgP0OKQOOdUx +dArQ4HqjBGwvurQUM0XjBvyqki1h1pxhSNeuyOY3mofVB2NNi-ZvSHHUpwqIgQ4kVLombpsKw2W9 +AW-3h4cLYl3LgP_LRH5mS8Mo_BEKZqivM9v9YYVZCgB2Djqyn3MQXpcFSxaB1AK9wG4TmMneFP7W +_dHqJnx26njAtff1y2ud8cmW_UGgzMb33QGIjIrYo3AVX8_G8iEQ-838fDpGE7BdqLSam-BMoeo3 +WPht7-O8gx7utuYx1ceCetunKRmh3Tfga_0srBNDWMyzuiPvbLX3oUJO_F5p5734Qwm5CeqCAaJv +sU_yfzTgUPqS6jC9cuKi54h3HrzV-k7DcSdGrpsAgzYZdHwi7XFfAzFOhkpBeNUNzDCX8B7yTHjU +dKdGDezdgs7lMWbJwnSNFDyTwbZdk4XTnSrtdhmOZp4oVizEQgha0Un0ISKQ519kajTFj1rZV6ue +h8SzN4QXOw6BHYB5rsy8YEvWbkfyneQ74HeyeWRRq3p4UdBTTUn2JbGM0neErRrxnYvmKIdFlSsU +NlEgNf7dh_kqdWUBkXfud32ftazttjmiO4zkqBupsJTlxj9Tjam9aZqNhunPNI9znf4luKAiRa3v +26giSwRUX8mjlK5FvBNUbLeFM-G3Pk2jQej13q1lZ3PZMesLjUwvvMIdlu9qmDx_TCYSy72-6O2A +qmPlUeYCKgI8eVaZV79aM6YtomaopHiPCcyJGWl114Ke4j8H3-Lg3EkjfVROwQw_fKn2z4Eci7io +LetFQnibRw2ow-Z0F-Db3kuEuRTgmb6U0pMUO3njou6Sq7oa_gaND0XYHy6MKGu1uJ9aKVLZ9uy4 +m9KRxZvq71LRJkD84y9bMv14lxzUsosuzbXV7Q_uz8kceWSq_1BLXQXam9j5rxN6SKEk_Rn0jgnX +h4A4e7q6loMXUq4nPSVII9K6pHAqfi1sDLhVZ239XcLBwKY9R5f0jgYy76AI1dN-_oEMdXJf_L6w +KuRJ4jy0XSfyV_QvS6at77san2UIOkdY_tuI03Ps3fTzSaztsy5yX22t-6TnkFSoYxGkuMw9R-Rn +ZwJIanS3v_wQbgNdUB6JIlE_9kkHYCokheldHkKndV8eEc6Z6bgasNWKB3PreI1m6UrfZI3agd-n +zhsQppGFk8j7Tkq4S_9SP1OFVCgCT3-mU0UhPhDhCFPM1bladfj8RptCbPKO66evW1c_ooU2 \ No newline at end of file diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks old mode 100755 new mode 100644 index 987706d5620e07178e235648cd8efa3fc797368f..2fe06cd216fb21c2882dde477f0c1fc327beefc3 GIT binary patch delta 36 ucmV+<0NekC3xx}iAOzS=+@G-|O$8KpxFpY7??=M%=IIyJ*EtR}yWj~PR}jVk delta 36 scmZqWZsne!z#{tckNHLwUsjRT8=f<7UoyS5!1h6Io|uNG)i?f900pKFpa1{> diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 284a8cac..19bbf4fa 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 2.0.2-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml datarouter-prov diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties index 45393461..59b791dc 100755 --- a/datarouter-prov/src/main/resources/provserver.properties +++ b/datarouter-prov/src/main/resources/provserver.properties @@ -27,11 +27,11 @@ org.onap.dmaap.datarouter.provserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true org.onap.dmaap.datarouter.provserver.keystore.type = jks -org.onap.dmaap.datarouter.provserver.keymanager.password = AT{];bvaDiytVD&oWhMZj0N5 +org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5 +org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -org.onap.dmaap.datarouter.provserver.truststore.password = ljlS@Y}0]{UO(TnwvEWkgJ%] +org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool diff --git a/datarouter-prov/src/test/resources/logback-test.xml b/datarouter-prov/src/test/resources/logback-test.xml index c2994ebe..70d2acdd 100644 --- a/datarouter-prov/src/test/resources/logback-test.xml +++ b/datarouter-prov/src/test/resources/logback-test.xml @@ -20,7 +20,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * --> - + @@ -109,14 +109,9 @@ - - - - - diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml index 1f58c42c..96d55b71 100755 --- a/datarouter-subscriber/pom.xml +++ b/datarouter-subscriber/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 2.0.2-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml datarouter-subscriber diff --git a/pom.xml b/pom.xml index 8156d09b..4f52e1c7 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent dmaap-datarouter - 2.0.2-SNAPSHOT + 2.1.0-SNAPSHOT pom https://github.com/att/DMAAP_DATAROUTER @@ -161,6 +161,17 @@ + + maven-checkstyle-plugin + + + onap-java-style + + false + + + + diff --git a/version.properties b/version.properties index d3f123a3..e307f8cc 100644 --- a/version.properties +++ b/version.properties @@ -26,8 +26,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=2 -minor=0 -patch=2 +minor=1 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6