aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreconwar <conor.ward@est.tech>2019-04-01 12:57:12 +0000
committereconwar <conor.ward@est.tech>2019-04-01 12:57:12 +0000
commit41b406aa9a9ed6dcba19bc71e03acbcc1def57fb (patch)
tree7c9508f1da8419ea2a4e4bee8cd82a1a1978121d
parent4bec31c557c4d5186c1986e30074f796232fef6a (diff)
Update AAF certs with year duration1.0.9
Change-Id: If5b19ccfa40194c9bd15ecf6adce36e48338c04a Issue-ID: DMAAP-1065 Signed-off-by: econwar <conor.ward@est.tech>
-rw-r--r--datarouter-docker-compose/pom.xml2
-rw-r--r--datarouter-docker-compose/src/main/resources/docker-compose.yml6
-rw-r--r--[-rwxr-xr-x]datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jksbin3645 -> 3647 bytes
-rw-r--r--[-rwxr-xr-x]datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rw-r--r--datarouter-docker-compose/src/main/resources/node_data/node.properties6
-rw-r--r--[-rwxr-xr-x]datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jksbin3645 -> 3647 bytes
-rw-r--r--[-rwxr-xr-x]datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/prov_data/provserver.properties6
-rw-r--r--datarouter-node/aaf_certs/org.onap.dmaap-dr.jksbin3645 -> 3647 bytes
-rw-r--r--datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rwxr-xr-xdatarouter-node/pom.xml2
-rw-r--r--datarouter-node/src/main/resources/node.properties6
-rw-r--r--[-rwxr-xr-x]datarouter-prov/aaf_certs/org.onap.dmaap-dr.jksbin3645 -> 3647 bytes
-rw-r--r--[-rwxr-xr-x]datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rwxr-xr-xdatarouter-prov/pom.xml2
-rwxr-xr-xdatarouter-prov/src/main/resources/provserver.properties6
-rwxr-xr-xdatarouter-subscriber/pom.xml2
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties2
19 files changed, 21 insertions, 21 deletions
diff --git a/datarouter-docker-compose/pom.xml b/datarouter-docker-compose/pom.xml
index 0c185e7c..6a405463 100644
--- a/datarouter-docker-compose/pom.xml
+++ b/datarouter-docker-compose/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>datarouter-docker-compose</artifactId>
diff --git a/datarouter-docker-compose/src/main/resources/docker-compose.yml b/datarouter-docker-compose/src/main/resources/docker-compose.yml
index aaf913ed..04b5765f 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:1.0.8-SNAPSHOT
+ image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:1.0.9-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:1.0.8-SNAPSHOT
+ image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:1.0.9-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:1.0.8-SNAPSHOT
+ image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:1.0.9-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 4bbd3580..2320dc9f 100755..100644
--- 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
Binary files 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 db9eae39..808c1b92 100755..100644
--- 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
Binary files 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 d0b1c337..15fd394d 100644
--- a/datarouter-docker-compose/src/main/resources/node_data/node.properties
+++ b/datarouter-docker-compose/src/main/resources/node_data/node.properties
@@ -83,11 +83,11 @@ KeyStoreFile:/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
#
# The password for the https keystore
#
-KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
#
# The password for the private key in the https keystore
#
-KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
#
# 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=(Rd,&{]%ePdp}4JZjqoJ2G+g
+TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
#
# 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 509004c5..17027970 100755..100644
--- 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
Binary files 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 987706d5..2fe06cd2 100755..100644
--- 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
Binary files 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 7e38f287..e01370db 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 = AT{];bvaDiytVD&oWhMZj0N5
+org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX
org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5
+org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX
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 = ljlS@Y}0]{UO(TnwvEWkgJ%]
+org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b
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 4bbd3580..2320dc9f 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
Binary files 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 db9eae39..808c1b92 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 7343c33e..f0d99791 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>datarouter-node</artifactId>
diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties
index 8b5568bc..f67b6c8d 100644
--- a/datarouter-node/src/main/resources/node.properties
+++ b/datarouter-node/src/main/resources/node.properties
@@ -82,11 +82,11 @@ KeyStoreFile:/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
#
# The password for the https keystore
#
-KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
#
# The password for the private key in the https keystore
#
-KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
#
# 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=(Rd,&{]%ePdp}4JZjqoJ2G+g
+TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
#
# 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 509004c5..17027970 100755..100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
Binary files 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 987706d5..2fe06cd2 100755..100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index a952b462..5ba105b6 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>datarouter-prov</artifactId>
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 4dcdee5f..9e246ba3 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 = AT{];bvaDiytVD&oWhMZj0N5
+org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX
org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-org.onap.dmaap.datarouter.provserver.keystore.password = AT{];bvaDiytVD&oWhMZj0N5
+org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX
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 = ljlS@Y}0]{UO(TnwvEWkgJ%]
+org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b
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 25d6a0f0..310b0dd2 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>datarouter-subscriber</artifactId>
diff --git a/pom.xml b/pom.xml
index 94c48aa6..28327760 100755
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
<name>dmaap-datarouter</name>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<packaging>pom</packaging>
<url>https://github.com/att/DMAAP_DATAROUTER</url>
<parent>
diff --git a/version.properties b/version.properties
index 239c94be..1f07a097 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=8
+patch=9
base_version=${major}.${minor}.${patch}