From: efiacor Date: Fri, 5 Mar 2021 14:39:00 +0000 (+0000) Subject: [DMAAP-KAFKA] Update certs etc X-Git-Tag: 1.0.5^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fkafka11aaf.git;a=commitdiff_plain;h=47cf048f30abd3bdd675f1398f88c370f90c5943 [DMAAP-KAFKA] Update certs etc Signed-off-by: efiacor Change-Id: I92b5c6a2dc39cf99814ae557a63affe372856562 Issue-ID: DMAAP-1565 --- diff --git a/pom.xml b/pom.xml index b04e48f..324a075 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.onap.dmaap.kafka kafka11aaf - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT dmaap-kafka @@ -52,6 +52,11 @@ + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.6.0.1398 + org.jacoco jacoco-maven-plugin diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 1896aab..e3becb8 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -10,10 +10,12 @@ ENV COMPONENT=kafka \ KAFKA_USER=mrkafka RUN echo "===> installing ${COMPONENT}..." \ - && apt-get update && apt-get install -y confluent-kafka-${SCALA_VERSION}=${CONFLUENT_VERSION}${CONFLUENT_PLATFORM_LABEL}-${CONFLUENT_DEB_VERSION} \ + && wget -qO - http://packages.confluent.io/deb/3.0/archive.key | apt-key add - \ + && echo "deb [arch=amd64] http://packages.confluent.io/deb/3.0 stable main" | tee -a /etc/apt/sources.list \ + && apt-key update && apt-get update && apt-get install -y confluent-kafka-2.11 --force-yes \ \ && echo "===> clean up ..." \ - && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \ + && apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \ \ && echo "===> Setting up ${COMPONENT} dirs..." \ && mkdir -p /var/lib/${COMPONENT}/data /etc/${COMPONENT}/secrets/cert /etc/${COMPONENT}/secrets/jaas /etc/${COMPONENT}/data /var/log/kafka /var/log/confluent \ diff --git a/src/main/docker/cadi.properties b/src/main/docker/cadi.properties index 55d11c4..15dcb4d 100644 --- a/src/main/docker/cadi.properties +++ b/src/main/docker/cadi.properties @@ -4,13 +4,13 @@ aaf_env=DEV aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm cadi_truststore=/etc/kafka/secrets/cert/org.onap.dmaap.mr.trust.jks -cadi_truststore_password=enc:gvXm0E9p-_SRNw5_feOUE7wqXBxgxV3S_bdAyB08Sq9F35cCUZHWgQyKIDtTAbEw +cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 cadi_keyfile=/etc/kafka/secrets/cert/org.onap.dmaap.mr.keyfile cadi_alias=dmaapmr@mr.dmaap.onap.org cadi_keystore=/etc/kafka/secrets/cert/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 diff --git a/src/test/resources/cadi.properties b/src/test/resources/cadi.properties index eb7e8ca..0e8523a 100644 --- a/src/test/resources/cadi.properties +++ b/src/test/resources/cadi.properties @@ -1,20 +1,18 @@ -#aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 -aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 +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=src/test/resources/org.onap.dmaap.mr.trust.jks -cadi_truststore_password=enc:ZJTJokTnnggSrx50UnbYdngutGe5waqyFsp0_azMlzDTJAXTCwzvF6Q6ziQizTg5t - -cadi_keyfile=src/test/resources/org.onap.dmaap.mr.keyfile - +Challenge=enc:26N3deVSkeOeUORRKhI8aWTMLTGNMgO-EdGT7blB5O3XmNXtHcE4du9Bunz8k7O5 cadi_alias=dmaapmr@mr.dmaap.onap.org +cadi_key_password=enc:je9_4VCevykPfd24WLzQDzCqokPRfmNsyhwUC3mXcibPFhzvjmCKyws3-r-oZEqo +cadi_keyfile=src/test/resources/org.onap.dmaap.mr.keyfile cadi_keystore=src/test/resources/org.onap.dmaap.mr.p12 -cadi_keystore_password=Messaging for All -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US - - -cadi_loglevel=INFO +cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW +cadi_keystore_password_jks=enc:wi5LqsAIJ8W29tFYNiPMgJ86n9BAgOrlcOq2_xPNzb6F5M_r487_GLiQT4iIcXbb +cadi_keystore_password_p12=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW +cadi_truststore=src/test/resources/org.onap.dmaap.mr.trust.jks +cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 +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_protocols=TLSv1.1,TLSv1.2 cadi_latitude=37.78187 -cadi_longitude=-122.26147 \ No newline at end of file +cadi_longitude=-122.26147 diff --git a/src/test/resources/org.onap.dmaap.mr.keyfile b/src/test/resources/org.onap.dmaap.mr.keyfile index 8378bf2..88ae118 100644 --- a/src/test/resources/org.onap.dmaap.mr.keyfile +++ b/src/test/resources/org.onap.dmaap.mr.keyfile @@ -1,27 +1,27 @@ -zzu3HKkjlgpdSCZ8jXdbE-73NdF4ZNBlY3MrKZR976J6OWf9dnEjCupSKW2N34Y0vmQqJ2-wt5RL -1c5JkeQPoNi_MweVVqMCUbX21xzdUJU_esLqITFTIlrH3xeoaEPpwOv8CZFUiQkLYuK3ydBDQvCR -f1Qqvv9EvhRJ01XTt6hPjXWuvB9yDLbdogmFWK1tTsz6hP_QDOGQ-kDcNue27j_TRxnAJoZD_CIG -gZnjkjZozCZC2Ury5WeebP8o6KkgM3yRuXzLQoUyWFqLYq8KBvBRz0b3VA89-I5XCKqhv7PsPyYl -9_y2-sAgkYSyS6OnfBGSCRidZeliwfe2UROEgmj8LTSrtPlKX4leBU5POysZEWNcg8SzTmwA-Rln -JABy07SAWCnh7GHN-gb0f-oT0XxCRdg9JLLc_K3ULNxmSPDj2P_KeQkiQP0BVHelS0EM5HttWWII -LkkYjvYh0SAQKPmAM1Tqq6l9-zl5uzfRwV1jz7U7zs8thqwC7FSxYp5NZHJnbWqLyclsgAYbST2P -Uttlsk6ncniDEZSY9rtqMLIAWieaAA7EnljRHeJ15kKyyiGfA72Ne5eOcrGGoMcF5bFBQQu2Hv1N -6jnQU-MYbeNxunzvTSb9XC1buJq7HRmNue4Niiuqn_VZMHGqnUQl7Q3WJ9dRVGGXS3ZTYQRCEWSq -k_TzivXAyoFkcznDxbYOTXnu1AK5VGb806k2pK9mVxmLpMQ6uwSil9PTlZk5PB-dFXTo7sq8aSOH -6_uCFXM6Qa9Ux31ejXi4xTLz40rppOiXVBqeiI3HcfIJG2eJix8oDvDCx7y-feuQKOrpPQFgZKaV -mbFtRT11LrQFcfZtpmfGJ-CbwWz88g_jEGCzG7vZBZT7HjnSXDpCgOv2NLedwGuXpoZK3FEzFKIR -LwuCZ7T11_pzxE_Y6RzPKTCfOjBTmSf7zKfZSIoALHGEB-oF3hSmK2GgP8LU8pFkh0DVLXjcMnvw -b6tlRFXNCqnA8WJvemCowyNN5CEEQAwC1IOPVZkxkcLjwodWRXD3-oY3k6ZzRg3VkIlqwtTHlxkA -devSZ4Loq7IYKuAzx7GBNyeJwE34t69YrmbWuyN1X3NNZDm0W4u82Vee0frtCP6OrXRxpMHc_GRy -DAxVwaBwaNSqaXjNjBErtgwpqylkfCVFPSz2Xuf6tL1rQ3XGNDNUqTZo8ypAEUjTKN23LPtYeWZN -Wv0eVcaEbKsjhtvNvXGzRj_iG5Q1PisUBpFSfoOZIAjTC8yvUq9rT3fluCayskHo4T7k6gSmO9Xm -MW3C7QUB-Q5TlZmpCBEAYBz-OXPSYMe28mEru-TLlFE2CoNemDQtFXSnsj_bm1B-yD6BlnPUkcq5 -Gt5_49LU4198kNCdMIDogh9D2wUvCUU92I1CmhTaPxlRl556jEadysu_7gOKcS9RyUEup9WENzTP -4L_58A6cv6BjTPGu3bi_Gq7djkrMbCnCCOwY5g5v_Er0eshCE2fg8E1wpxsyLVigkc5FQ4U4_JZT -f12NxTpvnka3dVph0ms1eog8Tk8Oev_zi8q0jS27T14N2yGPMhrzxfUNSECtIJQiB2-UHU01bwzM -KLtWpchA4GwWaqv5MUGLs6Uwmh1YCoPSYEkO9omqoK2OrTp0jGDuufmYgYDh_P7LAJmZ4nwvMHYX -hdrUYV6fwjXYQd-kXH65TAFyt4TDsTkt1QdjjArksu2tXMVmSbh_jKt8oditYsfmO1ikikvIQROY -Jkb5BSH2GqBbF83eQrqdcNC3sGnAj-HS-CRSY2fCTFfvsQfH3nfQdcrBm9mk2itwpJEa4sowX6Rp -BhKJRtYcbWQY0DDNv6_Vt80jgn1n7cpA71yXZaCOlIgFrk7LUlJjGUGYC1OwPr2IYN0-Ut0ne5kD -t3ZkMoy0rVi1Dv_gdyg5SCEXGV_67OyIP6aOYgt-0N-1QIpfhF9irY5cT997MpGBmbHWYQaTRWyP -8tm9IpqMbwJQ-mtYU9AJezdVJyhGEAKJCbaYlbm1gB0aIXu0EkoPRJKiqRVUW88Y6zWnaqvD \ 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/test/resources/org.onap.dmaap.mr.p12 b/src/test/resources/org.onap.dmaap.mr.p12 index dd227ed..41c82b0 100644 Binary files a/src/test/resources/org.onap.dmaap.mr.p12 and b/src/test/resources/org.onap.dmaap.mr.p12 differ diff --git a/src/test/resources/org.onap.dmaap.mr.trust.jks b/src/test/resources/org.onap.dmaap.mr.trust.jks index 1873a7b..1a3d366 100644 Binary files a/src/test/resources/org.onap.dmaap.mr.trust.jks and b/src/test/resources/org.onap.dmaap.mr.trust.jks differ diff --git a/version.properties b/version.properties index 4b5fb6e..eccc573 100644 --- a/version.properties +++ b/version.properties @@ -26,7 +26,7 @@ major=1 minor=0 -patch=4 +patch=5 base_version=${major}.${minor}.${patch}