From 2bafd089d8e01fb0ec49406a8afb2b7260105e2c Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Wed, 25 Mar 2020 17:22:41 +0100 Subject: Updated the sdc cert Also bumping project version Issue-ID: SDC-2855 Signed-off-by: Krystian Kedron Change-Id: I6f53b77b3ba8e229800fa7414a0ed555decda4e9 --- dcaedt_be/pom.xml | 2 +- dcaedt_catalog/api/pom.xml | 2 +- dcaedt_catalog/asdc/pom.xml | 2 +- dcaedt_catalog/commons/pom.xml | 2 +- dcaedt_catalog/db/pom.xml | 2 +- dcaedt_catalog/pom.xml | 2 +- dcaedt_catalog/service/pom.xml | 2 +- dcaedt_tools/pom.xml | 2 +- dcaedt_validator/checker/pom.xml | 2 +- dcaedt_validator/kwalify/pom.xml | 2 +- dcaedt_validator/pom.xml | 2 +- .../cookbooks/Deploy-DCAE/attributes/default.rb | 6 +++--- .../Deploy-DCAE/files/default/org.onap.sdc.p12 | Bin 4459 -> 4443 bytes .../Deploy-DCAE/files/default/org.onap.sdc.trust.jks | Bin 1413 -> 1413 bytes docker/docker_be/startup.sh | 2 +- .../Deploy-DCAE/files/default/org.onap.sdc.trust.jks | Bin 1413 -> 1413 bytes docker/docker_tools/startup.sh | 2 +- pom.xml | 2 +- version.properties | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml index 3e8aaeb..44afc9f 100644 --- a/dcaedt_be/pom.xml +++ b/dcaedt_be/pom.xml @@ -9,7 +9,7 @@ org.onap.sdc.dcae-d.dt-be-main dcae_dt_be_main - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml index 93bc8c2..96719a9 100644 --- a/dcaedt_catalog/api/pom.xml +++ b/dcaedt_catalog/api/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Catalog - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Catalog-API jar diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml index 83c57eb..9223846 100644 --- a/dcaedt_catalog/asdc/pom.xml +++ b/dcaedt_catalog/asdc/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Catalog - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Catalog-ASDC jar diff --git a/dcaedt_catalog/commons/pom.xml b/dcaedt_catalog/commons/pom.xml index 3423a12..755e228 100644 --- a/dcaedt_catalog/commons/pom.xml +++ b/dcaedt_catalog/commons/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Catalog - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Catalog-Commons jar diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml index 68aed27..b44e861 100644 --- a/dcaedt_catalog/db/pom.xml +++ b/dcaedt_catalog/db/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Catalog - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Catalog-DB jar diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml index e795149..2e48ee9 100644 --- a/dcaedt_catalog/pom.xml +++ b/dcaedt_catalog/pom.xml @@ -9,7 +9,7 @@ org.onap.sdc.dcae-d.dt-be-main dcae_dt_be_main - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT commons diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml index f153e2b..4c5f8e7 100644 --- a/dcaedt_catalog/service/pom.xml +++ b/dcaedt_catalog/service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Catalog - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Catalog-Service jar diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml index 2afb5df..334e8e5 100644 --- a/dcaedt_tools/pom.xml +++ b/dcaedt_tools/pom.xml @@ -8,7 +8,7 @@ org.onap.sdc.dcae-d.dt-be-main dcae_dt_be_main - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml index daf6f10..acd5d3a 100644 --- a/dcaedt_validator/checker/pom.xml +++ b/dcaedt_validator/checker/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Validator - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT DCAE-DT-Validator-Checker jar diff --git a/dcaedt_validator/kwalify/pom.xml b/dcaedt_validator/kwalify/pom.xml index 552cee7..4eeb68b 100644 --- a/dcaedt_validator/kwalify/pom.xml +++ b/dcaedt_validator/kwalify/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.dcae-d.dt-be-main DCAE-DT-Validator - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT kwalify jar diff --git a/dcaedt_validator/pom.xml b/dcaedt_validator/pom.xml index e360ba9..8e65814 100644 --- a/dcaedt_validator/pom.xml +++ b/dcaedt_validator/pom.xml @@ -8,7 +8,7 @@ org.onap.sdc.dcae-d.dt-be-main dcae_dt_be_main - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT kwalify diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb index ce88cdb..fe5eca7 100644 --- a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb +++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb @@ -13,11 +13,11 @@ default['SDC']['BE']['http_port'] = 8080 default['SDC']['BE']['https_port'] = 8443 default['DCAE']['TOSCA_LAB']['https_port'] = 8085 -default['jetty'][:keystore_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" -default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION # MUST BE ALSO CHANGE IN THE startup.sh FILE -default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" +default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" default['disableHttp'] = true diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 index d03ca1c..4468560 100644 Binary files a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 and b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 differ diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks index d07ce1a..e6686cc 100644 Binary files a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks and b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks differ diff --git a/docker/docker_be/startup.sh b/docker/docker_be/startup.sh index fc56b2c..073f3e1 100644 --- a/docker/docker_be/startup.sh +++ b/docker/docker_be/startup.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config \ -Dlog.home=${JETTY_BASE}/logs \ -Dlogback.configurationFile=${JETTY_BASE}/dcae-be/logback-spring.xml -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \ + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ -Djetty.console-capture.dir=${JETTY_BASE}/logs" cd /var/lib/jetty/chef-solo diff --git a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks index d07ce1a..e6686cc 100644 Binary files a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks and b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks differ diff --git a/docker/docker_tools/startup.sh b/docker/docker_tools/startup.sh index d3422e3..7a4b8dd 100644 --- a/docker/docker_tools/startup.sh +++ b/docker/docker_tools/startup.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config \ -Dlog.home=${JETTY_BASE}/logs \ -Djetty.console-capture.dir=${JETTY_BASE}/logs \ -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf*" + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0" cd /var/lib/jetty/chef-solo chef-solo -c solo.rb -E ${ENVNAME} diff --git a/pom.xml b/pom.xml index 797deaa..34a55ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.onap.sdc.dcae-d.dt-be-main dcae_dt_be_main - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom sdc-dcae-d dt-be-main diff --git a/version.properties b/version.properties index 5ad9fe3..a8f201d 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=3 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg