Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api-catalog-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
${JVM_SECURITY_PROPERTIES} \
${EXTERNAL_URL} \
${CUSTOM_JVM_OPTS} \
-Dibm.serversocket.recover=true \
-Dfile.encoding=UTF-8 \
-Dibm.serversocket.recover=true \
-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
-Djava.io.tmpdir=${TMPDIR:-/tmp} \
-Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
Expand Down
2 changes: 1 addition & 1 deletion caching-service-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
${LOGBACK} \
${JVM_SECURITY_PROPERTIES} \
${CUSTOM_JVM_OPTS} \
-Dibm.serversocket.recover=true \
-Dfile.encoding=UTF-8 \
-Dibm.serversocket.recover=true \
-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
-Djava.io.tmpdir=${TMPDIR:-/tmp} \
-Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
Expand Down
2 changes: 1 addition & 1 deletion discovery-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=UTF-8 \
-Dloader.path=${DISCOVERY_LOADER_PATH} \
-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
-Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses:-${ZWE_zowe_network_server_listenAddresses:-"0.0.0.0"}} \
Expand Down
2 changes: 1 addition & 1 deletion gateway-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,13 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
-Dapiml.service.http.password=${ZWE_configs_apiml_service_http_password:-} \
-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=UTF-8 \
-Dloader.path=${GATEWAY_LOADER_PATH} \
-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
-Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses:-${ZWE_zowe_network_server_listenAddresses:-"0.0.0.0"}} \
Expand Down
8 changes: 4 additions & 4 deletions scripts/apiml-common-scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET}"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion zaas-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
${LOGBACK} \
${JVM_SECURITY_PROPERTIES} \
${CUSTOM_JVM_OPTS} \
-Dibm.serversocket.recover=true \
-Dfile.encoding=UTF-8 \
-Dibm.serversocket.recover=true \
-Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
-Djava.io.tmpdir=${TMPDIR:-/tmp} \
-Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
Expand Down
Loading