Merge pull request #2038 from zowe/users/jack/ext-cert-fix-master

fixes #2032, issue of importing external CAs

bin/apiml_cm.sh

@@ -216,10 +216,10 @@ function import_local_ca_certificate {
 }
 
 function import_external_ca_certificates {
-    if ls "${EXTERNAL_CA_FILENAME}.*.cer" 1> /dev/null 2>&1; then
+    if ls "${EXTERNAL_CA_FILENAME}".*.cer 1> /dev/null 2>&1; then
         echo "Import the external Certificate Authorities to the truststore:"
         I=1
-        for FILENAME in "${EXTERNAL_CA_FILENAME}.*.cer"; do
+        for FILENAME in "${EXTERNAL_CA_FILENAME}".*.cer; do
             [ -e "$FILENAME" ] || continue
             pkeytool -importcert $V -trustcacerts -noprompt -file "${FILENAME}" -alias "extca${I}" -keystore "${SERVICE_TRUSTSTORE}.p12" -storepass "${SERVICE_PASSWORD}" -storetype PKCS12
             I=$((I+1))
@@ -243,9 +243,9 @@ function import_signed_certificate {
 
 function import_external_certificate {
     echo "Import the external Certificate Authorities to the keystore:"
-    if ls "${EXTERNAL_CA_FILENAME}.*.cer" 1> /dev/null 2>&1; then
+    if ls "${EXTERNAL_CA_FILENAME}".*.cer 1> /dev/null 2>&1; then
         I=1
-        for FILENAME in "${EXTERNAL_CA_FILENAME}.*.cer"; do
+        for FILENAME in "${EXTERNAL_CA_FILENAME}".*.cer; do
             [ -e "$FILENAME" ] || continue
             pkeytool -importcert $V -trustcacerts -noprompt -file "${FILENAME}" -alias "extca${I}" -keystore "${SERVICE_KEYSTORE}.p12" -storepass "${SERVICE_PASSWORD}" -storetype PKCS12
             I=$((I+1))

manifest.json.template

@@ -1,6 +1,6 @@
 {
   "name": "Zowe",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.",
   "license": "EPL-2.0",
   "homepage": "https://zowe.org",