Fix casablanca certs

Adding new certs for Casablanca (expiry is march 21st 2020)

Issue-ID: CLAMP-335
Change-Id: I47935d0ff18441b9f0fedff4ee7dc88a38570e54
Signed-off-by: ChrisC <christophe.closset@intl.att.com>

8 files changed, 67 insertions, 52 deletions

diff --git a/docs/index.rst b/docs/index.rst
index 677c32b1..0a465ab8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+.. Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
 
 CLAMP - Closed Loop Automation Management Platform
 ==================================================
@@ -173,8 +173,8 @@ This file is a JSON that must be specified to Spring config, here is an example:
 
 Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.
 Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.
-The environmentName is normally the Dmaap Topic used by SDC. 
-If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) 
+The environmentName is normally the Dmaap Topic used by SDC.
+If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers)
 
 Administration
 --------------
@@ -189,7 +189,7 @@ For OOM, the URL is https://<host-ip>:30258/designer/index.html
      Default password : password
 
    - With AAF enabled, the certificate p12 must be added to the browser
-     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "China in the Spring"
+     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "pZ[![d{HI69azXF3dqXQoE)8"
      Or get it from this page : https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca
 
 Human Interfaces
@@ -198,7 +198,7 @@ Human Interfaces
 
 User Interface (CLAMP Designer) - serve to configure control loop
 CLAMP UI is used to configure the Control Loop designed and distributed by SDC. From that UI it's possible to distribute the configuration policies and control the life-cycle of the DCAE Micro Services.
- 
+
 The following actions are done using the UI:
 
 * Design a control loop flow by selecting a predefined template from a list
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 11ecb70f..21d1d8ba 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,10 +1,25 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright (c) 2017-2018 AT&T Intellectual Property.  All rights reserved.
+.. Copyright (c) 2017-2019 AT&T Intellectual Property.  All rights reserved.
 
 Release Notes
 =============
 
+Version: 3.0.4 - maintenance release
+------------------------------------
+
+:Release Date: 2019-04-06
+
+**New Features**
+none
+
+**Bug Fixes**
+none
+
+**Known Issues**
+CLAMP certificates have been renewed to extend their expiry dates
+    - `CLAMP-335 <https://jira.onap.org/browse/CLAMP-335>`_ Update Certificates on Casablanca release.
+
 
 Version: 3.0.3 - maintenance release
 ------------------------------------
@@ -18,7 +33,7 @@ none
 none
 
 **Known Issues**
-one documentation issue was fixed, this issue does not require a new docker image: 
+one documentation issue was fixed, this issue does not require a new docker image:
     - `CLAMP-257 <https://jira.onap.org/browse/CLAMP-257>`_ User Manual for CLAMP : nothing on readthedocs.
 
 Version: 3.0.3
@@ -51,7 +66,7 @@ The main goal of the Casablanca release was to:
 
 **Security Notes**
 
-CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. 
+CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release.
 The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=42598587>`_.
 
 Quick Links:
@@ -116,9 +131,9 @@ CLAMP code has been formally scanned during build time using NexusIQ and all Cri
 
 Quick Links:
  	- `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_
- 	
+
  	- `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_
- 	
+
  	- `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=25440749>`_
 
 **Upgrade Notes**
diff --git a/pom.xml b/pom.xml
index 480f83cf..d2f45218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
-		<version>3.0.3-SNAPSHOT</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<name>clamp</name>
 
 		<parent>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 263c09d3..98631c51 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP CLAMP
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
 #                             reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,8 +58,8 @@ server.port=8443
 ## Config part for Server certificates
 # Can be a classpath parameter instead of file:/
 server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=China in the Spring
-server.ssl.key-password=China in the Spring
+server.ssl.key-store-password=pZ[![d{HI69azXF3dqXQoE)8
+server.ssl.key-password=pZ[![d{HI69azXF3dqXQoE)8
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=clamp@clamp.onap.org
 
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
index 45cdcb60..9363f1db 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.keyfile
+++ b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
@@ -1,27 +1,27 @@
-HTQLJHUg5Du0VM7wHY5cBMTgupk6ujhSoAgx5BTHp9wt9CoWvD72ScIciyldEH9R2QZIL9ZvpVo0
-h2o-hSQueaVjPcIFUhVIl4HWmNC6I2YAlNkwy3VMl1g9otKaOTgo3ChsFUVq7ACIrcr2977wo4B_
-FeHa0lInuaLoEjHMP1fszTWYBBx9oY3K9s-9MQQyCo6bFV-4L733sPeE60j20FWoygUwvIqxp3Pc
-Bmnm1AtcrhGH0elqDg9qNjmnmC3gxZaGpGiclaEds_lVu57RIXwtTHgYyMbJzfP-Ziq3T7i8d-h3
-JZThj1l9JvDLYm2z0BEXuQ3Owvn4m98cWB9P5esJOKYEvsfIGK_Fd6uT04fzkeDT1wNV4-Swuorr
-ymZQxnvHbUAp91NJEa3EtWTuBxNeoqV0cw97WkAYn95pgjH4ZVhBdczclS-EStFJyYOHtTRAs1A_
-8i36GiuUPHn3KolkRF2GvtZfwNj5AYfcUKhqULJ-T_is2KKYnGwQ2iaItX2852o4zlzkMXFMkt5C
-qbsDmrU7F5zxn4HG6yShW5sIXgAcS9cyIs8IFgHtkYauDJlKZWynhzqibh3-bzPyfFmreTHxQ-Av
-Lgp5sAtf1B9_1feVyE78bmQ3IMtxE-YkV8RYPDJzKw0nIdjce7j89azNq_as5JMfCCHSlYcKRs8O
-Nrh8gXYun28iUL_kwEUWK0WohPgwQBb46_Hkc6a0aSYbuFA_7qgprPB9wmAlHtuqnCAb2vk8GT-h
-07DB6yPGgzE-OgXUzLIWHXVzPO6SjOg3ifYpCRigOsNqkV1paBBOzje7dn2RnpgaRJS3zupTMnqF
-g5N9qCgubxRlII626-Dc_i5X1OAWPzJK8UZPuxRAg3YVJNHluB3O0Q2Uo14RkO3a2Tn_Ce9XoTUJ
-Jqi_qZWytIB9sHMNM7KvcRxGedLqd_230O3zV7rTa4Up0BFoMyHmnf2SZu96x_Yz_n_AWhiaALvE
-ON_nTxPEOHfEfrNzo7pCwIaI5gM6eu_S24aZTf4L-5tekqH7l1PEbKr2QP4XfTZBN4FgNExgGpzG
-the3zv4k7hJeWe7GbtMmnZXIQUJkZVTHBwqvHkqtN9cBWpihCNVmI3zKq6Bsy6Us0SDZ686kpeVS
-s9eyrzj6uLPE65mQxCpoMt6G4HSjzMqA3HOX_7ixBBhtdVi5-X7NeTigr-uaZg67yP3cSikfFf9w
-dyFuMjg29jtlaTNzOov8HFrcLq01N3fpwDkSU_2TmLndU-FMat78CMCLW5QuS1KF3hC9T8wzKWS_
-WHK2oMA3SqWyqnj_cE_T4Ql_VKL3nkvf_bzTvLso_BWodUw2A-eO-1qjtCHp3nnTdSVH06E3_eRH
-BuKWEt0MLyNpm88OD0tgOC3fn7casioynQLoFatta5nlQfj4nsAXj2bD6CrohtDhjOKXqHxDU6s7
-adtNoBGyEK5FKy3HtHMC7KXsK_6wbYUluz93nCNMok696HIHojNUydGFqfr2HluQTi0S3uHnD_pS
--QM8DbsFi8oIztn6Er4CFFJQ-tUuDyX6ahfY5gWLqCgRM7RzrkoHY7b4vkHxZTBLZlPGWfRtG0vc
-GTSqIRNI2Z_Zte5-wW7T9vfFVBsArF0SJWOrlUqf7fGN1_2H9B9aIpLEMaHF7EEp1OP6_SNnfuhB
-K31EFy0VW0eGnLezpd3HT540kznub7h_m6phZaqeZJxsle9jHEOS7qDc3T6s1hZ7DLK2Ej5RFuq8
-5LA9Cj5VrdejKMZKZJwmyWylLe224RyY4gDa0MB_lDAeC-YFdY2ClymYRJmclFFSWf7X1j5beQve
-xGbsXJaWZcJpahpFu4RR-kOOyZBLPsdiyOZ7PGXz83l35NiXabmRapgjve1t7NFSuRluafihc0Lg
-GKoz_-3YAFJmh4Z3bcCsz1WhCUYqzWyDsnZiD7sMQT7Oyje7RqzoxBZs5Ke1_0jtpgFrc7BcqHG7
-WpwJr6hg53o3BpWcUEopBomhbdxiDSLxZmDrePy9LDC7YNk_7-gVKIc7dZDMgw6kSRR330p0
\ No newline at end of file
+majpxMY_EFfKFVqfd4TPkhP7lpA6ooQVfshoE1DpveZ7LtNs6hrShe23ceyBvrWS3WwIHOzVLwpx
+BLDWSW0awcAsgDsrhuIC6hiiVlXLBLPcd6pWzEnL5NUHeZLCL5rhnmrpCn0ITdzEzVbcwDnsbe99
+ARwZsTai9asSu-rrtqQPZ3ZRyWgiv4TNxsB3zuKsFHKQNl9K9D6k6p_GLu56LL0EPCM2GSviV5_d
+eHP1hToY8OW5_JsMvBm7Mywaaaoddw8CIbt3jhQo1RvEMdaveWbkhUbFrqPxhiY2L2h4HzH1skwp
+PRrW6i4tUicx8RkdNcOicOqElvDX6joSIgazym53sQc6mCiRQGguVQgHWAm72IGUCXqkTX5ixxdh
+qGyzt3DqK0JGWQtdp4yi3bCHHAA_RxCS7XNyMrA6IXhpJFEwHCbTfpe6BO1C2xjOvKBvKh7n63uC
+xdhZZl9zLefMUCdeo1OIm6elkNIHuYKNeF2Nu3-IHfJJ0MwZ-uvgXYSDXUdoogAYTYOLXQW0V6bx
+XgBJGa5OXa3yll9UE-fZRGamtjbiGt0lIq79hN-sFGYu3t6AEuq7766NCEozGWA1uZYFYNSOdfuM
+LWU9iISpiiq3NzJabzqoi6QfQHMtICj9-LizXYhr0SnZAVTSuepnG-6UGAt_q5r39nqrpBjbboXE
+IcIHnIF85ncQDndUIKiITA1Kcu4eF7pKNrDVHqy6roZe9TkPHfVRqyhnruNu0-CEBKxLxQJoEY8a
+elH0mxqLJCN3Pq55pMNAMouzZVewf5h0fFfs6MH_74Jqfao9FzPM4vPrO9Y6qEroRiNjk3CNhV1t
+eNszPYxJ1rd-UBUq4dndZSqHlXJH8B7K8Oty_O5jCGFr1i1toi6p2Kn6jGY9IKgAhInImK5y9Ksn
+W2ozgb_ycUp-Igalwfh6pgiP4P7pvfxxEMwXDxqDwBlkTBWxj5OizJksdKwDvVFebpZhfvDSipXu
+osEzNJ3-Rim1KsB22Z5f83atw7Y32iIjEs4st8tVml6HLk4wB0iFp8HPHRLZ1DkzE9x_lj586oEx
+zlISeX6SE3J7Ab35P3dHffuHuoAwUr9QMCmGtamokvo7JBAKE5d5zTx00bim4lVV3fhRoRVrZ3tT
+ghxMWF4yj2GJEsLfMUsFbGKG02qdvIm5giz9ClCdvQh6Kiv4vFu0m9JNbI2QkNn2hMGbs3HTszap
+M5PoS6TAy_WIvwZ7bkJsaHmjbSO2iiGHM7nA1gY6Kxm3FfTaRiv0LfF3QTBmaWEE4Yb7GwG_BXPH
+l6NqWTK0ETsZZ0ilQmf3U6etQ3l3aGQccy0KASwQNRX4AlaJBA-iOVtiDcTQXhf1i5pkgXX0yV_X
+Wse-CjQC2xULEhrLT8i08QMO1TbRs6Nkai4xOevvwdz8vZx1PEknj2CZ84X7PJ9eXOQHhAbky2EF
+lU-lDiDzwx9KFY8DOlrBw_xaiBC8JM1zImGcctU6JEjY8VjT0uLqSvvwDPiTkRU9wbpY0RIpOchA
+YjdB5Ymt3tWtUmd4fQ6m-OXHPGm9HM_QYaZFtu7JDBeGEanoM9voTqLsWNRL25qt5y0nS3NQvD6n
+5tGRE9qN93NiXMjtZV4pJyCtd8v3J3OggJbrvxmHdWsp5kNCZPcJnOxWgBhAtaS6h0UUitRtwbwS
+gcY-y7prxS6exmoMVbyOonU2xA4FcXPkFKGMGR7QuZBhVGdjvMIwvVYgQv0WHsF334oGLiXtmUCp
+IK56GqGBJLusLsKRgTzHirhBShA85PJWH9Nf2WrmAHk0PF6isfLjxIXDI7GELEyxWg7ru4HSa6q6
+3old3vRfW3N_fqJTBA3bGK1P8kr8LS2UfAUjR1iZgU8toT3cXTp9t5Rw0mGxktLCxZUwIp-YYxNK
+f7sf3RYn7tqDy46PoHpY4TPVoWf03pavPegffTriGzfWBb2zNpXj8v6TzZQ8j9tWM-vehZ04Xpxt
+q7_p_cHiwPVGH1SfR8aRttF_0Z5LK6ycxQTIbZXRXmc4yhoUgDd3USshoZxVHMY3tLHYVoQ6
\ No newline at end of file
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.p12 b/src/main/resources/clds/aaf/org.onap.clamp.p12
index 5cd75944..db666c6c 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.p12
+++ b/src/main/resources/clds/aaf/org.onap.clamp.p12
diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks
index 2da1dcc4..ff844b10 100644
--- a/src/main/resources/clds/aaf/truststoreONAPall.jks
+++ b/src/main/resources/clds/aaf/truststoreONAPall.jks
diff --git a/version.properties b/version.properties
index 8f3139ab..432e68b0 100644
--- a/version.properties
+++ b/version.properties
@@ -2,19 +2,19 @@
 # ============LICENSE_START=======================================================
 # ONAP CLAMP
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2019 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. 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software 
-# distributed under the License is distributed on an "AS IS" BASIS, 
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-# See the License for the specific language governing permissions and 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END============================================
 # ===================================================================
@@ -27,7 +27,7 @@
 
 major=3
 minor=0
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}