Updated the sdc cert

Also bumping project version

Issue-ID: SDC-2855
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I6f53b77b3ba8e229800fa7414a0ed555decda4e9

diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml
index 3e8aaeb..44afc9f 100644 (file)
--- a/dcaedt_be/pom.xml
+++ b/dcaedt_be/pom.xml
@@ -9,7 +9,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>dcae_dt_be_main</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml
index 93bc8c2..96719a9 100644 (file)
--- a/dcaedt_catalog/api/pom.xml
+++ b/dcaedt_catalog/api/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Catalog</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Catalog-API</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml
index 83c57eb..9223846 100644 (file)
--- a/dcaedt_catalog/asdc/pom.xml
+++ b/dcaedt_catalog/asdc/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Catalog</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Catalog-ASDC</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_catalog/commons/pom.xml b/dcaedt_catalog/commons/pom.xml
index 3423a12..755e228 100644 (file)
--- a/dcaedt_catalog/commons/pom.xml
+++ b/dcaedt_catalog/commons/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Catalog</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Catalog-Commons</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml
index 68aed27..b44e861 100644 (file)
--- a/dcaedt_catalog/db/pom.xml
+++ b/dcaedt_catalog/db/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Catalog</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Catalog-DB</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml
index e795149..2e48ee9 100644 (file)
--- a/dcaedt_catalog/pom.xml
+++ b/dcaedt_catalog/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
         <artifactId>dcae_dt_be_main</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
     <modules>
         <module>commons</module>

diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml
index f153e2b..4c5f8e7 100644 (file)
--- a/dcaedt_catalog/service/pom.xml
+++ b/dcaedt_catalog/service/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Catalog</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Catalog-Service</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml
index 2afb5df..334e8e5 100644 (file)
--- a/dcaedt_tools/pom.xml
+++ b/dcaedt_tools/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
         <artifactId>dcae_dt_be_main</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml
index daf6f10..acd5d3a 100644 (file)
--- a/dcaedt_validator/checker/pom.xml
+++ b/dcaedt_validator/checker/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Validator</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>DCAE-DT-Validator-Checker</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_validator/kwalify/pom.xml b/dcaedt_validator/kwalify/pom.xml
index 552cee7..4eeb68b 100644 (file)
--- a/dcaedt_validator/kwalify/pom.xml
+++ b/dcaedt_validator/kwalify/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
                <artifactId>DCAE-DT-Validator</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.3.4-SNAPSHOT</version>
        </parent>
        <artifactId>kwalify</artifactId>
        <packaging>jar</packaging>

diff --git a/dcaedt_validator/pom.xml b/dcaedt_validator/pom.xml
index e360ba9..8e65814 100644 (file)
--- a/dcaedt_validator/pom.xml
+++ b/dcaedt_validator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>dcae_dt_be_main</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
   <modules>
     <module>kwalify</module>

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 (file)
--- 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 (file)
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 (file)
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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>dcae_dt_be_main</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc-dcae-d dt-be-main</name>
 

diff --git a/version.properties b/version.properties
index 5ad9fe3..a8f201d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major=1
 minor=3
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}