Merge pull request #1910 from zowe/users/stevenh/119-rc2-content

Users/stevenh/119 rc2 content
zowe · Jan 22, 2021 · 607b286 · 607b286
2 parents 9248fd7 + f78303d
commit 607b286
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/bin/apiml_cm.sh b/bin/apiml_cm.sh
@@ -148,12 +148,12 @@ function add_external_ca {
     echo "Adding external Certificate Authorities:"
     if [ -n "${EXTERNAL_CA}" ]; then
         I=1
-        for FILE in "${EXTERNAL_CA}"; do
+        for FILE in ${EXTERNAL_CA}; do
             cp -v "${FILE}" "${EXTERNAL_CA_FILENAME}.${I}.cer"
             I=$((I+1))
         done
         if [ `uname` = "OS/390" ]; then
-            for FILENAME in "${EXTERNAL_CA_FILENAME}.*.cer"; do
+            for FILENAME in "${EXTERNAL_CA_FILENAME}".*.cer; do
                 iconv -f ISO8859-1 -t IBM-1047 "${FILENAME}" > "${FILENAME}-ebcdic"
             done
         fi
@@ -525,7 +525,8 @@ function zosmf_jwt_public_key {
         -Dserver.ssl.trustStoreType=PKCS12 \
         -Dserver.ssl.trustStorePassword="${SERVICE_PASSWORD}" \
         -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
-        -cp "${BASE_DIR}/../components/gateway/bin/gateway-service.jar" \
+        -cp "${BASE_DIR}/../components/gateway/bin/gateway-service-lite.jar" \
+        -Dloader.path="../components/apiml-common-lib/bin/api-layer-lite-lib-all.jar" \
         -Dloader.main=org.zowe.apiml.gateway.security.login.zosmf.SaveZosmfPublicKeyConsoleApplication \
         org.springframework.boot.loader.PropertiesLauncher \
         https://${ZOWE_ZOSMF_HOST}:${ZOWE_ZOSMF_PORT} "${SERVICE_KEYSTORE}.${JWT_ALIAS}.pem" "${LOCAL_CA_ALIAS}" \

diff --git a/bin/zowe-setup-certificates.sh b/bin/zowe-setup-certificates.sh
@@ -22,7 +22,7 @@
 function detectExternalRootCA {
   echo "Detecting external root CA... STARTED"
   if [[ -z "${ZOWE_KEYRING}" ]]; then
-    for file in "${KEYSTORE_DIRECTORY}/${LOCAL_KEYSTORE_SUBDIR}/extca.*.cer-ebcdic"; do
+    for file in "${KEYSTORE_DIRECTORY}/${LOCAL_KEYSTORE_SUBDIR}"/extca.*.cer-ebcdic; do
       if [[ ! -f ${file} ]]; then
         break;
       fi
@@ -200,13 +200,13 @@ if [[ -z "${EXTERNAL_CERTIFICATE}" ]] || [[ -z "${EXTERNAL_CERTIFICATE_ALIAS}" ]
   fi
 else
   EXT_CA_PARM=""
-  for CA in "${EXTERNAL_CERTIFICATE_AUTHORITIES}"; do
+  for CA in ${EXTERNAL_CERTIFICATE_AUTHORITIES}; do
       EXT_CA_PARM="${EXT_CA_PARM} --external-ca ${CA} "
   done
 
   if [[ -z "${ZOWE_KEYRING}" ]]; then
     "${ZOWE_ROOT_DIR}/bin/apiml_cm.sh" --verbose --log "${LOG_FILE}" --action setup --service-ext "${SAN}" --service-password "${KEYSTORE_PASSWORD}" \
-      --external-certificate "${EXTERNAL_CERTIFICATE}" --external-certificate-alias "${EXTERNAL_CERTIFICATE_ALIAS}" "${EXT_CA_PARM}" \
+      --external-certificate "${EXTERNAL_CERTIFICATE}" --external-certificate-alias "${EXTERNAL_CERTIFICATE_ALIAS}" ${EXT_CA_PARM} \
       --service-alias "${KEYSTORE_ALIAS}" --service-keystore "${KEYSTORE_PREFIX}" --service-truststore "${TRUSTSTORE_PREFIX}" --local-ca-filename "${LOCAL_CA_PREFIX}" \
       --external-ca-filename ${EXTERNAL_CA_PREFIX}
     RC=$?

diff --git a/manifest.json.template b/manifest.json.template
@@ -73,13 +73,13 @@
       "version": "1.0.6"
     },
     "org.zowe.explorer-jes": {
-      "version": "1.0.9"
+      "version": "1.0.10"
     },
     "org.zowe.explorer-mvs": {
-      "version": "1.0.10"
+      "version": "1.0.11"
     },
     "org.zowe.explorer-uss": {
-      "version": "1.0.9"
+      "version": "1.0.10"
     },
     "org.zowe.explorer-ui-server": {
       "version": "0.2.16"
@@ -251,7 +251,7 @@
       "componentGroup": "Zowe Desktop Data Sets UI Plugin",
       "entries": [{
         "repository": "explorer-mvs",
-        "tag": "v1.0.10",
+        "tag": "v1.0.11",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -265,7 +265,7 @@
       "componentGroup": "Zowe Desktop JES UI Plugin",
       "entries": [{
         "repository": "explorer-jes",
-        "tag": "v1.0.9",
+        "tag": "v1.0.10",
         "destinations": ["Zowe PAX"]
       }]
     }, {
@@ -279,7 +279,7 @@
       "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin",
       "entries": [{
         "repository": "explorer-uss",
-        "tag": "v1.0.9",
+        "tag": "v1.0.10",
         "destinations": ["Zowe PAX"]
       }]
     }, {