summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml2
-rw-r--r--src/main/docker/Dockerfile4
-rw-r--r--src/main/docker/cadi.properties10
-rw-r--r--src/main/docker/keyfilenew27
-rw-r--r--src/main/docker/org.onap.dmaap.mr.keyfile27
-rw-r--r--src/main/docker/org.onap.dmaap.mr.p12bin4056 -> 4237 bytes
-rw-r--r--src/main/docker/org.onap.dmaap.mr.trust.jksbin0 -> 1413 bytes
-rw-r--r--src/main/docker/start-kafka.sh4
-rw-r--r--src/main/docker/start-mirrormaker.sh4
-rw-r--r--src/main/docker/truststoreONAPall.jksbin114865 -> 0 bytes
-rw-r--r--src/test/resources/cadi.properties6
-rw-r--r--src/test/resources/keyfilenew27
-rw-r--r--src/test/resources/org.onap.dmaap.mr.keyfile27
-rw-r--r--src/test/resources/org.onap.dmaap.mr.p12bin4056 -> 4237 bytes
-rw-r--r--src/test/resources/org.onap.dmaap.mr.trust.jksbin0 -> 1413 bytes
-rw-r--r--src/test/resources/truststoreONAPall.jksbin114865 -> 0 bytes
-rw-r--r--version.properties2
17 files changed, 70 insertions, 70 deletions
diff --git a/pom.xml b/pom.xml
index 17b2c6e..2e8ad24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.onap.dmaap.kafka</groupId>
<artifactId>kafka11aaf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>dmaap-kafka</name>
<licenses>
<license>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 4a18779..46343cf 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -9,9 +9,9 @@ RUN apk add --update unzip wget curl docker jq coreutils
ENV KAFKA_VERSION=$kafka_version SCALA_VERSION=$scala_version
ADD download-kafka.sh /tmp/download-kafka.sh
ADD kafka_server_jaas.conf /tmp/kafka_server_jaas.conf
-ADD truststoreONAPall.jks /tmp/truststoreONAPall.jks
+ADD org.onap.dmaap.mr.trust.jks /tmp/org.onap.dmaap.mr.trust.jks
ADD org.onap.dmaap.mr.p12 /tmp/org.onap.dmaap.mr.p12
-ADD keyfilenew /tmp/keyfilenew
+ADD org.onap.dmaap.mr.keyfile /tmp/org.onap.dmaap.mr.keyfile
ADD cadi.properties /tmp/cadi.properties
ADD mmagent.config /opt/etc/mmagent.config
ADD consumer.properties /opt/etc/consumer.properties
diff --git a/src/main/docker/cadi.properties b/src/main/docker/cadi.properties
index db1b8fc..1c7b078 100644
--- a/src/main/docker/cadi.properties
+++ b/src/main/docker/cadi.properties
@@ -3,15 +3,15 @@ aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
aaf_env=DEV
aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
-cadi_truststore=/opt/kafka/config/truststoreONAPall.jks
-cadi_truststore_password=changeit
+cadi_truststore=/opt/kafka/config/org.onap.dmaap.mr.trust.jks
+cadi_truststore_password=enc:ZJTJokTnnggSrx50UnbYdngutGe5waqyFsp0_azMlzDTJAXTCwzvF6Q6ziQizTg5t
-cadi_keyfile=/opt/kafka/config/keyfilenew
+cadi_keyfile=/opt/kafka/config/org.onap.dmaap.mr.keyfile
cadi_alias=dmaapmr@mr.dmaap.onap.org
cadi_keystore=/opt/kafka/config/org.onap.dmaap.mr.p12
-cadi_keystore_password=Messaging for All
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
+cadi_keystore_password=enc:CU41isfR3XSajVxbx44cK5AYOLgSgCPdPkDoGcqKtvoYDIdT2gT4Jb7DwIRoxYcy
+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/docker/keyfilenew b/src/main/docker/keyfilenew
deleted file mode 100644
index 884375f..0000000
--- a/src/main/docker/keyfilenew
+++ /dev/null
@@ -1,27 +0,0 @@
-Riwh4gx5yeqp3KFVdmuREXNlB2ie9JSWKRBR08cNhaubYzsoAlCgOYu8g1OuA735u59jaRwAtLxt
-5m3aMD5MJZ1ItS4x6CeGCKQ0X3F3OzDRsIv-6iDBhlKdOX9pdR8UF7CBqgqbDmvhg3D-h2JcoYJ4
-uzCPI0ZMXeUELkB3l1ZyhsiDrI892AL_VOxQhhsZk1E3P4UFmhfy_579OCVRVhC38xvL0vrtWkHK
-5-1wO3enzrt_p2Jrv-LTgNHTwLF7djyesb55FC9VlTqCrvIomBXvG6NaFuy9_tNJ507ees1_KfTh
-4_BVWfZwoXx8ZXWG9_Pu-S8qKn-f8HtgbJnvAW9wze0H7jpRmOQ1nattTqq7sUTgBT-gzzMsFFH9
-61Mwf_OZc41PneLK9ajy8AzvffPVbW_KNssUC96X6DEkzjrk--fN6uE1VMJVK515smSV0bpcbD6e
-o5GRC2xaa6t3IpZ6Z4f08Dxgob5oyWPKNYKSdcvIgp_HT6oJ7m4TovOQm23ZuuLsGAz9My1pJn42
-fcug_tR2sVSzTYTO9mEAEfRRhPQAWYpAFxclb08Frd-ZOy9V9epsJwLE1tFxjNX31lkFb5G-i0MP
-ZHhtDpIlHM_CvX3tlKrJWMSA91JIfZ0E1mXEkrG9Tzz8jifoijzM_rTvAQf5RQqqAhiuEMSjZeVV
-UoKhEp9duhsJCwNelgpjbAvthYa-InQhC9b4FmMWN0QnhUddb8dw_cNOIfuQu8i38qm9MmkGBSD3
-6dS4Ly6XXqAfz7j7TjrqDJfYWaYRa3OkE2I1jxwo-3IUkKLah9gYKX_FkaNlObHN1c1A5uQ4wJVK
-FAkd98e4vr3UiY6wuKBgKeE-wwU0mUK1lRVmb5fwrsVmCUPOXO8wZZxtjmJddB08jkACyLbHEMg2
-U5fKBpaqq_9DQxnLvd0-ydNcVxYgiTCB9vsmIJ38maLROARmUtfiuuZD-cwOLnDzRkTmARwwxPks
-6ea0cpx-SckhwZHuavq4DLGYbsk-pXToia-M6pPf9rW8qQqeMyUBg4c3--unHBSajT0UxPSbiFrL
-9pxwVeUBulB4j1BtLOPhQaAXHTWpD-85n6ecPEYfpIK73_S7fLBfUD1gyQ6tZj4VYjoSfGKAFStE
-zCUMvryARBNVFJ0ENq-xKyst_M4V3WjcIeiLW3LmjByk-aymys-e8mUL_tcn_MO9pCktAr1xu5Yx
-wBcBOrFlB2UP8Im7vBHbGgf77ssqyxy5_cJhaO9MBKUx5KZQw9eE9ePf6UvELTev7Urhla4QKUm9
-AMemzy2RvC2ghZeh7fzBahbZpRM3vDDm4IhbcZavA2d2DEgq8c0AUhlPYE-LCv2BOKBeUEkGULxU
-29uIc8LkcLHh37WHmJOjVbH9gB9enHH0sBf9cnv7A70R1evSWeHn0ty9vVXPOLODSQGqbB40qAhQ
-MEsRt-13WUAlHjosA7yj2zHTLMeuSqqPuPeiyGPtblkWUC-gpEJxgK8hTb1LzoZVZeteqgdMKlde
-Q0gmI_0CX5RtCjITSlHaKxzw6ly9qqv52GZVpAYlu2SWeFdlCg9txh2ke0x3rTMKsM8i0ccCdmLq
-E60akH2bPa4vB7zRiu3im-IVli9V8zz8U2roQrfN08IJCAatSQRVfUiyAAJkOEcghuHmaErA-kD8
-fu0sWuAHsEgKBtfaeOu5OFeyeLmNRiPKpVotMyDHrEjjBW-TVTppWwgN5Utmx80RghSmzwUjglyG
-3aaM3iJqp8xvgtlLtoJkq2A8rMbw0eAQ7I33hAn-jfBkmjsVkzsVgffe5xqGA1DDYm1lTkv4OjFX
-_tTzYfN2V1BtYNUN_edhQRMsNh5-mpZwOeb5JpdJQFZUXaFtwDedx_sqe54NEJ4jV7w4up7H0MXp
-WTazMQmwRzsLTs1U8zeJ0Ib0LAb4EsX6DML3Ue87nmYCj450KE9DM0tYGWn13jiGWoDEhW4noi2X
-gkcjwIcM-87wwvsb-rMIOdo2DXQee8zKzB51N4YAn4VBUfjXVMhjjSwg40yHlzKQE0hAOuJN \ No newline at end of file
diff --git a/src/main/docker/org.onap.dmaap.mr.keyfile b/src/main/docker/org.onap.dmaap.mr.keyfile
new file mode 100644
index 0000000..8378bf2
--- /dev/null
+++ b/src/main/docker/org.onap.dmaap.mr.keyfile
@@ -0,0 +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
diff --git a/src/main/docker/org.onap.dmaap.mr.p12 b/src/main/docker/org.onap.dmaap.mr.p12
index 79549ed..dd227ed 100644
--- a/src/main/docker/org.onap.dmaap.mr.p12
+++ b/src/main/docker/org.onap.dmaap.mr.p12
Binary files differ
diff --git a/src/main/docker/org.onap.dmaap.mr.trust.jks b/src/main/docker/org.onap.dmaap.mr.trust.jks
new file mode 100644
index 0000000..1873a7b
--- /dev/null
+++ b/src/main/docker/org.onap.dmaap.mr.trust.jks
Binary files differ
diff --git a/src/main/docker/start-kafka.sh b/src/main/docker/start-kafka.sh
index 3065bad..6c58b74 100644
--- a/src/main/docker/start-kafka.sh
+++ b/src/main/docker/start-kafka.sh
@@ -135,8 +135,8 @@ if [[ -n "$CUSTOM_INIT_SCRIPT" ]] ; then
eval $CUSTOM_INIT_SCRIPT
fi
cp /tmp/kafka11aaf-jar-with-dependencies.jar $KAFKA_HOME/libs
-cp /tmp/keyfilenew $KAFKA_HOME/config
-cp /tmp/truststoreONAPall.jks $KAFKA_HOME/config
+cp /tmp/org.onap.dmaap.mr.keyfile $KAFKA_HOME/config
+cp /tmp/org.onap.dmaap.mr.trust.jks $KAFKA_HOME/config
cp /tmp/org.onap.dmaap.mr.p12 $KAFKA_HOME/config
cp /tmp/kafka_server_jaas.conf $KAFKA_HOME/config
cp /tmp/cadi.properties $KAFKA_HOME/config
diff --git a/src/main/docker/start-mirrormaker.sh b/src/main/docker/start-mirrormaker.sh
index 0e9100f..355bac0 100644
--- a/src/main/docker/start-mirrormaker.sh
+++ b/src/main/docker/start-mirrormaker.sh
@@ -134,8 +134,8 @@ if [[ -n "$CUSTOM_INIT_SCRIPT" ]] ; then
eval $CUSTOM_INIT_SCRIPT
fi
cp /tmp/kafka11aaf-jar-with-dependencies.jar $KAFKA_HOME/libs
-cp /tmp/keyfilenew $KAFKA_HOME/config
-cp /tmp/truststoreONAPall.jks $KAFKA_HOME/config
+cp /tmp/org.onap.dmaap.mr.keyfile $KAFKA_HOME/config
+cp /tmp/org.onap.dmaap.mr.trust.jks $KAFKA_HOME/config
cp /tmp/org.onap.dmaap.mr.p12 $KAFKA_HOME/config
cp /tmp/kafka_server_jaas.conf $KAFKA_HOME/config
cp /tmp/cadi.properties $KAFKA_HOME/config
diff --git a/src/main/docker/truststoreONAPall.jks b/src/main/docker/truststoreONAPall.jks
deleted file mode 100644
index 2da1dcc..0000000
--- a/src/main/docker/truststoreONAPall.jks
+++ /dev/null
Binary files differ
diff --git a/src/test/resources/cadi.properties b/src/test/resources/cadi.properties
index 4ce7689..eb7e8ca 100644
--- a/src/test/resources/cadi.properties
+++ b/src/test/resources/cadi.properties
@@ -3,10 +3,10 @@ aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
aaf_env=DEV
aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
-cadi_truststore=src/test/resources/truststoreONAPall.jks
-cadi_truststore_password=changeit
+cadi_truststore=src/test/resources/org.onap.dmaap.mr.trust.jks
+cadi_truststore_password=enc:ZJTJokTnnggSrx50UnbYdngutGe5waqyFsp0_azMlzDTJAXTCwzvF6Q6ziQizTg5t
-cadi_keyfile=src/test/resources/keyfilenew
+cadi_keyfile=src/test/resources/org.onap.dmaap.mr.keyfile
cadi_alias=dmaapmr@mr.dmaap.onap.org
cadi_keystore=src/test/resources/org.onap.dmaap.mr.p12
diff --git a/src/test/resources/keyfilenew b/src/test/resources/keyfilenew
deleted file mode 100644
index 884375f..0000000
--- a/src/test/resources/keyfilenew
+++ /dev/null
@@ -1,27 +0,0 @@
-Riwh4gx5yeqp3KFVdmuREXNlB2ie9JSWKRBR08cNhaubYzsoAlCgOYu8g1OuA735u59jaRwAtLxt
-5m3aMD5MJZ1ItS4x6CeGCKQ0X3F3OzDRsIv-6iDBhlKdOX9pdR8UF7CBqgqbDmvhg3D-h2JcoYJ4
-uzCPI0ZMXeUELkB3l1ZyhsiDrI892AL_VOxQhhsZk1E3P4UFmhfy_579OCVRVhC38xvL0vrtWkHK
-5-1wO3enzrt_p2Jrv-LTgNHTwLF7djyesb55FC9VlTqCrvIomBXvG6NaFuy9_tNJ507ees1_KfTh
-4_BVWfZwoXx8ZXWG9_Pu-S8qKn-f8HtgbJnvAW9wze0H7jpRmOQ1nattTqq7sUTgBT-gzzMsFFH9
-61Mwf_OZc41PneLK9ajy8AzvffPVbW_KNssUC96X6DEkzjrk--fN6uE1VMJVK515smSV0bpcbD6e
-o5GRC2xaa6t3IpZ6Z4f08Dxgob5oyWPKNYKSdcvIgp_HT6oJ7m4TovOQm23ZuuLsGAz9My1pJn42
-fcug_tR2sVSzTYTO9mEAEfRRhPQAWYpAFxclb08Frd-ZOy9V9epsJwLE1tFxjNX31lkFb5G-i0MP
-ZHhtDpIlHM_CvX3tlKrJWMSA91JIfZ0E1mXEkrG9Tzz8jifoijzM_rTvAQf5RQqqAhiuEMSjZeVV
-UoKhEp9duhsJCwNelgpjbAvthYa-InQhC9b4FmMWN0QnhUddb8dw_cNOIfuQu8i38qm9MmkGBSD3
-6dS4Ly6XXqAfz7j7TjrqDJfYWaYRa3OkE2I1jxwo-3IUkKLah9gYKX_FkaNlObHN1c1A5uQ4wJVK
-FAkd98e4vr3UiY6wuKBgKeE-wwU0mUK1lRVmb5fwrsVmCUPOXO8wZZxtjmJddB08jkACyLbHEMg2
-U5fKBpaqq_9DQxnLvd0-ydNcVxYgiTCB9vsmIJ38maLROARmUtfiuuZD-cwOLnDzRkTmARwwxPks
-6ea0cpx-SckhwZHuavq4DLGYbsk-pXToia-M6pPf9rW8qQqeMyUBg4c3--unHBSajT0UxPSbiFrL
-9pxwVeUBulB4j1BtLOPhQaAXHTWpD-85n6ecPEYfpIK73_S7fLBfUD1gyQ6tZj4VYjoSfGKAFStE
-zCUMvryARBNVFJ0ENq-xKyst_M4V3WjcIeiLW3LmjByk-aymys-e8mUL_tcn_MO9pCktAr1xu5Yx
-wBcBOrFlB2UP8Im7vBHbGgf77ssqyxy5_cJhaO9MBKUx5KZQw9eE9ePf6UvELTev7Urhla4QKUm9
-AMemzy2RvC2ghZeh7fzBahbZpRM3vDDm4IhbcZavA2d2DEgq8c0AUhlPYE-LCv2BOKBeUEkGULxU
-29uIc8LkcLHh37WHmJOjVbH9gB9enHH0sBf9cnv7A70R1evSWeHn0ty9vVXPOLODSQGqbB40qAhQ
-MEsRt-13WUAlHjosA7yj2zHTLMeuSqqPuPeiyGPtblkWUC-gpEJxgK8hTb1LzoZVZeteqgdMKlde
-Q0gmI_0CX5RtCjITSlHaKxzw6ly9qqv52GZVpAYlu2SWeFdlCg9txh2ke0x3rTMKsM8i0ccCdmLq
-E60akH2bPa4vB7zRiu3im-IVli9V8zz8U2roQrfN08IJCAatSQRVfUiyAAJkOEcghuHmaErA-kD8
-fu0sWuAHsEgKBtfaeOu5OFeyeLmNRiPKpVotMyDHrEjjBW-TVTppWwgN5Utmx80RghSmzwUjglyG
-3aaM3iJqp8xvgtlLtoJkq2A8rMbw0eAQ7I33hAn-jfBkmjsVkzsVgffe5xqGA1DDYm1lTkv4OjFX
-_tTzYfN2V1BtYNUN_edhQRMsNh5-mpZwOeb5JpdJQFZUXaFtwDedx_sqe54NEJ4jV7w4up7H0MXp
-WTazMQmwRzsLTs1U8zeJ0Ib0LAb4EsX6DML3Ue87nmYCj450KE9DM0tYGWn13jiGWoDEhW4noi2X
-gkcjwIcM-87wwvsb-rMIOdo2DXQee8zKzB51N4YAn4VBUfjXVMhjjSwg40yHlzKQE0hAOuJN \ No newline at end of file
diff --git a/src/test/resources/org.onap.dmaap.mr.keyfile b/src/test/resources/org.onap.dmaap.mr.keyfile
new file mode 100644
index 0000000..8378bf2
--- /dev/null
+++ b/src/test/resources/org.onap.dmaap.mr.keyfile
@@ -0,0 +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
diff --git a/src/test/resources/org.onap.dmaap.mr.p12 b/src/test/resources/org.onap.dmaap.mr.p12
index 79549ed..dd227ed 100644
--- a/src/test/resources/org.onap.dmaap.mr.p12
+++ b/src/test/resources/org.onap.dmaap.mr.p12
Binary files differ
diff --git a/src/test/resources/org.onap.dmaap.mr.trust.jks b/src/test/resources/org.onap.dmaap.mr.trust.jks
new file mode 100644
index 0000000..1873a7b
--- /dev/null
+++ b/src/test/resources/org.onap.dmaap.mr.trust.jks
Binary files differ
diff --git a/src/test/resources/truststoreONAPall.jks b/src/test/resources/truststoreONAPall.jks
deleted file mode 100644
index 2da1dcc..0000000
--- a/src/test/resources/truststoreONAPall.jks
+++ /dev/null
Binary files differ
diff --git a/version.properties b/version.properties
index 65e7bbc..0e900e1 100644
--- a/version.properties
+++ b/version.properties
@@ -26,7 +26,7 @@
major=1
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}