diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh index 3dccacc414..bddf677978 100755 --- a/api-catalog-package/src/main/resources/bin/start.sh +++ b/api-catalog-package/src/main/resources/bin/start.sh @@ -97,7 +97,7 @@ if [ -n "${externalProtocol}" ] && [ -n "${ZWE_zowe_externalDomains_0}" ] && [ - fi CATALOG_CODE=AC -_BPXK_AUTOCVT=OFF +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \ -XX:+ExitOnOutOfMemoryError \ @@ -109,8 +109,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \ ${JVM_SECURITY_PROPERTIES} \ ${EXTERNAL_URL} \ ${CUSTOM_JVM_OPTS} \ + -Dfile.encoding=COMPAT \ -Dibm.serversocket.recover=true \ - -Dfile.encoding=UTF-8 \ -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \ diff --git a/apiml-package/src/main/resources/bin/start.sh b/apiml-package/src/main/resources/bin/start.sh index c8343b7369..5b2c8d23e0 100755 --- a/apiml-package/src/main/resources/bin/start.sh +++ b/apiml-package/src/main/resources/bin/start.sh @@ -215,7 +215,7 @@ fi # End OpenTelemetry APIML_CODE=AG -_BPXK_AUTOCVT=OFF +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-${ZWE_components_gateway_heap_init:-32}}m -Xmx${ZWE_configs_heap_max:-${ZWE_components_gateway_heap_max:-512}}m \ -XX:+ExitOnOutOfMemoryError \ @@ -324,7 +324,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \ -Dcaching.storage.size=${ZWE_components_caching_service_storage_size:-${ZWE_configs_storage_size:-10000}} \ -Dcaching.storage.vsam.name=${VSAM_FILE_NAME} \ -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \ - -Dfile.encoding=UTF-8 \ + -Dfile.encoding=COMPAT \ -Dibm.serversocket.recover=true \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Djava.library.path=${LIBPATH} \ diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh index 5e77d594df..2dbea71abb 100755 --- a/caching-service-package/src/main/resources/bin/start.sh +++ b/caching-service-package/src/main/resources/bin/start.sh @@ -90,7 +90,7 @@ if [ -d "${original_infinispan_index_location}" ]; then fi CACHING_CODE=CS -_BPXK_AUTOCVT=OFF +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \ -XX:+ExitOnOutOfMemoryError \ @@ -101,8 +101,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \ ${LOGBACK} \ ${JVM_SECURITY_PROPERTIES} \ ${CUSTOM_JVM_OPTS} \ + -Dfile.encoding=COMPAT \ -Dibm.serversocket.recover=true \ - -Dfile.encoding=UTF-8 \ -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \ diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh index 9c8e5e4dd6..d7c4d9deec 100755 --- a/discovery-package/src/main/resources/bin/start.sh +++ b/discovery-package/src/main/resources/bin/start.sh @@ -89,7 +89,7 @@ if [ "${ZWE_components_gateway_apiml_security_auth_uniqueCookie}" = "true" ]; th fi DISCOVERY_CODE=AD -_BPXK_AUTOCVT=OFF +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \ -XX:+ExitOnOutOfMemoryError \ @@ -123,13 +123,13 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \ -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices:-false} \ -Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \ -Dapiml.service.port=${ZWE_configs_port:-7553} \ - -Dfile.encoding=UTF-8 \ -Dibm.serversocket.recover=true \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Djava.library.path=${LIBPATH} \ -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \ -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \ -Djdk.tls.client.cipherSuites=${client_ciphers} \ + -Dfile.encoding=COMPAT \ -Dloader.path=${DISCOVERY_LOADER_PATH} \ -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \ -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \ diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh index 71d1a27ed7..0b63c0ce12 100755 --- a/gateway-package/src/main/resources/bin/start.sh +++ b/gateway-package/src/main/resources/bin/start.sh @@ -142,7 +142,7 @@ if [ -n "${ZWE_GATEWAY_LIBRARY_PATH}" ]; then fi GATEWAY_CODE=AG -_BPXK_AUTOCVT=OFF +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \ -XX:+ExitOnOutOfMemoryError \ @@ -204,13 +204,13 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \ -Dapiml.service.port=${ZWE_configs_port:-7554} \ -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \ -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \ - -Dfile.encoding=UTF-8 \ -Dibm.serversocket.recover=true \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Djava.library.path=${LIBPATH} \ -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \ -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \ -Djdk.tls.client.cipherSuites=${client_ciphers} \ + -Dfile.encoding=COMPAT \ -Dloader.path=${GATEWAY_LOADER_PATH} \ -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \ -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \ diff --git a/scripts/apiml-common-scripts.sh b/scripts/apiml-common-scripts.sh index e24b098733..410b055d72 100755 --- a/scripts/apiml-common-scripts.sh +++ b/scripts/apiml-common-scripts.sh @@ -103,11 +103,11 @@ if [ "$(uname)" = "OS/390" ]; then | grep "major version" \ | cut -d " " -f5) - if [ $JAVA_VERSION -ge 65 ]; then # Java 21 + JAVA_VERSION=${JAVA_VERSION:-0} + + if [ "$JAVA_VERSION" -ge 65 ]; then # Java 21 ZOWE_CONSOLE_LOG_CHARSET=IBM-1047 - # Java 21+ changed default encoding to UTF-8 (JEP 400). Set console encoding - # to EBCDIC for z/OS SYSPRINT to prevent garbled characters in early startup logs - JAVA21_CONSOLE_ENCODING="-Dstdout.encoding=${ZOWE_CONSOLE_LOG_CHARSET} -Dstderr.encoding=${ZOWE_CONSOLE_LOG_CHARSET}" + JAVA21_CONSOLE_ENCODING="-Dconsole.encoding=${ZOWE_CONSOLE_LOG_CHARSET}" fi fi diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh index bc2aed9a4a..89370ebf1d 100755 --- a/zaas-package/src/main/resources/bin/start.sh +++ b/zaas-package/src/main/resources/bin/start.sh @@ -139,6 +139,7 @@ CERTIFICATES_URLS=${ZWE_configs_apiml_security_x509_certificatesUrl:-${ZWE_compo CERTIFICATES_URLS=${ZWE_configs_apiml_security_x509_certificatesUrls:-${ZWE_components_gateway_apiml_security_x509_certificatesUrls:-${CERTIFICATES_URLS}}} ZAAS_CODE=AZ +_BPXK_AUTOCVT=ALL _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \ -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \ ${QUICK_START} \ @@ -148,8 +149,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \ ${LOGBACK} \ ${JVM_SECURITY_PROPERTIES} \ ${CUSTOM_JVM_OPTS} \ + -Dfile.encoding=COMPAT \ -Dibm.serversocket.recover=true \ - -Dfile.encoding=UTF-8 \ -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \ -Djava.io.tmpdir=${TMPDIR:-/tmp} \ -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \