Merge branch 'v2.x/master' into reboot/tomcat-9-0-99

gradle.properties

@@ -15,7 +15,7 @@ artifactoryPublishingMavenRepo=https://zowe.jfrog.io/zowe/libs-release-local
 artifactoryPublishingMavenSnapshotRepo=https://zowe.jfrog.io/zowe/libs-snapshot-local
 
 # Artifacts version
-version=2.0.34-SNAPSHOT
+version=2.0.35-SNAPSHOT
 
 defaultSpringBootVersion=2.0.2.RELEASE
 defaultSpringBootCloudVersion=2.0.0.RELEASE

jobs-zowe-server-package/src/main/resources/bin/start.sh

@@ -98,6 +98,11 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${COMPONENT_CODE} java \
   -Dserver.ssl.keyStore="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}" \
   -Dserver.ssl.keyStorePassword="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}" \
   -Dserver.ssl.keyStoreType="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}" \
+  -Dserver.ssl.ciphers=${server_ciphers} \
+  -Dserver.ssl.protocol=${ZWE_configs_server_ssl_protocol:-${server_protocol}} \
+  -Dserver.ssl.enabled-protocols=${server_enabled_protocols} \
+  -Dapiml.httpclient.ssl.enabled-protocols=${ZWE_components_jobs_api_apiml_httpclient_ssl_enabled_protocols:-${client_enabled_protocols}} \
+  -Djdk.tls.client.cipherSuites=${client_ciphers} \
   -Dserver.connection-timeout=8000 \
   -Dcom.ibm.jsse2.overrideDefaultTLS=true \
   -Dconnection.httpsPort=${ZWE_components_gateway_port:-7554} \