Upgrade slf4j to 1.7.25
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
diff --git a/CHANGES.txt b/CHANGES.txt
index 7aef38b..dcc5caf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.13
+ * Upgrade slf4j to 1.7.25 (CASSANDRA-17474)
* Upgrade jackson to 2.13.2 (CASSANDRA-17492)
* emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747)
* Fix snapshot true size calculation (CASSANDRA-17267)
diff --git a/build.xml b/build.xml
index 0081556..5948eca 100644
--- a/build.xml
+++ b/build.xml
@@ -357,9 +357,9 @@
<dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2">
<exclusion groupId="org.antlr" artifactId="stringtemplate"/>
</dependency>
- <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.7" />
+ <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
<dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.9"/>
<dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.9"/>
<dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.13.2"/>
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 763b1d7..bac46eb 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1922,7 +1922,7 @@
}
catch (DigestMismatchException ex)
{
- Tracing.trace("Digest mismatch: {}", ex);
+ Tracing.trace("Digest mismatch: {}", ex.toString());
ReadRepairMetrics.repairedBlocking.mark();
diff --git a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
index 702fa98..fe5d58e 100644
--- a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
+++ b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
@@ -39,7 +39,7 @@
{
Map<Level, Queue<Pair<String, Object[]>>> logged = new HashMap<>();
- Logger mock = new SubstituteLogger(null)
+ Logger mock = new SubstituteLogger(null, null, true)
{
@Override
