This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new 3a7e5f8 Revert "Upgrade slf4j to 1.7.25"
3a7e5f8 is described below
commit 3a7e5f8ed8bb3abd717c21dfa30074ba94516040
Author: Brandon Williams <[email protected]>
AuthorDate: Fri Mar 25 15:00:43 2022 -0500
Revert "Upgrade slf4j to 1.7.25"
This reverts commit 234bdc87a53a464596b3baae42777dab1e5f52b3.
---
CHANGES.txt | 1 -
build.xml | 6 +++---
test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e73721..8e60deb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
3.11.13
- * Upgrade slf4j to 1.7.25
* emit warning on keyspace creation when replication factor is bigger than
the number of nodes (CASSANDRA-16747)
* Fix snapshot true size calculation (CASSANDRA-17267)
* Validate existence of DCs when repairing (CASSANDRA-17407)
diff --git a/build.xml b/build.xml
index b703131..de1e9d2 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.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="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="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.12.5"/>
diff --git a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
index fe5d58e..702fa98 100644
--- a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
+++ b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java
@@ -39,7 +39,7 @@ public class NoSpamLoggerTest
{
Map<Level, Queue<Pair<String, Object[]>>> logged = new HashMap<>();
- Logger mock = new SubstituteLogger(null, null, true)
+ Logger mock = new SubstituteLogger(null)
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
