[DCAEGEN2-2139] tomcat server config for https connector

escape XML special characters for XML element attributes

Issue-ID: DCAEGEN2-2139
Change-Id: Id332a8f45ad1df59793a282383a0486e512a0939
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>

diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml
index 36edff4..2c3297b 100644 (file)
--- a/ccsdk-app-common/pom.xml
+++ b/ccsdk-app-common/pom.xml
@@ -6,12 +6,12 @@
        <parent>
                <groupId>org.onap.ccsdk.dashboard</groupId>
                <artifactId>ccsdk-app-parent</artifactId>
-               <version>1.3.1-SNAPSHOT</version>
+               <version>1.3.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-common</artifactId>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.3.2-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>ONAP Operations Manager Dashboard common</name>
        <description>CCSDK Dashboard common Java code</description>

diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh
index f5ef4f8..8cb9d48 100644 (file)
--- a/ccsdk-app-os/docker-dashboard-installation.sh
+++ b/ccsdk-app-os/docker-dashboard-installation.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+ #################################################################################
+ # =============LICENSE_START=====================================================
+ # 
+ # ===============================================================================
+ #  Copyright (c) 2020 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.
+ #  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
+ #  limitations under the License.
+ # ============LICENSE_END========================================================
 
 # run import for ca certs
 if [ -e /usr/local/share/ca-certificates/cacert.pem ]
@@ -54,7 +72,7 @@ then
     protocol=\"org.apache.coyote.http11.Http11NioProtocol\"
     port=\"8443\" maxThreads=\"200\"
     scheme=\"https\" secure=\"true\" SSLEnabled=\"true\"
-    keystoreFile=\"/usr/local/share/ca-certificates/cert.jks\" keystorePass=\"`cat /usr/local/share/ca-certificates/jks.pass`\"
+    keystoreFile=\"/usr/local/share/ca-certificates/cert.jks\" keystorePass=\"`sed -e 's/&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' -e 's/"/\&quot;/g' -e "s/'/\&apos;/g" < /usr/local/share/ca-certificates/jks.pass`\"
     clientAuth=\"false\" sslProtocol=\"TLS\"/>" >> enablehttps.txt
     sed '/Service name=\"Catalina\">/r enablehttps.txt' $CATALINA_HOME/conf/server.xml > $CATALINA_HOME/conf/server-https.xml
     mv $CATALINA_HOME/conf/server-https.xml $CATALINA_HOME/conf/server.xml

diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 3e5cd61..7b71941 100644 (file)
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -6,12 +6,12 @@
        <parent>
                <groupId>org.onap.ccsdk.dashboard</groupId>
                <artifactId>ccsdk-app-parent</artifactId>
-               <version>1.3.1-SNAPSHOT</version>
+               <version>1.3.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-os</artifactId>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.3.2-SNAPSHOT</version>
        <packaging>war</packaging>
        <name>ONAP Operations Manager Dashboard app</name>
        <description>CCSDK Dashboard Web Application for external release</description>

diff --git a/ccsdk-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml
index a8c989f..f6a95cf 100644 (file)
--- a/ccsdk-app-overlay/pom.xml
+++ b/ccsdk-app-overlay/pom.xml
@@ -6,12 +6,12 @@
        <parent>
            <groupId>org.onap.ccsdk.dashboard</groupId>
            <artifactId>ccsdk-app-parent</artifactId>
-           <version>1.3.1-SNAPSHOT</version>
+           <version>1.3.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-overlay</artifactId>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.3.2-SNAPSHOT</version>
        <packaging>war</packaging>
        <name>ONAP Operations Manager Dashboard overlay</name>
        <description>CCSDK Dashboard web resources</description>

diff --git a/pom.xml b/pom.xml
index f8a605c..79f72a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <!-- Maven parent project for convenience of building and cleaning -->
     <groupId>org.onap.ccsdk.dashboard</groupId>
     <artifactId>ccsdk-app-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ccsdk-dashboard</name>
     

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