From ecf013686135c24b56acf552f47c3325ef35b6a9 Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 5 Mar 2021 18:38:17 +0000 Subject: [PATCH] [DMAAP-MR] Update certs etc Signed-off-by: efiacor Change-Id: I445f6c58f74a1c33f7f1817acf2a59580bc3df50 Issue-ID: DMAAP-1565 --- pom.xml | 4 +- src/main/config/cadi.properties | 5 +- src/main/config/org.onap.dmaap.mr.keyfile | 54 ++++++++++----------- src/main/config/org.onap.dmaap.mr.p12 | Bin 4149 -> 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 +- 7 files changed, 35 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index c184c04..80fe6b9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.onap.dmaap.messagerouter.messageservice dmaapMR1 - 1.1.18-SNAPSHOT + 1.1.19-SNAPSHOT dmaap-messagerouter-messageservice Message Router - Restful interface built for kafka @@ -436,7 +436,7 @@ org.onap.dmaap.messagerouter.msgrtr msgrtr - 1.1.22 + 1.1.23 org.apache.kafka diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties index c3f350e..62874ee 100644 --- a/src/main/config/cadi.properties +++ b/src/main/config/cadi.properties @@ -4,16 +4,15 @@ 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:gvXm0E9p-_SRNw5_feOUE7wqXBxgxV3S_bdAyB08Sq9F35cCUZHWgQyKIDtTAbEw +cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 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:pLMCzQzk-OP7IpYNi0TPtQSkNcraFAdarZG8HbdOKq4BycW6g_7mfhphLhOZo6ht +cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW 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 cadi_protocols=TLSv1.1,TLSv1.2 cadi_latitude=37.78187 diff --git a/src/main/config/org.onap.dmaap.mr.keyfile b/src/main/config/org.onap.dmaap.mr.keyfile index 72d3b73..88ae118 100644 --- a/src/main/config/org.onap.dmaap.mr.keyfile +++ b/src/main/config/org.onap.dmaap.mr.keyfile @@ -1,27 +1,27 @@ -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 +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 diff --git a/src/main/config/org.onap.dmaap.mr.p12 b/src/main/config/org.onap.dmaap.mr.p12 index 1a0e8a49ce7440f213ed2e4beb50f743462174c3..41c82b0cb2eab3a0fa77173d07cffc1de4f2b126 100644 GIT binary patch delta 4161 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 L-?9+`0|ADhhVJ;Q delta 4048 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 delta 37 tcmZqWZsndJ&sxa;Zjt;(6<=176Xqq}*TWcHcOO%|FWaj*watCK4*>Zd4kZ8p diff --git a/src/main/resources/docker-compose/mr/cadi.properties b/src/main/resources/docker-compose/mr/cadi.properties index dca56c8..62874ee 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-locate.{{ include "common.namespace" . }}: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:mN6GiIzFQxKGDzAXDOs7b4j8DdIX02QrZ9QOWNRpxV3rD6whPCfizSMZkJwxi_FJ +cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 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:_JJT2gAEkRzXla5xfDIHal8pIoIB5iIos3USvZQT6sL-l14LpI5fRFR_QIGUCh5W +cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW 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 dba8f85..9ac4233 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=18 +patch=19 base_version=${major}.${minor}.${patch} -- 2.16.6