natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade slf4j to 1.7.25 

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
This commit is contained in:
Brandon Williams 2022-03-24 07:35:50 -05:00
parent a6864cccd4
commit f32d2b06de
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

6
build.xml
View File

@ -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"/>

2
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -1922,7 +1922,7 @@ public class StorageProxy implements StorageProxyMBean
}
catch (DigestMismatchException ex)
{
Tracing.trace("Digest mismatch: {}", ex);
Tracing.trace("Digest mismatch: {}", ex.toString());
ReadRepairMetrics.repairedBlocking.mark();

2
test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
View File

@ -39,7 +39,7 @@ public class NoSpamLoggerTest
{
Map<Level, Queue<Pair<String, Object[]>>> logged = new HashMap<>();
Logger mock = new SubstituteLogger(null)
Logger mock = new SubstituteLogger(null, null, true)
{
@Override