diff --git a/beeline/pom.xml b/beeline/pom.xml index 2198bd72e613..d7104200c510 100644 --- a/beeline/pom.xml +++ b/beeline/pom.xml @@ -125,7 +125,11 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core diff --git a/bin/ext/util/execHiveCmd.sh b/bin/ext/util/execHiveCmd.sh index 9a06ce01afe3..e59e1a240803 100644 --- a/bin/ext/util/execHiveCmd.sh +++ b/bin/ext/util/execHiveCmd.sh @@ -42,6 +42,61 @@ execHiveCmd () { HIVE_LIB=`cygpath -w "$HIVE_LIB"` fi + # For services that may encounter SLF4J conflicts (schemaTool, schematool, beeline), + # filter out old SLF4J 1.x jars from HADOOP_CLASSPATH to prevent binding conflicts + if [[ "$SERVICE" =~ ^(schemaTool|schematool|beeline)$ ]]; then + # [FIX]: Prefer packaged Hive configs first so CI does not depend on host /etc/hive content. + if [ -f "${HIVE_HOME}/conf/hive-log4j2.properties" ]; then + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j2.configurationFile=file://${HIVE_HOME}/conf/hive-log4j2.properties" + # Packaged dist may only ship the template; materialize a .properties file so Log4j2 + # selects the PropertiesConfiguration parser (it infers parser from filename extension). + elif [ -f "${HIVE_HOME}/conf/hive-log4j2.properties.template" ]; then + HIVE_LOG4J2_DIR="$(mktemp -d -t hive-log4j2.XXXXXX)" + HIVE_LOG4J2_FILE="${HIVE_LOG4J2_DIR}/hive-log4j2.properties" + cp "${HIVE_HOME}/conf/hive-log4j2.properties.template" "${HIVE_LOG4J2_FILE}" + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j2.configurationFile=file://${HIVE_LOG4J2_FILE}" + # Only fall back to system default if packaged configs are missing + elif [ -f "${HIVE_CONF_DIR}/hive-log4j2.properties" ]; then + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j2.configurationFile=file://${HIVE_CONF_DIR}/hive-log4j2.properties" + fi + + # Prevent Log4j2 from being reconfigured after initialization + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j2.disableShutdownHook=true" + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.shutdownHookEnabled=false" + + # CRITICAL: Tell Hadoop to load Hive's jars FIRST, overriding globally-installed + # Hadoop/Tez jars that contain old SLF4J 1.x bindings. This prevents the multiple + # SLF4J binding conflict seen in CI environments. + export HADOOP_USER_CLASSPATH_FIRST=true + + # Filter HADOOP_CLASSPATH to remove paths with old SLF4J/log4j bindings + if [ "$HADOOP_CLASSPATH" != "" ]; then + FILTERED_CP="" + IFS=':' read -ra CP_ARRAY <<< "$HADOOP_CLASSPATH" + for cp_entry in "${CP_ARRAY[@]}"; do + # Skip only specific SLF4J 1.x binding jars by filename + if [[ "$(basename "$cp_entry")" == slf4j-log4j12-*.jar || \ + "$(basename "$cp_entry")" == slf4j-reload4j-*.jar || \ + "$(basename "$cp_entry")" == log4j-slf4j-impl-*.jar || \ + "$(basename "$cp_entry")" == reload4j-*.jar ]]; then + continue + fi + # Skip explicit SLF4J 1.x jar paths and reload4j + if [[ "$cp_entry" == *slf4j-log4j12* || \ + "$cp_entry" == *slf4j-reload4j* || \ + "$cp_entry" == */reload4j-* ]]; then + continue + fi + if [ "$FILTERED_CP" == "" ]; then + FILTERED_CP="$cp_entry" + else + FILTERED_CP="${FILTERED_CP}:${cp_entry}" + fi + done + export HADOOP_CLASSPATH="$FILTERED_CP" + fi + fi + # hadoop 20 or newer - skip the aux_jars option. picked up from hiveconf exec $HADOOP jar ${HIVE_LIB}/$JAR $CLASS $HIVE_OPTS "$@" } diff --git a/bin/schematool b/bin/schematool old mode 100644 new mode 100755 diff --git a/common/pom.xml b/common/pom.xml index bffc3d3f357f..233229fc1616 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -124,7 +124,11 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core org.apache.commons diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index dcc5ebd8a481..cb43f18f6007 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -106,6 +106,10 @@ com.fasterxml.jackson.core jackson-databind + + org.apache.logging.log4j + log4j-slf4j-impl + org.apache.druid druid-aws-common diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index e83d67a6e2eb..1e37fbeb569c 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -132,6 +132,10 @@ jul-to-slf4j ${slf4j.version} + + org.apache.logging.log4j + log4j-slf4j2-impl + org.apache.hive hive-jdbc @@ -179,6 +183,22 @@ org.eclipse.jetty jetty-util + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + commons-logging + commons-logging + @@ -193,11 +213,45 @@ org.eclipse.jetty jetty-util + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + commons-logging + commons-logging + org.apache.hadoop hadoop-mapreduce-client-core + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + commons-logging + commons-logging + + javax.ws.rs diff --git a/iceberg/iceberg-catalog/pom.xml b/iceberg/iceberg-catalog/pom.xml index 4d1c48b5def9..f87a7554a226 100644 --- a/iceberg/iceberg-catalog/pom.xml +++ b/iceberg/iceberg-catalog/pom.xml @@ -31,6 +31,12 @@ org.apache.hive hive-iceberg-shading + + + org.slf4j + slf4j-reload4j + + org.apache.avro @@ -48,12 +54,24 @@ org.apache.hadoop hadoop-client + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop hadoop-hdfs test + + + org.slf4j + slf4j-reload4j + + org.assertj diff --git a/iceberg/iceberg-handler/pom.xml b/iceberg/iceberg-handler/pom.xml index ef20ab1aab4d..5ab252e19a56 100644 --- a/iceberg/iceberg-handler/pom.xml +++ b/iceberg/iceberg-handler/pom.xml @@ -33,10 +33,22 @@ org.apache.hive hive-iceberg-catalog true + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop hadoop-client + + + org.slf4j + slf4j-reload4j + + org.apache.hive @@ -107,6 +119,12 @@ org.apache.hadoop hadoop-hdfs test + + + org.slf4j + slf4j-reload4j + + org.assertj diff --git a/iceberg/iceberg-shading/pom.xml b/iceberg/iceberg-shading/pom.xml index 17d50dd91d62..315bf6d8e684 100644 --- a/iceberg/iceberg-shading/pom.xml +++ b/iceberg/iceberg-shading/pom.xml @@ -43,16 +43,34 @@ org.apache.iceberg iceberg-data true + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-parquet true + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-orc true + + + org.slf4j + slf4j-reload4j + + diff --git a/iceberg/pom.xml b/iceberg/pom.xml index 6b83676f65b4..b4facc0d3493 100644 --- a/iceberg/pom.xml +++ b/iceberg/pom.xml @@ -74,26 +74,56 @@ org.apache.iceberg iceberg-api ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-core ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-data ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-parquet ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.apache.iceberg iceberg-orc ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hive @@ -159,6 +189,10 @@ org.apache.avro avro + + org.slf4j + slf4j-reload4j + @@ -195,6 +229,12 @@ iceberg-core tests ${iceberg.version} + + + org.slf4j + slf4j-reload4j + + org.assertj diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml index 5227f9b05e28..65eac9993648 100644 --- a/itests/qtest-druid/pom.xml +++ b/itests/qtest-druid/pom.xml @@ -37,7 +37,6 @@ 16.0.1 4.1.0 4.1.0 - 1.7.30 diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index fdf75bd890bc..48777b5503ac 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -32,7 +32,6 @@ false -mkdir -p - 1.7.30 diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 3243d5d66f7f..5522712211a5 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -154,6 +154,22 @@ commons-beanutils commons-beanutils + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + commons-logging + commons-logging + true diff --git a/kudu-handler/pom.xml b/kudu-handler/pom.xml index a778cd7b63f9..ede4527d729f 100644 --- a/kudu-handler/pom.xml +++ b/kudu-handler/pom.xml @@ -112,6 +112,12 @@ kudu-test-utils ${kudu.version} test + + + org.apache.logging.log4j + log4j-slf4j-impl + + diff --git a/llap-server/pom.xml b/llap-server/pom.xml index a691cee6e1ed..d6158097c5ca 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -350,6 +350,14 @@ + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core + org.apache.logging.log4j log4j-core-test diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java index 39eda657d5a8..0c9b15bb7b18 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java @@ -29,7 +29,6 @@ import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; -import org.apache.logging.slf4j.Log4jMarker; import org.apache.tez.common.CallableWithNdc; import org.apache.hadoop.service.AbstractService; @@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; import org.slf4j.Marker; -import org.slf4j.impl.StaticMarkerBinder; +import org.slf4j.MarkerFactory; import java.io.IOException; import java.util.Collections; @@ -71,7 +70,7 @@ public class QueryTracker extends AbstractService { private static final Logger LOG = LoggerFactory.getLogger(QueryTracker.class); private static final Marker QUERY_COMPLETE_MARKER = - new Log4jMarker(StaticMarkerBinder.getSingleton().getMarkerFactory(), new Log4jQueryCompleteMarker()); + MarkerFactory.getMarker(Log4jQueryCompleteMarker.EOF_MARKER); /// Shared singleton MetricsSource instance for all DAG locks private static final MetricsSource LOCK_METRICS; diff --git a/packaging/pom.xml b/packaging/pom.xml index 9b9ff3c8b499..c880f6cc50e6 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -276,6 +276,16 @@ org.apache.hive hive-common ${project.version} + + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j-impl + + org.apache.hive @@ -296,6 +306,16 @@ org.apache.hive hive-exec ${project.version} + + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j-impl + + org.apache.hive @@ -472,5 +492,13 @@ hive-kudu-handler ${project.version} + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core + diff --git a/pom.xml b/pom.xml index ae48bf9ba4f4..a5f0e04ff9f7 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ 0.16.1 1.3.0 1.0.1 - 1.7.30 + 2.0.13 4.0.4 4.3.0-SNAPSHOT 0.10.5 @@ -241,17 +241,6 @@ 11.28 - - - central - central - https://repo.maven.apache.org/maven2 - default - - true - warn - - @@ -494,7 +483,12 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core ${log4j2.version} @@ -639,6 +633,18 @@ + + org.apache.kudu + kudu-test-utils + ${kudu.version} + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.orc orc-core @@ -654,6 +660,17 @@ + + org.apache.hive + hive-exec + ${project.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.hive hive-storage-api @@ -924,6 +941,11 @@ slf4j-api ${slf4j.version} + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + xerces xercesImpl @@ -938,6 +960,14 @@ commons-logging commons-logging + + org.slf4j + slf4j-reload4j + + + org.slf4j + slf4j-log4j12 + @@ -972,6 +1002,10 @@ hadoop-common ${hadoop.version} + + org.apache.logging.log4j + log4j-slf4j-impl + org.slf4j slf4j-log4j12 @@ -980,10 +1014,6 @@ org.slf4j slf4j-reload4j - - ch.qos.reload4j - reload4j - commons-logging commons-logging @@ -1027,6 +1057,10 @@ io.netty netty-all + + org.slf4j + slf4j-reload4j + @@ -1042,10 +1076,6 @@ org.slf4j slf4j-reload4j - - ch.qos.reload4j - reload4j - commons-logging commons-logging @@ -1077,10 +1107,6 @@ org.slf4j slf4j-reload4j - - ch.qos.reload4j - reload4j - commons-logging commons-logging @@ -1108,10 +1134,6 @@ org.slf4j slf4j-reload4j - - ch.qos.reload4j - reload4j - org.jline jline @@ -1147,10 +1169,6 @@ org.slf4j slf4j-reload4j - - ch.qos.reload4j - reload4j - commons-logging commons-logging @@ -1161,6 +1179,12 @@ org.apache.hadoop hadoop-yarn-api ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop @@ -1171,22 +1195,44 @@ org.jline jline + + org.slf4j + slf4j-reload4j + org.apache.hadoop hadoop-yarn-common ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop hadoop-yarn-registry ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop hadoop-yarn-server-web-common ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop @@ -1197,22 +1243,44 @@ io.netty netty-all + + org.slf4j + slf4j-reload4j + org.apache.hbase hbase-common ${hbase.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hbase hbase-client ${hbase.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hbase hbase-hadoop-compat ${hbase.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hbase @@ -1255,6 +1323,10 @@ com.codahale.metrics metrics-core + + org.slf4j + slf4j-reload4j + @@ -1266,12 +1338,22 @@ org.glassfish.web javax.servlet.jsp + + org.slf4j + slf4j-reload4j + org.apache.hbase hbase-mapreduce ${hbase.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hbase @@ -1283,6 +1365,12 @@ org.apache.hadoop hadoop-minicluster ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.jamon @@ -1321,6 +1409,12 @@ org.apache.tez tez-runtime-internals ${tez.version} + + + org.slf4j + slf4j-reload4j + + org.apache.tez @@ -1331,6 +1425,10 @@ io.netty netty + + org.slf4j + slf4j-reload4j + @@ -1346,12 +1444,22 @@ com.sun.jersey jersey-client + + org.slf4j + slf4j-reload4j + org.apache.tez tez-dag ${tez.version} + + + org.slf4j + slf4j-reload4j + + org.apache.tez @@ -1387,12 +1495,22 @@ org.apache.hadoop hadoop-yarn-client + + org.slf4j + slf4j-reload4j + org.apache.tez tez-common ${tez.version} + + + org.slf4j + slf4j-reload4j + + org.apache.tez @@ -1492,6 +1610,10 @@ + + org.apache.logging.log4j + log4j-slf4j2-impl + org.slf4j slf4j-api diff --git a/ql/pom.xml b/ql/pom.xml index 994dbacf4e84..fc7f63333ae7 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -228,7 +228,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.antlr diff --git a/serde/pom.xml b/serde/pom.xml index 5c4f638213ed..ab045e066073 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -224,12 +224,6 @@ - - org.slf4j - slf4j-simple - ${slf4j.version} - test - com.esri.geometry esri-geometry-api @@ -242,6 +236,12 @@ ${mockito-core.version} test + + org.slf4j + slf4j-simple + ${slf4j.version} + test + diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index 640e68d8ad18..504e172fea3c 100644 --- a/standalone-metastore/metastore-common/pom.xml +++ b/standalone-metastore/metastore-common/pom.xml @@ -80,6 +80,14 @@ com.nimbusds nimbus-jose-jwt + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + @@ -333,6 +341,7 @@ org.slf4j slf4j-simple + ${slf4j.version} test diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index 64926eaba1c9..76215b0ea28c 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -270,7 +270,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.apache.logging.log4j diff --git a/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh b/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh index af2cda018fb7..d74d0c46b57e 100644 --- a/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh @@ -26,6 +26,40 @@ schemaTool() { fi JAR=${METASTORE_LIB}/hive-standalone-metastore-server-*.jar + # Prevent Log4j2 from being reconfigured after initialization + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j2.disableShutdownHook=true" + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.shutdownHookEnabled=false" + + # CRITICAL: Tell Hadoop to load metastore jars FIRST to prevent SLF4J binding conflicts + export HADOOP_USER_CLASSPATH_FIRST=true + + # Filter HADOOP_CLASSPATH to remove old SLF4J 1.x bindings + if [ "$HADOOP_CLASSPATH" != "" ]; then + FILTERED_CP="" + IFS=':' read -ra CP_ARRAY <<< "$HADOOP_CLASSPATH" + for cp_entry in "${CP_ARRAY[@]}"; do + # Skip SLF4J 1.x binding jars by filename + if [[ "$(basename "$cp_entry")" == slf4j-log4j12-*.jar || \ + "$(basename "$cp_entry")" == slf4j-reload4j-*.jar || \ + "$(basename "$cp_entry")" == log4j-slf4j-impl-*.jar || \ + "$(basename "$cp_entry")" == reload4j-*.jar ]]; then + continue + fi + # Skip explicit SLF4J 1.x jar paths + if [[ "$cp_entry" == *slf4j-log4j12* || \ + "$cp_entry" == *slf4j-reload4j* || \ + "$cp_entry" == */reload4j-* ]]; then + continue + fi + if [ "$FILTERED_CP" == "" ]; then + FILTERED_CP="$cp_entry" + else + FILTERED_CP="${FILTERED_CP}:${cp_entry}" + fi + done + export HADOOP_CLASSPATH="$FILTERED_CP" + fi + # hadoop 20 or newer - skip the aux_jars option and hiveconf exec $HADOOP jar $JAR $CLASS "$@" } diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml index 4e38d2dc1441..e67f0a048d8e 100644 --- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml +++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml @@ -81,7 +81,11 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl + + + org.apache.logging.log4j + log4j-core diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml index 89c0d8153e32..1cca4b39707a 100644 --- a/standalone-metastore/metastore-tools/pom.xml +++ b/standalone-metastore/metastore-tools/pom.xml @@ -33,7 +33,7 @@ 16.0.2 .. - + @@ -74,12 +74,6 @@ commons-math3 ${commons-math3.version} - - - org.slf4j - slf4j-log4j12 - 1.7.30 - org.jetbrains diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 30ca1bf00f4d..923ab946348f 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -116,7 +116,7 @@ 9.2.1 4.8.6 2.8.4 - 1.7.30 + 2.0.13 4.4.13 4.5.13 4.5.8 @@ -175,6 +175,16 @@ com.github.joshelser dropwizard-metrics-hadoop-metrics2-reporter ${dropwizard-metrics-hadoop-metrics2-reporter.version} + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + com.google.guava @@ -317,7 +327,12 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core ${log4j2.version} @@ -392,6 +407,11 @@ slf4j-api ${slf4j.version} + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + org.springframework spring-jdbc @@ -537,17 +557,17 @@ + + org.keycloak + keycloak-admin-client + ${keycloak.version} + org.slf4j slf4j-simple ${slf4j.version} test - - org.keycloak - keycloak-admin-client - ${keycloak.version} - org.testcontainers mariadb diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 3627fc9cf270..5a131dcb01e0 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -35,7 +35,7 @@ 4.13.2 5.13.3 5.13.3 - 1.7.30 + 2.0.13 4.8.6 3.5.0 2.7.10