diff --git a/pom.xml b/pom.xml index d2522206c96..30a5ed03d70 100644 --- a/pom.xml +++ b/pom.xml @@ -550,8 +550,8 @@ true - 1.7.30 - 1.2.13 + 2.0.13 + 1.3.14 0.12.0 1.48 5.6.2 diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md index cfd8bb3d829..e571652e497 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 -n + CLASSPATH='lib/*:conf' java org.apache.zookeeper.server.PurgeTxnLog -n 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 384713a645f..47ddded77d5 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 5afcb0d34a3..0d247a99a05 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=";