diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml index af6fa6bb6b..4e1a8bcf0c 100644 --- a/amoro-ams/pom.xml +++ b/amoro-ams/pom.xml @@ -109,6 +109,10 @@ org.rocksdb rocksdbjni + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -149,6 +153,10 @@ com.fasterxml.jackson.core * + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -266,9 +274,14 @@ javalin + + org.slf4j + slf4j-api + + org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl @@ -541,6 +554,10 @@ org.apache.directory.jdbm apacheds-jdbm1 + + org.slf4j + slf4j-log4j12 + diff --git a/amoro-format-hudi/pom.xml b/amoro-format-hudi/pom.xml index 7e40a26959..5c3e481f5a 100644 --- a/amoro-format-hudi/pom.xml +++ b/amoro-format-hudi/pom.xml @@ -52,6 +52,10 @@ asm asm + + org.slf4j + slf4j-log4j12 + diff --git a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml index ad5668c54d..28f9303b08 100644 --- a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml @@ -83,6 +83,10 @@ org.apache.arrow arrow-vector + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -134,6 +138,14 @@ log4j log4j + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j-impl + diff --git a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml index 9de260a8a3..eee28a02f7 100644 --- a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml @@ -89,6 +89,10 @@ org.apache.orc orc-mapreduce + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -126,6 +130,10 @@ org.apache.arrow arrow-vector + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -383,6 +391,15 @@ core test + + + + org.apache.logging.log4j + log4j-slf4j-impl + test + diff --git a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/pom.xml index e4f3b5644c..2854dfa489 100644 --- a/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/pom.xml @@ -89,6 +89,10 @@ org.apache.orc orc-mapreduce + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -130,6 +134,10 @@ org.apache.arrow arrow-vector + + org.apache.logging.log4j + log4j-slf4j-impl + diff --git a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml index e03c59f3cd..d3889f1935 100644 --- a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml +++ b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml @@ -89,6 +89,10 @@ org.apache.orc orc-mapreduce + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -130,6 +134,10 @@ org.apache.arrow arrow-vector + + org.apache.logging.log4j + log4j-slf4j-impl + diff --git a/amoro-format-mixed/amoro-mixed-trino/pom.xml b/amoro-format-mixed/amoro-mixed-trino/pom.xml index a91f845fe1..ff74ad1709 100644 --- a/amoro-format-mixed/amoro-mixed-trino/pom.xml +++ b/amoro-format-mixed/amoro-mixed-trino/pom.xml @@ -81,6 +81,10 @@ org.eclipse.jetty.orbit javax.servlet + + org.apache.logging.log4j + log4j-to-slf4j + @@ -98,6 +102,16 @@ io.airlift bootstrap ${airlift.version} + + + * + log4j-to-slf4j + + + org.slf4j + slf4j-jdk14 + + diff --git a/amoro-format-paimon/pom.xml b/amoro-format-paimon/pom.xml index ff98e9559f..c287766498 100644 --- a/amoro-format-paimon/pom.xml +++ b/amoro-format-paimon/pom.xml @@ -46,6 +46,12 @@ org.apache.paimon paimon-bundle + + + org.apache.logging.log4j + log4j-to-slf4j + + @@ -74,6 +80,10 @@ org.apache.logging.log4j log4j-slf4j2-impl + + org.apache.logging.log4j + log4j-slf4j-impl + diff --git a/amoro-optimizer/amoro-optimizer-spark/pom.xml b/amoro-optimizer/amoro-optimizer-spark/pom.xml index 69c4c1ebe7..6bcfc94e1b 100644 --- a/amoro-optimizer/amoro-optimizer-spark/pom.xml +++ b/amoro-optimizer/amoro-optimizer-spark/pom.xml @@ -48,6 +48,10 @@ org.slf4j slf4j-api + + org.apache.logging.log4j + log4j-slf4j-impl + @@ -97,6 +101,10 @@ org.apache.orc orc-mapreduce + + org.apache.logging.log4j + log4j-slf4j-impl + diff --git a/amoro-optimizer/amoro-optimizer-standalone/pom.xml b/amoro-optimizer/amoro-optimizer-standalone/pom.xml index 57b82bff27..73cad3d6ab 100644 --- a/amoro-optimizer/amoro-optimizer-standalone/pom.xml +++ b/amoro-optimizer/amoro-optimizer-standalone/pom.xml @@ -49,7 +49,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl runtime diff --git a/dev/deps/dependencies-hadoop-2-spark-3.3 b/dev/deps/dependencies-hadoop-2-spark-3.3 index 59c955b2bb..9c38f9fd84 100644 --- a/dev/deps/dependencies-hadoop-2-spark-3.3 +++ b/dev/deps/dependencies-hadoop-2-spark-3.3 @@ -292,7 +292,7 @@ listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-999 log4j-1.2-api/2.20.0//log4j-1.2-api-2.20.0.jar log4j-api/2.20.0//log4j-api-2.20.0.jar log4j-core/2.20.0//log4j-core-2.20.0.jar -log4j-slf4j-impl/2.20.0//log4j-slf4j-impl-2.20.0.jar +log4j-slf4j2-impl/2.20.0//log4j-slf4j2-impl-2.20.0.jar lucene-core/8.11.2//lucene-core-8.11.2.jar lz4-java/1.8.0//lz4-java-1.8.0.jar metrics-core/4.2.19//metrics-core-4.2.19.jar diff --git a/dev/deps/dependencies-hadoop-3-spark-3.5 b/dev/deps/dependencies-hadoop-3-spark-3.5 index d99a4078a8..5a1400e084 100644 --- a/dev/deps/dependencies-hadoop-3-spark-3.5 +++ b/dev/deps/dependencies-hadoop-3-spark-3.5 @@ -264,7 +264,7 @@ listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-999 log4j-1.2-api/2.20.0//log4j-1.2-api-2.20.0.jar log4j-api/2.20.0//log4j-api-2.20.0.jar log4j-core/2.20.0//log4j-core-2.20.0.jar -log4j-slf4j-impl/2.20.0//log4j-slf4j-impl-2.20.0.jar +log4j-slf4j2-impl/2.20.0//log4j-slf4j2-impl-2.20.0.jar lucene-core/8.11.2//lucene-core-8.11.2.jar lz4-java/1.8.0//lz4-java-1.8.0.jar metrics-core/4.2.19//metrics-core-4.2.19.jar diff --git a/pom.xml b/pom.xml index 3bd16417a7..9ea3287f3f 100644 --- a/pom.xml +++ b/pom.xml @@ -654,6 +654,13 @@ ${slf4j.version} + + org.apache.logging.log4j + log4j-slf4j2-impl + ${log4j.version} + + + org.apache.logging.log4j log4j-slf4j-impl @@ -1384,7 +1391,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test @@ -1800,6 +1807,39 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-conflicting-logging-dependencies + + enforce + + verify + + + + + + org.apache.logging.log4j:log4j-to-slf4j + + org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-simple + org.slf4j:slf4j-nop + org.slf4j:slf4j-jdk14 + + These logging dependencies conflict with log4j-slf4j2-impl. Exclude them at the source. + + + true + + + + org.apache.maven.plugins maven-jar-plugin