This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 66202cb76 [ZOOKEEPER-4831] update slf4j from 1.x to 2.0.13, logback to
1.3.14 (#2162)
66202cb76 is described below
commit 66202cb764c203f64b954a917e421be57d2ae67a
Author: ZhangJian He <[email protected]>
AuthorDate: Sat May 11 15:46:37 2024 +0800
[ZOOKEEPER-4831] update slf4j from 1.x to 2.0.13, logback to 1.3.14 (#2162)
---
pom.xml | 4 ++--
zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md | 2 +-
zookeeper-server/src/main/resources/LICENSE.txt | 4 ++--
.../test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index d2522206c..30a5ed03d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,8 +550,8 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- dependency versions -->
- <slf4j.version>1.7.30</slf4j.version>
- <logback-version>1.2.13</logback-version>
+ <slf4j.version>2.0.13</slf4j.version>
+ <logback-version>1.3.14</logback-version>
<audience-annotations.version>0.12.0</audience-annotations.version>
<jmockit.version>1.48</jmockit.version>
<junit.version>5.6.2</junit.version>
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index cfd8bb3d8..e571652e4 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -436,7 +436,7 @@ in the unlikely event a recent log has become corrupted).
This
can be run as a cron job on the ZooKeeper server machines to
clean up the logs daily.
- java -cp
zookeeper.jar:lib/slf4j-api-1.7.30.jar:lib/logback-classic-1.2.10.jar:lib/logback-core-1.2.10.jar:conf
org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count>
+ CLASSPATH='lib/*:conf' java org.apache.zookeeper.server.PurgeTxnLog
<dataDir> <snapDir> -n <count>
Automatic purging of the snapshots and corresponding
diff --git a/zookeeper-server/src/main/resources/LICENSE.txt
b/zookeeper-server/src/main/resources/LICENSE.txt
index 384713a64..47ddded77 100644
--- a/zookeeper-server/src/main/resources/LICENSE.txt
+++ b/zookeeper-server/src/main/resources/LICENSE.txt
@@ -210,6 +210,6 @@ This distribution bundles jline 2.14.6, which is available
under the
2-clause BSD License. For details, see a copy of the license in
lib/jline-2.14.6.LICENSE.txt
-This distribution bundles SLF4J 1.7.30, which is available under the MIT
+This distribution bundles SLF4J 2.0.13, which is available under the MIT
License. For details, see a copy of the license in
-lib/slf4j-1.7.30.LICENSE.txt
+lib/slf4j-2.0.13.LICENSE.txt
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
index 5afcb0d34..0d247a99a 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
@@ -48,7 +48,7 @@ public class ReconfigExceptionTest extends ZKTestCase {
// Use DigestAuthenticationProvider.base64Encode or
// run ZooKeeper jar with
org.apache.zookeeper.server.auth.DigestAuthenticationProvider to generate
password.
// An example:
- // java -cp
zookeeper.jar:lib/slf4j-api-1.7.30.jar:lib/logback-classic-1.2.10.jar:lib/logback-core-1.2.10.jar:conf
+ // CLASSPATH='lib/*:conf' java
// org.apache.zookeeper.server.auth.DigestAuthenticationProvider super:test
// The password here is 'test'.
private static String superDigest = "super:D/InIHSb7yEEbrWz8b9l71RjZJU=";
