From 47cf048f30abd3bdd675f1398f88c370f90c5943 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Fri, 5 Mar 2021 14:39:00 +0000
Subject: [PATCH] [DMAAP-KAFKA] Update certs etc

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I92b5c6a2dc39cf99814ae557a63affe372856562
Issue-ID: DMAAP-1565
---
 pom.xml                                        |   7 +++-
 src/main/docker/Dockerfile                     |   6 ++-
 src/main/docker/cadi.properties                |   4 +-
 src/test/resources/cadi.properties             |  26 ++++++------
 src/test/resources/org.onap.dmaap.mr.keyfile   |  54 ++++++++++++-------------
 src/test/resources/org.onap.dmaap.mr.p12       | Bin 4237 -> 4261 bytes
 src/test/resources/org.onap.dmaap.mr.trust.jks | Bin 1413 -> 1413 bytes
 version.properties                             |   2 +-
 8 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index b04e48f..324a075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
@@ -52,6 +52,11 @@
 
         	</resources> 
 		<plugins>
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.6.0.1398</version>
+			</plugin>
 		    <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
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 dd227ed582e27b66f570bbbb92ac95d63baa555f..41c82b0cb2eab3a0fa77173d07cffc1de4f2b126 100644
GIT binary patch
delta 4161
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
L-?9+`0|ADh4CwfT

delta 4136
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

diff --git a/src/test/resources/org.onap.dmaap.mr.trust.jks b/src/test/resources/org.onap.dmaap.mr.trust.jks
index 1873a7b49b5cc2f77e7ef66ee8aeb33c9f60b337..1a3d3666c94298398fbbf1eaae3a2b2ef3029153 100644
GIT binary patch
delta 37
tcmZqWZsndJ&szTDF;D776<=17#e2>+CNf%oFk051k^F9N*s+7D>;M~q5HkP(

delta 37
vcmV+=0NVeB3xx}i9|dZA0Pzj6Buxbrm&~?d^BI+vQ2T?l@2igb{)>VZ76=h(

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}
 
-- 
2.16.6