From 78657b0693906a4070854decf7012417c216b84c Mon Sep 17 00:00:00 2001 From: eronkeo Date: Wed, 27 Feb 2019 09:20:43 +0000 Subject: Renew AAF certs for DMaaP DR - Casablanca Change-Id: I18d8905cad2e2ae872bf459989f30dbe1b0b2459 Issue-ID: DMAAP-1065 Signed-off-by: eronkeo --- datarouter-docker-compose/pom.xml | 2 +- .../src/main/resources/docker-compose.yml | 6 +++--- .../node_data/aaf_certs/org.onap.dmaap-dr.jks | Bin 3659 -> 3645 bytes .../node_data/aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../src/main/resources/node_data/node.properties | 10 +++++----- .../prov_data/aaf_certs/org.onap.dmaap-dr.jks | Bin 3660 -> 3645 bytes .../prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../main/resources/prov_data/provserver.properties | 6 +++--- datarouter-node/aaf_certs/org.onap.dmaap-dr.jks | Bin 3659 -> 3645 bytes datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes datarouter-node/pom.xml | 2 +- datarouter-node/src/main/resources/node.properties | 8 ++++---- datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks | Bin 3660 -> 3645 bytes datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes datarouter-prov/pom.xml | 2 +- .../src/main/resources/provserver.properties | 6 +++--- datarouter-subscriber/pom.xml | 2 +- pom.xml | 2 +- version.properties | 4 ++-- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/datarouter-docker-compose/pom.xml b/datarouter-docker-compose/pom.xml index 37789d35..0c185e7c 100644 --- a/datarouter-docker-compose/pom.xml +++ b/datarouter-docker-compose/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT ../pom.xml datarouter-docker-compose diff --git a/datarouter-docker-compose/src/main/resources/docker-compose.yml b/datarouter-docker-compose/src/main/resources/docker-compose.yml index beb79a0f..aaf913ed 100644 --- a/datarouter-docker-compose/src/main/resources/docker-compose.yml +++ b/datarouter-docker-compose/src/main/resources/docker-compose.yml @@ -24,7 +24,7 @@ version: '2.1' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:1.0.8-SNAPSHOT container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -49,7 +49,7 @@ services: - dmaap-dr-prov datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:1.0.8-SNAPSHOT container_name: datarouter-node hostname: dmaap-dr-node ports: @@ -66,7 +66,7 @@ services: - dmaap-dr-node datarouter-subscriber: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber + image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:1.0.8-SNAPSHOT container_name: subscriber-node hostname: subscriber.com ports: diff --git a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks index 4529cccb..4bbd3580 100755 Binary files a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks and b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks differ diff --git a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks index 096fbb26..db9eae39 100755 Binary files a/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks and b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks differ diff --git a/datarouter-docker-compose/src/main/resources/node_data/node.properties b/datarouter-docker-compose/src/main/resources/node_data/node.properties index 03096570..d0b1c337 100644 --- a/datarouter-docker-compose/src/main/resources/node_data/node.properties +++ b/datarouter-docker-compose/src/main/resources/node_data/node.properties @@ -2,7 +2,7 @@ # ============LICENSE_START================================================== # * org.onap.dmaap # * =========================================================================== -# * Copyright � 2017 AT&T Intellectual Property. All rights reserved. +# * Copyright © 2017 AT&T Intellectual Property. All rights reserved. # * Modifications Copyright (C) 2018 Nokia. All rights reserved. # * =========================================================================== # * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ # # Configuration parameters fixed at startup for the DataRouter node # -# URL to retrieve dynamic configuration +# URL to retrieve dynamic configurationq # #ProvisioningURL: ${DRTR_PROV_INTURL} ProvisioningURL=https://dmaap-dr-prov:8443/internal/prov @@ -83,11 +83,11 @@ KeyStoreFile:/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks # # The password for the https keystore # -KeyStorePassword=4*&GD+w58RUM]01No.CYY;z6 +KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL # # The password for the private key in the https keystore # -KeyPassword=4*&GD+w58RUM]01No.CYY;z6 +KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL # # The type of truststore for https # @@ -100,7 +100,7 @@ TrustStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks # # The password for the https truststore # -TrustStorePassword=UDXlT6Iu[F)k,Htk92+B,0Xj +TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g # # The path to the file used to trigger an orderly shutdown # diff --git a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks index 155991ab..509004c5 100755 Binary files a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks and b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks differ diff --git a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks index c8f9ee66..987706d5 100755 Binary files a/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks and b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks differ diff --git a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties index c37bd4fb..7e38f287 100755 --- a/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties +++ b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties @@ -28,11 +28,11 @@ org.onap.dmaap.datarouter.provserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true org.onap.dmaap.datarouter.provserver.keystore.type = jks -org.onap.dmaap.datarouter.provserver.keymanager.password = Qgw77oaQcdP*F8Pwa[&.,.Ab +org.onap.dmaap.datarouter.provserver.keymanager.password = AT{];bvaDiytVD&oWhMZj0N5 org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -org.onap.dmaap.datarouter.provserver.keystore.password = Qgw77oaQcdP*F8Pwa[&.,.Ab +org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5 org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -org.onap.dmaap.datarouter.provserver.truststore.password = 9M?)?:KAj1z6gpLhNrVUG@0T +org.onap.dmaap.datarouter.provserver.truststore.password = ljlS@Y}0]{UO(TnwvEWkgJ%] org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks index 4529cccb..4bbd3580 100644 Binary files a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks and b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks differ diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks index 096fbb26..db9eae39 100644 Binary files a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks and b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks differ diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 6d56d373..7343c33e 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT ../pom.xml datarouter-node diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties index de38cb6f..8b5568bc 100644 --- a/datarouter-node/src/main/resources/node.properties +++ b/datarouter-node/src/main/resources/node.properties @@ -2,7 +2,7 @@ # ============LICENSE_START================================================== # * org.onap.dmaap # * =========================================================================== -# * Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# * Copyright © 2017 AT&T Intellectual Property. All rights reserved. # * =========================================================================== # * Licensed under the Apache License, Version 2.0 (the "License"); # * you may not use this file except in compliance with the License. @@ -82,11 +82,11 @@ KeyStoreFile:/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks # # The password for the https keystore # -KeyStorePassword=4*&GD+w58RUM]01No.CYY;z6 +KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL # # The password for the private key in the https keystore # -KeyPassword=4*&GD+w58RUM]01No.CYY;z6 +KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL # # The type of truststore for https # @@ -99,7 +99,7 @@ TrustStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks # # The password for the https truststore # -TrustStorePassword=UDXlT6Iu[F)k,Htk92+B,0Xj +TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g # # The path to the file used to trigger an orderly shutdown # diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks index 155991ab..509004c5 100755 Binary files a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks and b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks differ diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks index c8f9ee66..987706d5 100755 Binary files a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks and b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks differ diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 3b04cfa8..a952b462 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT ../pom.xml datarouter-prov diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties index 84218b9f..4dcdee5f 100755 --- a/datarouter-prov/src/main/resources/provserver.properties +++ b/datarouter-prov/src/main/resources/provserver.properties @@ -27,11 +27,11 @@ org.onap.dmaap.datarouter.provserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true org.onap.dmaap.datarouter.provserver.keystore.type = jks -org.onap.dmaap.datarouter.provserver.keymanager.password = Qgw77oaQcdP*F8Pwa[&.,.Ab +org.onap.dmaap.datarouter.provserver.keymanager.password = AT{];bvaDiytVD&oWhMZj0N5 org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -org.onap.dmaap.datarouter.provserver.keystore.password = Qgw77oaQcdP*F8Pwa[&.,.Ab +org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5 org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -org.onap.dmaap.datarouter.provserver.truststore.password = 9M?)?:KAj1z6gpLhNrVUG@0T +org.onap.dmaap.datarouter.provserver.truststore.password = ljlS@Y}0]{UO(TnwvEWkgJ%] org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml index 7405ee78..25d6a0f0 100755 --- a/datarouter-subscriber/pom.xml +++ b/datarouter-subscriber/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT ../pom.xml datarouter-subscriber diff --git a/pom.xml b/pom.xml index f797910b..94c48aa6 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.onap.dmaap.datarouter parent dmaap-datarouter - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT pom https://github.com/att/DMAAP_DATAROUTER diff --git a/version.properties b/version.properties index 89968437..239c94be 100644 --- a/version.properties +++ b/version.properties @@ -27,10 +27,10 @@ major=1 minor=0 -patch=7 +patch=8 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg