Skip to content

fix: Updated file encoding for Hieroglyphic characters issue #4504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hrishikesh-nalawade wants to merge 9 commits into
base: v3.x.x
Choose a base branch
from
Open

fix: Updated file encoding for Hieroglyphic characters issue #4504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33033b1
fix: updated file encoding
hrishikesh-nalawade Mar 5, 2026
60137b5
update
hrishikesh-nalawade Mar 9, 2026
f9b376f
Merge branch 'v3.x.x' into hrishikesh-nalawade/GH4419/updated-file-en…
hrishikesh-nalawade Mar 9, 2026
49a6965
Changes
hrishikesh-nalawade Mar 17, 2026
9f6fa1b
Merge branch 'v3.x.x' into hrishikesh-nalawade/GH4419/updated-file-en…
hrishikesh-nalawade Mar 17, 2026
217bad4
Changes
hrishikesh-nalawade Mar 20, 2026
bcde4d5
logBuildInfo() moved after app.run()
hrishikesh-nalawade Mar 23, 2026
c52c97c
updating Config
hrishikesh-nalawade Apr 13, 2026
42db1c9
Merge branch 'v3.x.x' into hrishikesh-nalawade/GH4419/updated-file-en…
hrishikesh-nalawade Apr 13, 2026
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
4 changes: 2 additions & 2 deletions api-catalog-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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:-} \
Expand Down
4 changes: 2 additions & 2 deletions apiml-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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} \
Expand Down
4 changes: 2 additions & 2 deletions caching-service-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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:-} \
Expand Down
4 changes: 2 additions & 2 deletions discovery-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down 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=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"}} \
Expand Down
4 changes: 2 additions & 2 deletions gateway-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"}} \
Expand Down
8 changes: 4 additions & 4 deletions scripts/apiml-common-scripts.sh
View file
Open in desktop
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="-Dconsole.encoding=${ZOWE_CONSOLE_LOG_CHARSET}"
fi
fi

Expand Down
3 changes: 2 additions & 1 deletion zaas-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand All @@ -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:-} \
Expand Down
Loading