From 9ca35c5d7c887b7db4e0e3044dc0461609896af3 Mon Sep 17 00:00:00 2001 From: efiacor Date: Wed, 10 Mar 2021 14:34:25 +0000 Subject: [PATCH] [DMAAP-MR] Update AAF artifacts Signed-off-by: efiacor Change-Id: I9d8fca37f82f99056db863c8aa3e38998fccbd8f Issue-ID: DMAAP-1565 --- ajsc-shared-config/etc/org.onap.dmaap.mr.jks | Bin 3619 -> 3728 bytes pom.xml | 4 +- src/main/config/ajsc-jetty.xml | 4 +- src/main/config/cadi.properties | 6 +-- src/main/config/org.onap.dmaap.mr.keyfile | 54 ++++++++++----------- src/main/config/org.onap.dmaap.mr.p12 | Bin 4261 -> 4261 bytes src/main/config/org.onap.dmaap.mr.trust.jks | Bin 1413 -> 1413 bytes .../resources/docker-compose/mr/cadi.properties | 6 +-- version.properties | 2 +- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ajsc-shared-config/etc/org.onap.dmaap.mr.jks b/ajsc-shared-config/etc/org.onap.dmaap.mr.jks index 34cb01f44ef3c89b66216856e0ef29cadfbd3b51..6fd5714263fb033212b905d6b90ef6787810c711 100644 GIT binary patch delta 2149 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.onap.dmaap.messagerouter.messageservice dmaapMR1 - 1.1.19-SNAPSHOT + 1.1.20-SNAPSHOT dmaap-messagerouter-messageservice Message Router - Restful interface built for kafka @@ -592,7 +592,7 @@ org.onap.aaf.authz aaf-cadi-aaf - 2.1.13 + 2.7.4 backport-util-concurrent diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml index d066f8b..449f7de 100644 --- a/src/main/config/ajsc-jetty.xml +++ b/src/main/config/ajsc-jetty.xml @@ -87,8 +87,8 @@ /bundleconfig/etc/org.onap.dmaap.mr.jks - jkspassword - jkspassword + oKt1E9fT8%2KFe58#z!sfFi2 + oKt1E9fT8%2KFe58#z!sfFi2 true diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties index 62874ee..4292dca 100644 --- a/src/main/config/cadi.properties +++ b/src/main/config/cadi.properties @@ -1,16 +1,16 @@ -aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 +aaf_locate_url=https://aaf-locate.onap:8095 aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 aaf_env=DEV aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm cadi_truststore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.trust.jks -cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 +cadi_truststore_password=8FyfX+ar;0$uZQ0h9*oXchNX cadi_keyfile=/appl/dmaapMR1/etc/org.onap.dmaap.mr.keyfile cadi_alias=dmaapmr@mr.dmaap.onap.org cadi_keystore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.p12 -cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW +cadi_keystore_password=GDQttV7)BlOvWMf6F7tz&cjy cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US cadi_loglevel=INFO diff --git a/src/main/config/org.onap.dmaap.mr.keyfile b/src/main/config/org.onap.dmaap.mr.keyfile index 88ae118..429a855 100644 --- a/src/main/config/org.onap.dmaap.mr.keyfile +++ b/src/main/config/org.onap.dmaap.mr.keyfile @@ -1,27 +1,27 @@ -WGfF6i2ePMJQ-xNiTEG4qmMOjn6lD4UaQCwsUminLaaGj5ymqQBGQedJFOnhE49UJwwv-pRGJeXP -w-xAgAKArIr7MGRCtGrgau28nl1i4s6Sc1f8FiPkZfavnjlXw9kqtmpswg0sWoR9CvnUSlcMXgyi -ZF4BNenYBYwMOEi5cQN1P0qI6dYOEOFw-wD8tXYMBOjeeF6NjQP5kyk3QXIdktdF12ixmKh2ziMV -yLsJ1nL7Cp4scGLKYKH349tLTEESxdgQYsmljnw5H9OaLPUyFfNn5HqyAQHbd-GTJ-zNcQwvDbQI -bMqi0rlB_Z4NvvZ_6cS7O2NakNMOZoUFdrfDNCh1H2SltxmFwz1hzyU4NWFxF2rzSOdJplJVkb5O -vg4U2lxvAGaNyg2Qz_XbR_mIgLG2pba8doWzNnMImjm8uc4dexWpHmqogHHg2BWVsYfOuEV7HL-b -IaJKNrdU2L9vwpxmKzE0LyRnK41nZ1w22BHUck3FoLSZfOBIoV7ufzs7H3b2G8I3Iwh3M9ax44Fu -h3YEbwyTCEJwKr8VH8isyISfUYCzwjvF_MNCfAh4Sv8uXVDv9w2hYuwgw0Gf0kw9UPcKrl6hAYpg -WuoQYgGWuAl8BF1KB08Em1sQ-4Cn_irfjKrIJSRIUyLqZwOz_5HhQCSAhhx8Hk8hf3VPKNWEhkoi -zNt6AomxE_LS3qcNrxdR1PAzfvg2Lqd0mszE6bMA4I-Nfm41Ji47b4ym6bn5BRwJxcFFfRhfw2V0 -BNWU3ipfoKcfKakHNbZERDZ5WREWNqt6Tzw_qde1qWo9s102Uk8At3nfVNKcfxaB3q9TlUGj0sGP -TmqZvRGYABXrAnILPeCnn66ZcY-HF6q-TZ2KHCeRYm2oGJ5M9G4bVIdMK55QDG6yaRxmwjwyWH3z -gvC5dH5hhmY-uUA5gCtskdHxC9eGXpsb-y-zCZkOgRWY_IWCnzJmDqZzij3cnh_iDpBQIecDMUgi -oI3GlOkZv7jffN-5k2lREpmIH14CjpQCwBcTWoBsMeJNgIXBGoZj3N8gxelQ1n6YUNGm5yflviGa -pIbCgLRXwUsalOj6WQMSHSwTUuV5S_DmWTYc7vYPfyDQeO0XoiNDGFRZt11J55KvcKYZ3l8KZxPl -YqwD1qmV9A46746FLBvxeIfaiAtS4TTtUcUINDF55ywRCIM6SnFwL7fk82qmv8sYKlyBuAnfS75b -1nW8bFvJyrVdQdl9VIbmPZAvEiVPo7sj6t9xUxxhfv-vYT45prl8xR3TetIWuQH_sLhj7Cc9-Foh -BvWniCcQtQbZhdB383MibWYDtQUje9xa9O4gCkebqW0uTbz1YtezhgOH5R6O7tsYfLzPOGiFAYAS -VhrtRQCslAcUPCMYFlr5UUIMPNyocyligiR4TQxFxpXN3yb0dyQUjdY9Utf-fdjYC9IRqWQ4XlKa -Om9b9p2n5p3C4HQbuvKd1Gl4d1aZ3IYSfXsJiNdXB5xc-_-CzMHiHUu7QeAOQBNzRWbskOIqxLnj -1e5DpiPYq98-dKFWY8dcUtgUdje7CojXToVTRNxzoLf9hRFDTBvMMHY3zasCGG5LymQ2G0PBox3V -vOgRfTuGznBjoYzZr2jhGUF9H0jbRaG7wiyWt1dOOEOCiRMZL2Ct_VMcobVdlMyz_vNYNkzf8Ggu -u5j3dPjfB3a1q-GOuxeKU1GSQNW2kYPJNR37o-2HR_-NIXddwGPEHPnesRgZoWmwCEn32SrLXRqL -9QROJQAC4OOm9TqYX0iFYbCNM-qfdlwkgdBn7ZXeKATVVipiytugwJ9jLFrcXlUrNInuMFdxnt5a -hRAZjQcYsSx8OJLJqtoDrFYH-bjEahgTTpxjNfJEojPTiiBC72OHAym6XVmMTsw5hFSnqYoPdDxj -02NQGNs3wZdDRcbBG731RnoLJxdZz5063iwBMjwYzFjwZAtVCyvQkmv628nIwT6OImGlOfEgO88d -iWSOV3FfbORgvQIlzKcY6DawyJLsEAmqQ3Pvx5WffHiaMHTWI38adAIj4ApDIDFfOzSTJlZb \ No newline at end of file +iMiNutYIJA1TUFE9PlXl55lprqSAd-ej5kv-gkRzc0hdmhQdsOtQ8gEgooICm6li2vrJwmQt3x-f +GmyJ4GrU5jP2fCzsDesXsut9R-CTt0lRAYIPHJ0Zddy-d6mO1n7_nb2p_1YZr5Uv5bWYXdRj2Tds +1A9KlMGRvDqvb-zzWxeSqA1BAdkEvgNqCuh96EReCcDdAhSc5wO8uAVWxfbUVOTVnzr63_UJ40ob +0y_1Ocjvzs_rEq9s5Zv7I_gMXY0Fc4k-I-5ERfPL5yY2waUpjKOOCb_FZSgxKR_jRL3-h60KRmMD +zQByT_xFGx4O09opUCmfjAjgYBQSueJBEvDG8RGLfpSWAf0QEudmO2nw_XK2M4KmqnXQ5371RfzH +4QTtGNNHDOymjId-bhZ3K0XTrgmHikZmDCB_WO1lKBZDIiXQrVeSVDgAEJecHyjLgTkBnUQpHg72 +FkcViBzOe02gQbdaVb2MujgdOUztqWqDdn3nCStw8y-0Rd7ibUx4YmgBxnIA-R4eolV7eB-hFhQx +YM5hyHhbdpbK408JDl-HJif4pqszQX7hfq1GpmRlfesHoLamY2w7ZyZHONqBSGwCgYwyHHxmv_HX +D9QtqIMKlXt85xWjrHDDd7IAbXni2psgNAXaOAj1dhcAWGAM4LEHMckTaSz3zS8YprGSAuj0MuSn +gGvoBYHgSzfqVorqIGXfHFRUM7L5E_EghezmxOe3ZhNEYV4c8GMA7M16X_HOwiQHx7AQ0vemn5Gt +rfDt1HDCuaGUzkbO8E2STvXMlK2zGa64-Hsga6Uq4ijnWfv4CsCCkNxr5kzn1ikXgRhe6b6tC53B +pezQTiwq2ZESmEH5TBtjG_ybj9TYQSUHt4N6CciX3POXgq9EIfVjqVAeK2Q2_U32H0ut4xNXmtZJ +cZUwk9J7fI9KeMbaeF_UPpY7bnZAOLQc0NgHXH0qn82GB9l9gbXf14OBRoce3rGAeSHNzZzTJLFr +Wzc7WkkGZ8GeOKiDb5zJFDpVBvc86BtjH4aAEEbwLGQgZ3Sj8DfVMzD4aOEvMf52Iyn3NpS6t00S +nt9zzc4M1dG95gJtxoDb0Hu43mXSPl3cBH0hM4-SaI_Bp4S1JLkH2ShbgmZocGseHb92h74Z_rSI +yze0kOGpffbwzBKiqDn5tbi-cg6Bta2RBR97k_iyCRrTsmfCiwRqTwCwzlZaFU8wLKnMrDUmelNT +injCcf-RAHIZ3hbrz5Kclt-AVpkc_1NphBFtH38GU-1--qwB5sQueMiPDWTYBprqf_DiHa1JyK-M +QGLO4ByYufzeodk1h_gWFkrK1EIzjIRRSKrjWPzhx64oa8X-mjXEfmtpsK6-cHUXiywMguk06xKq +un9NWE7OmBD6yo9EbPYxfMnTDM3y4ftZPgm-3ReYclANOkegHQbswNAyTpGB9CiLKXwrbfcGo8W5 +f2Xu5r4eviWn3gIibGn_fxsY10EuA23rQpU3jCqUJIAtuK4TCB5SrvcEajPjkrr33Z-PfvbXawgv +V_1t_8pY6paXOcjWezHQNEoF1U0oRxNXLzGq3SdpZo0PUC8bJMN0XSgLvJqrHjEkt5UPb8BLeW7x +6xbPznA7uF7X1wr-kYnP66exZbtOe-P-kFW4JGv4TIHe5XnlVWmyZj5d-hlFUvMridB_Ul5Exs0q +zL_DyqFLQiyB-4CWHdsTnZ4sm-RHzdaBk_H8iD_qUbQNYxxi4Jm1LtwJY6l6hZHykk1HF_hWvIo8 +7zIP4gnh_1FWAf71AasnAtNjjbD_fY7mloCkvo5T1Cede1UrRoB5zZRxStVzkSHwn6zcNfG5qb8x +ozEn6oOoTg6_T0VjoRQmmzM-iyOgAkg0pZ63PCUGCx_4lrfIpTznHlhS5d439Z1RI9sOCdi51ooP +gnnK7u06HYVLjxW65jFB5cJILynCdwhUzGiSI-pQXcFVF8xDxUw4AD1oFR5vvdJvf51UZhTpn1DT +8i518xwhc1eFc945P5U0p274rTnc_TqxulklX2CeQKXFFURV2-V6tzAbk-qa1d4gtpRnGKMG \ 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 41c82b0cb2eab3a0fa77173d07cffc1de4f2b126..10a4ef4d314d72803b2ecfaa371e22296dac8467 100644 GIT binary patch delta 4068 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 diff --git a/src/main/resources/docker-compose/mr/cadi.properties b/src/main/resources/docker-compose/mr/cadi.properties index 62874ee..e7d056b 100644 --- a/src/main/resources/docker-compose/mr/cadi.properties +++ b/src/main/resources/docker-compose/mr/cadi.properties @@ -1,16 +1,16 @@ -aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 +aaf_locate_url=https://aaf-onap-test.osaaf.org:8095\ aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 aaf_env=DEV aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm cadi_truststore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.trust.jks -cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 +cadi_truststore_password=8FyfX+ar;0$uZQ0h9*oXchNX cadi_keyfile=/appl/dmaapMR1/etc/org.onap.dmaap.mr.keyfile cadi_alias=dmaapmr@mr.dmaap.onap.org cadi_keystore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.p12 -cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW +cadi_keystore_password=GDQttV7)BlOvWMf6F7tz&cjy cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US cadi_loglevel=INFO diff --git a/version.properties b/version.properties index 9ac4233..bba0fce 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=19 +patch=20 base_version=${major}.${minor}.${patch} -- 2.16.6