From 4d08bcb3a7dba9867507a0153e5c1fcdc41d73a0 Mon Sep 17 00:00:00 2001 From: Pucheng Yang Date: Wed, 30 Oct 2024 20:27:36 -0700 Subject: [PATCH 1/2] Add org.apache.logging.log4j:log4j-layout-template-json to enable json format log output --- gradle/libs.versions.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 20a0a218e0..3241a48375 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -137,6 +137,7 @@ log4j-slf4j2-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-i log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } log4j-12-api = { group = "org.apache.logging.log4j", name = "log4j-1.2-api", version.ref = "log4j" } +log4j-layout-template-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json", version.ref = "log4j" } jetty-server = { group = "org.eclipse.jetty", name = "jetty-server", version.ref = "jetty" } jetty-servlet = { group = "org.eclipse.jetty", name = "jetty-servlet", version.ref = "jetty" } jetty-servlets = { group = "org.eclipse.jetty", name = "jetty-servlets", version.ref = "jetty" } @@ -261,7 +262,7 @@ google-auth-http = { group = "com.google.auth", name = "google-auth-library-oaut google-auth-credentials = { group = "com.google.auth", name = "google-auth-library-credentials", version.ref = "google-auth" } [bundles] -log4j = ["slf4j-api", "log4j-slf4j2-impl", "log4j-api", "log4j-core", "log4j-12-api"] +log4j = ["slf4j-api", "log4j-slf4j2-impl", "log4j-api", "log4j-core", "log4j-12-api", "log4j-layout-template-json"] jetty = ["jetty-server", "jetty-servlet", "jetty-webapp", "jetty-servlets"] jersey = ["jersey-server", "jersey-container-servlet-core", "jersey-container-jetty-http", "jersey-media-json-jackson", "jersey-hk2"] iceberg = ["iceberg-core", "iceberg-api"] From 1ec0d91df1cd7051139a36d997291ac1c007cecb Mon Sep 17 00:00:00 2001 From: Pucheng Yang Date: Thu, 31 Oct 2024 07:05:40 -0700 Subject: [PATCH 2/2] update LICENSE.bin --- LICENSE.bin | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE.bin b/LICENSE.bin index 1bdb9864d2..738687a6a2 100644 --- a/LICENSE.bin +++ b/LICENSE.bin @@ -312,6 +312,7 @@ Apache Log4j API Apache Log4j Core Apache Log4j SLF4J 2.0 Binding + Apache Log4j Layout For Templated JSON Encoding Apache ORC Apache Parquet Hadoop Bundle Apache Thrift