This is an automated email from the ASF dual-hosted git repository. fanng pushed a commit to branch 1.0.0-log4j in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit be79c85627c1c91f498d79e439d0535b4db4dc58 Author: fanng <[email protected]> AuthorDate: Tue Sep 30 11:57:33 2025 +0800 remove log4j from gravitino server package --- dev/docker/gravitino/gravitino-dependency.sh | 4 ++++ dev/docker/gravitino/start-gravitino.sh | 5 ++++- dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh | 4 ++++ dev/docker/iceberg-rest-server/start-iceberg-rest-server.sh | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev/docker/gravitino/gravitino-dependency.sh b/dev/docker/gravitino/gravitino-dependency.sh index d2f1c5d742..9e849ee899 100755 --- a/dev/docker/gravitino/gravitino-dependency.sh +++ b/dev/docker/gravitino/gravitino-dependency.sh @@ -114,6 +114,10 @@ find ${gravitino_home}/bundles/aliyun-bundle/build/libs/ -name 'gravitino-aliyun download_gcs_connector +# Temporary rm log4j from Gravition to prevent class conflict with Iceberg AWS bundle jar +rm -f ${gravitino_iceberg_rest_dir}/log4j-api-*.jar +rm -f ${gravitino_iceberg_rest_dir}/log4j-core-*.jar + # Keeping the container running at all times cat <<EOF >> "${gravitino_dir}/packages/gravitino/bin/gravitino.sh" diff --git a/dev/docker/gravitino/start-gravitino.sh b/dev/docker/gravitino/start-gravitino.sh index 1cc612348c..66dfca82f9 100755 --- a/dev/docker/gravitino/start-gravitino.sh +++ b/dev/docker/gravitino/start-gravitino.sh @@ -26,4 +26,7 @@ cd ${gravitino_dir} python bin/rewrite_gravitino_server_config.py -./bin/gravitino.sh start \ No newline at end of file +JAVA_OPTS+="-XX:-UseContainerSupport" +export JAVA_OPTS + +./bin/gravitino.sh start diff --git a/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh b/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh index 06033371e8..89e60f07d5 100755 --- a/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh +++ b/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh @@ -71,6 +71,10 @@ curl -L -s -o bundles/sqlite-jdbc-3.42.0.0.jar https://repo1.maven.org/maven2/or cp bundles/*jar ${iceberg_rest_server_dir}/packages/gravitino-iceberg-rest-server/libs/ +# Temporary rm log4j from Gravition to prevent class conflict with Iceberg AWS bundle jar +rm -f ${iceberg_rest_server_dir}/packages/gravitino-iceberg-rest-server/libs/log4j-api-*.jar +rm -f ${iceberg_rest_server_dir}/packages/gravitino-iceberg-rest-server/libs/log4j-core-*.jar + cp start-iceberg-rest-server.sh ${iceberg_rest_server_dir}/packages/gravitino-iceberg-rest-server/bin/ cp rewrite_config.py ${iceberg_rest_server_dir}/packages/gravitino-iceberg-rest-server/bin/ diff --git a/dev/docker/iceberg-rest-server/start-iceberg-rest-server.sh b/dev/docker/iceberg-rest-server/start-iceberg-rest-server.sh index 449ed5ebf5..33ee36776b 100755 --- a/dev/docker/iceberg-rest-server/start-iceberg-rest-server.sh +++ b/dev/docker/iceberg-rest-server/start-iceberg-rest-server.sh @@ -26,4 +26,7 @@ cd ${iceberg_rest_server_dir} python bin/rewrite_config.py +JAVA_OPTS+="-XX:-UseContainerSupport" +export JAVA_OPTS + ./bin/gravitino-iceberg-rest-server.sh start
