diff --git a/bin/start-coordinator.sh b/bin/start-coordinator.sh index 0ed2d60b9b..6f760f49de 100755 --- a/bin/start-coordinator.sh +++ b/bin/start-coordinator.sh @@ -28,9 +28,8 @@ cd "$RSS_HOME" COORDINATOR_CONF_FILE="${RSS_CONF_DIR}/coordinator.conf" JAR_DIR="${RSS_HOME}/jars" -LOG_CONF_FILE="${RSS_CONF_DIR}/log4j.properties" +LOG_CONF_FILE="${RSS_CONF_DIR}/log4j2.xml" LOG_PATH="${RSS_LOG_DIR}/coordinator.log" -OUT_PATH="${RSS_LOG_DIR}/coordinator.out" MAIN_CLASS="org.apache.uniffle.coordinator.CoordinatorServer" @@ -87,13 +86,13 @@ JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \ ARGS="" if [ -f ${LOG_CONF_FILE} ]; then - ARGS="$ARGS -Dlog4j.configuration=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" + ARGS="$ARGS -Dlog4j2.configurationFile=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" else echo "Exit with error: ${LOG_CONF_FILE} file doesn't exist." exit 1 fi -$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ &> $OUT_PATH & +$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ & get_pid_file_name coordinator echo $! >${RSS_PID_DIR}/${pid_file} diff --git a/bin/start-dashboard.sh b/bin/start-dashboard.sh index b54fa0cf28..f21c6790fd 100644 --- a/bin/start-dashboard.sh +++ b/bin/start-dashboard.sh @@ -28,9 +28,8 @@ cd "$RSS_HOME" DASHBOARD_CONF_FILE="${RSS_CONF_DIR}/dashboard.conf" JAR_DIR="${RSS_HOME}/jars" -LOG_CONF_FILE="${RSS_CONF_DIR}/log4j.properties" +LOG_CONF_FILE="${RSS_CONF_DIR}/log4j2.xml" LOG_PATH="${RSS_LOG_DIR}/dashboard.log" -OUT_PATH="${RSS_LOG_DIR}/dashboard.out" MAIN_CLASS="org.apache.uniffle.dashboard.web.JettyServerFront" @@ -74,13 +73,13 @@ JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \ ARGS="" if [ -f ${LOG_CONF_FILE} ]; then - ARGS="$ARGS -Dlog4j.configuration=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" + ARGS="$ARGS -Dlog4j2.configurationFile=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" else echo "Exit with error: ${LOG_CONF_FILE} file doesn't exist." exit 1 fi -$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$DASHBOARD_CONF_FILE" $@ &> $OUT_PATH & +$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS -cp $CLASSPATH $MAIN_CLASS --conf "$DASHBOARD_CONF_FILE" $@ & get_pid_file_name dashboard echo $! >${RSS_PID_DIR}/${pid_file} diff --git a/bin/start-shuffle-server.sh b/bin/start-shuffle-server.sh index d289a59ae3..3be4166054 100755 --- a/bin/start-shuffle-server.sh +++ b/bin/start-shuffle-server.sh @@ -28,9 +28,8 @@ cd "$RSS_HOME" SHUFFLE_SERVER_CONF_FILE="${RSS_CONF_DIR}/server.conf" JAR_DIR="${RSS_HOME}/jars" -LOG_CONF_FILE="${RSS_CONF_DIR}/log4j.properties" +LOG_CONF_FILE="${RSS_CONF_DIR}/log4j2.xml" LOG_PATH="${RSS_LOG_DIR}/shuffle_server.log" -OUT_PATH="${RSS_LOG_DIR}/shuffle_server.out" if [ -z "${XMX_SIZE:-}" ]; then echo "No env XMX_SIZE." @@ -124,13 +123,13 @@ JAVA11_EXTRA_ARGS=" -XX:+IgnoreUnrecognizedVMOptions \ ARGS="" if [ -f ${LOG_CONF_FILE} ]; then - ARGS="$ARGS -Dlog4j.configuration=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" + ARGS="$ARGS -Dlog4j2.configurationFile=file:${LOG_CONF_FILE} -Dlog.path=${LOG_PATH}" else echo "Exit with error: ${LOG_CONF_FILE} file doesn't exist." exit 1 fi -$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS $JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@ &> $OUT_PATH & +$RUNNER $ARGS $JVM_ARGS $JAVA11_EXTRA_ARGS $JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@ & get_pid_file_name shuffle-server echo $! >${RSS_PID_DIR}/${pid_file} diff --git a/bin/uniffle-function.sh b/bin/uniffle-function.sh index 03bc7741ce..78a6d048c4 100644 --- a/bin/uniffle-function.sh +++ b/bin/uniffle-function.sh @@ -384,7 +384,7 @@ function uniffle_basic_init UNIFFLE_LOGFILE=${UNIFFLE_LOGFILE:-uniffle.log} UNIFFLE_STOP_TIMEOUT=${UNIFFLE_STOP_TIMEOUT:-60} UNIFFLE_PID_DIR=${RSS_PID_DIR:-"${RSS_HOME}"} - UNIFFLE_LOG_CONF_FILE=${LOG_CONF_FILE:-"${RSS_CONF_DIR}/log4j.properties"} + UNIFFLE_LOG_CONF_FILE=${LOG_CONF_FILE:-"${RSS_CONF_DIR}/log4j2.xml"} uniffle_debug "USER: "$USER uniffle_debug "UNIFFLE_IDENT_STRING: "$UNIFFLE_IDENT_STRING @@ -793,7 +793,7 @@ function uniffle_mkdir function uniffle_finalize_uniffle_opts { set +u - uniffle_add_param UNIFFLE_OPTS log4j.configuration "-Dlog4j.configuration=file:${UNIFFLE_LOG_CONF_FILE}" + uniffle_add_param UNIFFLE_OPTS log4j2.configurationFile "-Dlog4j2.configurationFile=file:${UNIFFLE_LOG_CONF_FILE}" uniffle_add_param UNIFFLE_OPTS uniffle.log.dir "-Duniffle.log.dir=${UNIFFLE_LOG_DIR}" uniffle_add_param UNIFFLE_OPTS uniffle.home.dir "-Duniffle.home.dir=${RSS_HOME}" uniffle_add_param UNIFFLE_OPTS uniffle.id.str "-Duniffle.id.str=${UNIFFLE_IDENT_STRING}" diff --git a/client-mr/core/pom.xml b/client-mr/core/pom.xml index 3b016a6807..42ffb6112d 100644 --- a/client-mr/core/pom.xml +++ b/client-mr/core/pom.xml @@ -57,6 +57,10 @@ com.google.protobuf protobuf-java + + org.slf4j + slf4j-log4j12 + @@ -68,6 +72,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + diff --git a/client-mr/core/src/test/resources/log4j.properties b/client-mr/core/src/test/resources/log4j.properties deleted file mode 100644 index 946ffcc22c..0000000000 --- a/client-mr/core/src/test/resources/log4j.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -log4j.rootLogger=info,stdout -log4j.threshhold=ALL -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n diff --git a/client-mr/core/src/test/resources/log4j2.xml b/client-mr/core/src/test/resources/log4j2.xml new file mode 100644 index 0000000000..8db107a47f --- /dev/null +++ b/client-mr/core/src/test/resources/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client-mr/hadoop2.8/pom.xml b/client-mr/hadoop2.8/pom.xml index ffc6a73dcb..7a28c56cb2 100644 --- a/client-mr/hadoop2.8/pom.xml +++ b/client-mr/hadoop2.8/pom.xml @@ -38,6 +38,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -49,6 +53,12 @@ org.apache.hadoop hadoop-mapreduce-client-app ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + diff --git a/client-mr/hadoop3.2/pom.xml b/client-mr/hadoop3.2/pom.xml index 98669dae30..e5dd86113a 100644 --- a/client-mr/hadoop3.2/pom.xml +++ b/client-mr/hadoop3.2/pom.xml @@ -42,6 +42,10 @@ com.google.protobuf protobuf-java + + org.slf4j + slf4j-log4j12 + @@ -53,6 +57,12 @@ org.apache.hadoop hadoop-mapreduce-client-app ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + diff --git a/client-spark/common/pom.xml b/client-spark/common/pom.xml index 41ddb59443..7655c28ba5 100644 --- a/client-spark/common/pom.xml +++ b/client-spark/common/pom.xml @@ -51,6 +51,12 @@ spark-core_${scala.binary.version} ${spark.version} provided + + + org.slf4j + slf4j-log4j12 + + org.apache.uniffle @@ -72,6 +78,10 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2/pom.xml index e831291c03..a911f1d982 100644 --- a/client-spark/spark2/pom.xml +++ b/client-spark/spark2/pom.xml @@ -46,10 +46,12 @@ spark-core_${scala.binary.version} ${spark.version} provided - - - org.slf4j - slf4j-api + + + org.slf4j + slf4j-log4j12 + + org.mockito @@ -60,6 +62,12 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + io.netty diff --git a/client-spark/spark3/pom.xml b/client-spark/spark3/pom.xml index 09ee6b3a9a..1aac6bbcdd 100644 --- a/client-spark/spark3/pom.xml +++ b/client-spark/spark3/pom.xml @@ -42,6 +42,12 @@ spark-core_${scala.binary.version} ${spark.version} provided + + + org.slf4j + slf4j-log4j12 + + org.apache.uniffle @@ -79,6 +85,12 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + org.apache.spark diff --git a/client-tez/pom.xml b/client-tez/pom.xml index fab61259af..874ccc4936 100644 --- a/client-tez/pom.xml +++ b/client-tez/pom.xml @@ -99,6 +99,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -128,6 +132,12 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + diff --git a/client-tez/src/test/resources/log4j.properties b/client-tez/src/test/resources/log4j.properties deleted file mode 100644 index 946ffcc22c..0000000000 --- a/client-tez/src/test/resources/log4j.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -log4j.rootLogger=info,stdout -log4j.threshhold=ALL -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n diff --git a/client-tez/src/test/resources/log4j2.xml b/client-tez/src/test/resources/log4j2.xml new file mode 100644 index 0000000000..8db107a47f --- /dev/null +++ b/client-tez/src/test/resources/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/pom.xml b/client/pom.xml index 73d2ae79e3..0c5ee3d64b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -43,10 +43,6 @@ test-jar test - - org.slf4j - slf4j-api - org.mockito mockito-inline @@ -64,11 +60,21 @@ com.google.protobuf protobuf-java + + org.slf4j + slf4j-log4j12 + org.apache.hadoop hadoop-minicluster + + + org.slf4j + slf4j-log4j12 + + diff --git a/common/pom.xml b/common/pom.xml index 9f9d11d125..a1db4ed736 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -103,6 +103,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -113,11 +117,21 @@ junit junit + + org.slf4j + slf4j-log4j12 + org.apache.hadoop hadoop-minicluster + + + org.slf4j + slf4j-log4j12 + + com.github.luben @@ -129,10 +143,6 @@ snappy-java provided - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-servlet diff --git a/conf/log4j.properties b/conf/log4j.properties deleted file mode 100644 index 6b7b39d4bb..0000000000 --- a/conf/log4j.properties +++ /dev/null @@ -1,33 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -log4j.rootCategory=INFO, RollingAppender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Threshold=INFO -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M - %m%n -log4j.appender.RollingAppender=org.apache.log4j.RollingFileAppender -log4j.appender.RollingAppender.File=${log.path} -log4j.appender.RollingAppender.MaxFileSize=2GB -log4j.appender.RollingAppender.MaxBackupIndex=10 -log4j.appender.RollingAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.RollingAppender.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M - %m%n - -log4j.logger.io.grpc.netty.shaded.io.grpc.netty=INFO -log4j.logger.org.apache.hadoop=INFO -log4j.logger.org.eclipse.jetty=INFO \ No newline at end of file diff --git a/conf/log4j2.xml b/conf/log4j2.xml new file mode 100644 index 0000000000..6ea652a087 --- /dev/null +++ b/conf/log4j2.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coordinator/pom.xml b/coordinator/pom.xml index a1c9cccab2..fe842ced7e 100644 --- a/coordinator/pom.xml +++ b/coordinator/pom.xml @@ -80,6 +80,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + diff --git a/integration-test/common/pom.xml b/integration-test/common/pom.xml index 38f3732b2b..aa4f5cd603 100644 --- a/integration-test/common/pom.xml +++ b/integration-test/common/pom.xml @@ -91,6 +91,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -111,6 +115,10 @@ junit junit + + org.slf4j + slf4j-log4j12 + diff --git a/integration-test/mr/pom.xml b/integration-test/mr/pom.xml index fb788886d3..0b1b378e6c 100644 --- a/integration-test/mr/pom.xml +++ b/integration-test/mr/pom.xml @@ -65,6 +65,12 @@ hadoop-minicluster ${hadoop.version} test + + + org.slf4j + slf4j-log4j12 + + org.apache.uniffle @@ -92,6 +98,12 @@ org.apache.hadoop hadoop-mapreduce-client-app ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + org.apache.hadoop @@ -102,6 +114,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + diff --git a/integration-test/spark-common/pom.xml b/integration-test/spark-common/pom.xml index b2193f8545..eea33dff1a 100644 --- a/integration-test/spark-common/pom.xml +++ b/integration-test/spark-common/pom.xml @@ -114,6 +114,10 @@ com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} + + org.slf4j + slf4j-log4j12 + @@ -121,6 +125,12 @@ spark-sql_${scala.binary.version} ${spark.version} test + + + org.slf4j + slf4j-log4j12 + + com.fasterxml.jackson.core @@ -149,6 +159,10 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + diff --git a/integration-test/spark2/pom.xml b/integration-test/spark2/pom.xml index b0733952ee..e3b0ee8182 100644 --- a/integration-test/spark2/pom.xml +++ b/integration-test/spark2/pom.xml @@ -109,6 +109,10 @@ com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} + + org.slf4j + slf4j-log4j12 + @@ -116,6 +120,12 @@ spark-sql_${scala.binary.version} ${spark.version} test + + + org.slf4j + slf4j-log4j12 + + com.fasterxml.jackson.core @@ -150,6 +160,10 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + diff --git a/integration-test/spark3/pom.xml b/integration-test/spark3/pom.xml index c089e040c9..768728d9ed 100644 --- a/integration-test/spark3/pom.xml +++ b/integration-test/spark3/pom.xml @@ -104,6 +104,12 @@ spark-sql_${scala.binary.version} ${spark.version} test + + + org.slf4j + slf4j-log4j12 + + org.apache.uniffle @@ -132,6 +138,12 @@ org.apache.hadoop hadoop-minicluster + + + org.slf4j + slf4j-log4j12 + + diff --git a/integration-test/tez/pom.xml b/integration-test/tez/pom.xml index ba65a85417..a63b741b3c 100644 --- a/integration-test/tez/pom.xml +++ b/integration-test/tez/pom.xml @@ -107,6 +107,12 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + org.apache.hadoop @@ -117,6 +123,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + diff --git a/internal-client/pom.xml b/internal-client/pom.xml index 52472fa321..1f88e65498 100644 --- a/internal-client/pom.xml +++ b/internal-client/pom.xml @@ -37,9 +37,5 @@ org.apache.uniffle rss-common - - org.slf4j - slf4j-api - diff --git a/pom.xml b/pom.xml index 4cbf7567f8..2491416f23 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 5.8.2 1.8.2 2.0.1 - 2.17.1 + 2.23.0 3.1.2 ${java.version} ${java.version} @@ -151,11 +151,6 @@ 1.1.1 - - org.slf4j - slf4j-reload4j - - com.google.errorprone error_prone_annotations @@ -186,17 +181,30 @@ system-stubs-jupiter test + + + + org.slf4j + slf4j-api + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + - - org.slf4j - slf4j-reload4j - ${slf4j.version} - runtime - - com.google.protobuf protobuf-java-util @@ -245,16 +253,6 @@ netty-all ${netty.version} - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.core.version} - com.google.guava guava @@ -395,6 +393,10 @@ org.apache.httpcomponents httpclient + + org.slf4j + slf4j-log4j12 + @@ -511,6 +513,10 @@ org.apache.httpcomponents httpclient + + org.slf4j + slf4j-log4j12 + @@ -640,6 +646,10 @@ org.apache.httpcomponents httpclient + + org.slf4j + slf4j-log4j12 + @@ -737,6 +747,34 @@ snakeyaml ${snakeyaml.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + org.apache.logging.log4j + log4j-slf4j2-impl + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + @@ -793,6 +831,11 @@ + + + org.slf4j:slf4j-log4j12 + + @@ -1616,7 +1659,8 @@ 3.4.1 3 2.14.2 - 2.19.0 + 2.19.0 + 2.0.6 client-spark/common @@ -1698,6 +1742,19 @@ + + + + org.apache.logging.log4j + log4j-slf4j-impl + provided + + + + org.apache.logging.log4j + log4j-slf4j2-impl + + @@ -1707,7 +1764,8 @@ 3.5.0 3 2.15.2 - 2.19.0 + 2.20.0 + 2.0.7 client-spark/common @@ -1789,6 +1847,19 @@ + + + + org.apache.logging.log4j + log4j-slf4j-impl + provided + + + + org.apache.logging.log4j + log4j-slf4j2-impl + + @@ -2139,6 +2210,10 @@ org.apache.httpcomponents httpclient + + org.slf4j + slf4j-log4j12 + diff --git a/server/pom.xml b/server/pom.xml index 4d3dda04f5..6527fbfb55 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -87,6 +87,12 @@ org.apache.hadoop hadoop-common ${hadoop.scope} + + + org.slf4j + slf4j-log4j12 + + org.apache.hadoop @@ -96,6 +102,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -140,6 +150,10 @@ junit junit + + org.slf4j + slf4j-log4j12 + diff --git a/storage/pom.xml b/storage/pom.xml index 90b34e3c90..7d0e741f24 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -40,6 +40,12 @@ org.apache.hadoop hadoop-client + + + org.slf4j + slf4j-log4j12 + + @@ -50,6 +56,10 @@ com.sun.jersey jersey-json + + org.slf4j + slf4j-log4j12 + @@ -73,6 +83,10 @@ junit junit + + org.slf4j + slf4j-log4j12 +