[DMAAP-MR] Update AAF artifacts

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I9d8fca37f82f99056db863c8aa3e38998fccbd8f
Issue-ID: DMAAP-1565

diff --git a/ajsc-shared-config/etc/org.onap.dmaap.mr.jks b/ajsc-shared-config/etc/org.onap.dmaap.mr.jks
index 34cb01f..6fd5714 100644 (file)
Binary files a/ajsc-shared-config/etc/org.onap.dmaap.mr.jks and b/ajsc-shared-config/etc/org.onap.dmaap.mr.jks differ

diff --git a/pom.xml b/pom.xml
index 80fe6b9..52dc81d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.19-SNAPSHOT</version>
+       <version>1.1.20-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>
@@ -592,7 +592,7 @@
        <dependency>
                <groupId>org.onap.aaf.authz</groupId>
                <artifactId>aaf-cadi-aaf</artifactId>
-               <version>2.1.13</version>
+               <version>2.7.4</version>
        </dependency>
        <dependency>
                <groupId>backport-util-concurrent</groupId>

diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
index d066f8b..449f7de 100644 (file)
--- a/src/main/config/ajsc-jetty.xml
+++ b/src/main/config/ajsc-jetty.xml
@@ -87,8 +87,8 @@
        
         <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
                                        <Set name="KeyStorePath"><SystemProperty name="AJSC_HOME" />/bundleconfig/etc/org.onap.dmaap.mr.jks</Set>
-                                       <Set name="KeyStorePassword">jkspassword</Set>
-                                       <Set name="KeyManagerPassword">jkspassword</Set>
+                                       <Set name="KeyStorePassword">oKt1E9fT8%2KFe58#z!sfFi2</Set>
+                                       <Set name="KeyManagerPassword">oKt1E9fT8%2KFe58#z!sfFi2</Set>
                                        <Set name="WantClientAuth">true</Set>
         </New>
          <Call id="sslConnector" name="addConnector">

diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties
index 62874ee..4292dca 100644 (file)
--- 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 (file)
--- 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 41c82b0..10a4ef4 100644 (file)
Binary files a/src/main/config/org.onap.dmaap.mr.p12 and b/src/main/config/org.onap.dmaap.mr.p12 differ

diff --git a/src/main/config/org.onap.dmaap.mr.trust.jks b/src/main/config/org.onap.dmaap.mr.trust.jks
index 1a3d366..16a9921 100644 (file)
Binary files a/src/main/config/org.onap.dmaap.mr.trust.jks and b/src/main/config/org.onap.dmaap.mr.trust.jks differ

diff --git a/src/main/resources/docker-compose/mr/cadi.properties b/src/main/resources/docker-compose/mr/cadi.properties
index 62874ee..e7d056b 100644 (file)
--- 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 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=19
+patch=20
 
 base_version=${major}.${minor}.${patch}