Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ZOOKEEPER-4831] update slf4j from 1.x to 2.0.13, logback to 1.3.14 #2162

Merged
merged 2 commits into from
May 11, 2024
Merged

[ZOOKEEPER-4831] update slf4j from 1.x to 2.0.13, logback to 1.3.14 #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ff04d
[ZOOKEEPER-4831] update slf4j from 1.x to 2.0.13, logback to 1.3.14
shoothzj Apr 29, 2024
d37d826
using pattern classpath instead of -cp
shoothzj May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-server/src/main/resources/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
Expand Down
Loading