From 127deeeaae131e544d57c89bcb97604a88b27858 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 6 Oct 2020 15:53:20 -0400
Subject: [PATCH] Merge ONAP certs into cacerts

Merge ONAP certificates into openjdk cacerts file

Change-Id: I9743442196d85e68d4ca2f2a5df46590d33eec3b
Issue-ID: SDNC-1371
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 80f1fc63b09ab7d987bbaf59f184d6896c561131
---
 SdncReports/pom.xml                                     | 2 +-
 admportal/pom.xml                                       | 2 +-
 configbackuprestore/pom.xml                             | 2 +-
 installation/sdnc/src/main/docker/Dockerfile            | 3 ++-
 installation/sdnc/src/main/docker/standalone.Dockerfile | 4 +++-
 pom.xml                                                 | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index c5d13533..1df53279 100644
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/admportal/pom.xml b/admportal/pom.xml
index 01b00c7e..164ae20b 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index c5bef8b3..5851d1b6 100644
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.1</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 577cebb2..a4768ba5 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -48,7 +48,8 @@ RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc
 # Install ssl and java certificates
 COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
 COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
 
 # Secure with TLS
 RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 67381f5c..58907dc1 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -46,7 +46,9 @@ RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HO
 # Install ssl and java certificates
 COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
 COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
+
 
 # Secure with TLS
 RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
diff --git a/pom.xml b/pom.xml
index 99ef35c0..f7f21ebb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.1</version>
         <relativePath/>
     </parent>
 
-- 
2.16.6