This is an automated email from the ASF dual-hosted git repository.
symat 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 492fd79 ZOOKEEPER-3941: Upgrade commons-cli to 1.4
492fd79 is described below
commit 492fd79b0c7845f1b7f3717632471d79660d1363
Author: Tamas Penzes <[email protected]>
AuthorDate: Wed Sep 23 12:13:34 2020 +0000
ZOOKEEPER-3941: Upgrade commons-cli to 1.4
commons-cli 1.2 was released in 2009, time to upgrade it to the newest
version (1.4).
To avoid deprecation messages we have to upgrade the Java code too.
Author: Tamas Penzes <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Mate Szalay-Beko
<[email protected]>
Closes #1463 from tamaashu/zookeeper-3941
---
pom.xml | 2 +-
.../org/apache/zookeeper/cli/AddAuthCommand.java | 5 +-
.../org/apache/zookeeper/cli/AddWatchCommand.java | 5 +-
.../org/apache/zookeeper/cli/CreateCommand.java | 5 +-
.../org/apache/zookeeper/cli/DelQuotaCommand.java | 5 +-
.../org/apache/zookeeper/cli/DeleteAllCommand.java | 5 +-
.../org/apache/zookeeper/cli/DeleteCommand.java | 7 ++-
.../org/apache/zookeeper/cli/GetAclCommand.java | 5 +-
.../zookeeper/cli/GetAllChildrenNumberCommand.java | 5 +-
.../java/org/apache/zookeeper/cli/GetCommand.java | 7 ++-
.../org/apache/zookeeper/cli/GetConfigCommand.java | 5 +-
.../apache/zookeeper/cli/GetEphemeralsCommand.java | 5 +-
.../org/apache/zookeeper/cli/ListQuotaCommand.java | 5 +-
.../java/org/apache/zookeeper/cli/LsCommand.java | 7 ++-
.../org/apache/zookeeper/cli/ReconfigCommand.java | 5 +-
.../apache/zookeeper/cli/RemoveWatchesCommand.java | 5 +-
.../org/apache/zookeeper/cli/SetAclCommand.java | 5 +-
.../java/org/apache/zookeeper/cli/SetCommand.java | 5 +-
.../org/apache/zookeeper/cli/SetQuotaCommand.java | 5 +-
.../java/org/apache/zookeeper/cli/StatCommand.java | 7 ++-
.../java/org/apache/zookeeper/cli/SyncCommand.java | 5 +-
.../org/apache/zookeeper/cli/VersionCommand.java | 5 +-
.../apache/zookeeper/server/SnapshotComparer.java | 62 +++++++++++-----------
.../server/persistence/TxnLogToolkit.java | 4 +-
24 files changed, 80 insertions(+), 101 deletions(-)
diff --git a/pom.xml b/pom.xml
index b44967b..db2261f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -434,7 +434,7 @@
<log4j.version>1.2.17</log4j.version>
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
- <commons-cli.version>1.2</commons-cli.version>
+ <commons-cli.version>1.4</commons-cli.version>
<netty.version>4.1.50.Final</netty.version>
<jetty.version>9.4.24.v20191120</jetty.version>
<jackson.version>2.10.3</jackson.version>
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java
index de466f6..b59a90d 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
/**
* addAuth command for cli
@@ -38,7 +37,7 @@ public class AddAuthCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java
index 1e34b10..591de8b 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java
@@ -20,10 +20,9 @@ package org.apache.zookeeper.cli;
import java.util.Arrays;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.AddWatchMode;
import org.apache.zookeeper.KeeperException;
@@ -50,7 +49,7 @@ public class AddWatchCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/CreateCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/CreateCommand.java
index d906238..181a04e 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/CreateCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/CreateCommand.java
@@ -20,11 +20,10 @@ package org.apache.zookeeper.cli;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
@@ -54,7 +53,7 @@ public class CreateCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DelQuotaCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DelQuotaCommand.java
index 56e630b..6d9f870 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DelQuotaCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DelQuotaCommand.java
@@ -21,12 +21,11 @@ package org.apache.zookeeper.cli;
import java.io.IOException;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Quotas;
import org.apache.zookeeper.StatsTrack;
@@ -53,7 +52,7 @@ public class DelQuotaCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteAllCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteAllCommand.java
index cbeceb0..537a9b0 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteAllCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteAllCommand.java
@@ -19,11 +19,10 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKUtil;
@@ -50,7 +49,7 @@ public class DeleteAllCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteCommand.java
index 228eba4..91d9851 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/DeleteCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
/**
@@ -44,7 +43,7 @@ public class DeleteCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
@@ -64,7 +63,7 @@ public class DeleteCommand extends CliCommand {
if (args.length > 2) {
err.println("'delete path [version]' has been deprecated. "
+ "Please use 'delete [-v version] path' instead.");
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAclCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAclCommand.java
index 5533950..0ecdc9e 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAclCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAclCommand.java
@@ -19,10 +19,9 @@ package org.apache.zookeeper.cli;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKUtil;
import org.apache.zookeeper.data.ACL;
@@ -47,7 +46,7 @@ public class GetAclCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAllChildrenNumberCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAllChildrenNumberCommand.java
index dda48d1..342a460 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAllChildrenNumberCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetAllChildrenNumberCommand.java
@@ -18,10 +18,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
/**
@@ -38,7 +37,7 @@ public class GetAllChildrenNumberCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetCommand.java
index 57821ed..96bf0fd 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
@@ -47,7 +46,7 @@ public class GetCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
@@ -69,7 +68,7 @@ public class GetCommand extends CliCommand {
// rewrite to option
cmdArgs[2] = "-w";
err.println("'get path [watch]' has been deprecated. " + "Please
use 'get [-s] [-w] path' instead.");
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetConfigCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetConfigCommand.java
index 4fc681f..ef583aa 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetConfigCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetConfigCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.util.ConfigUtils;
@@ -49,7 +48,7 @@ public class GetConfigCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetEphemeralsCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetEphemeralsCommand.java
index 8d39a59..de667e8 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetEphemeralsCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/GetEphemeralsCommand.java
@@ -19,10 +19,9 @@ package org.apache.zookeeper.cli;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
/**
@@ -39,7 +38,7 @@ public class GetEphemeralsCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ListQuotaCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ListQuotaCommand.java
index b6d9f51..748afd2 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ListQuotaCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ListQuotaCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Quotas;
import org.apache.zookeeper.StatsTrack;
@@ -42,7 +41,7 @@ public class ListQuotaCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
index b12a12a..813396b 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
@@ -20,11 +20,10 @@ package org.apache.zookeeper.cli;
import java.util.Collections;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKUtil;
import org.apache.zookeeper.data.Stat;
@@ -56,7 +55,7 @@ public class LsCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
@@ -79,7 +78,7 @@ public class LsCommand extends CliCommand {
// rewrite to option
cmdArgs[2] = "-w";
err.println("'ls path [watch]' has been deprecated. " + "Please
use 'ls [-w] path' instead.");
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ReconfigCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ReconfigCommand.java
index d48d16e..f0d9aa6 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ReconfigCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/ReconfigCommand.java
@@ -21,10 +21,9 @@ package org.apache.zookeeper.cli;
import java.io.FileInputStream;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.admin.ZooKeeperAdmin;
import org.apache.zookeeper.data.Stat;
@@ -83,7 +82,7 @@ public class ReconfigCommand extends CliCommand {
joining = null;
leaving = null;
members = null;
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/RemoveWatchesCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/RemoveWatchesCommand.java
index 1603cd4..ddaf15f 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/RemoveWatchesCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/RemoveWatchesCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Watcher.WatcherType;
@@ -48,7 +47,7 @@ public class RemoveWatchesCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetAclCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetAclCommand.java
index 25aa3dd..856041b 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetAclCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetAclCommand.java
@@ -20,10 +20,9 @@ package org.apache.zookeeper.cli;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKUtil;
import org.apache.zookeeper.data.ACL;
@@ -53,7 +52,7 @@ public class SetAclCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetCommand.java
index e8a0634..190ca04 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
@@ -46,7 +45,7 @@ public class SetCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetQuotaCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetQuotaCommand.java
index d9717ec..68c48fa 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetQuotaCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SetQuotaCommand.java
@@ -21,12 +21,11 @@ package org.apache.zookeeper.cli;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Quotas;
@@ -60,7 +59,7 @@ public class SetQuotaCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/StatCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/StatCommand.java
index 7fd962c..c8068ad 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/StatCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/StatCommand.java
@@ -19,10 +19,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
@@ -45,7 +44,7 @@ public class StatCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
@@ -67,7 +66,7 @@ public class StatCommand extends CliCommand {
// rewrite to option
cmdArgs[2] = "-w";
err.println("'stat path [watch]' has been deprecated. " + "Please
use 'stat [-w] path' instead.");
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
try {
cl = parser.parse(options, cmdArgs);
} catch (ParseException ex) {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SyncCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SyncCommand.java
index f37e642..26ef536 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SyncCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/SyncCommand.java
@@ -22,10 +22,9 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
/**
* sync command for cli
@@ -42,7 +41,7 @@ public class SyncCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/VersionCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/VersionCommand.java
index 6af21bd..b229030 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/VersionCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/VersionCommand.java
@@ -18,10 +18,9 @@
package org.apache.zookeeper.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.apache.zookeeper.Version;
/**
@@ -38,7 +37,7 @@ public class VersionCommand extends CliCommand {
@Override
public CliCommand parse(String[] cmdArgs) throws CliParseException {
- Parser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
CommandLine cl;
try {
cl = parser.parse(options, cmdArgs);
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotComparer.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotComparer.java
index d77261d..84d265c 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotComparer.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotComparer.java
@@ -28,10 +28,10 @@ import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.zip.CheckedInputStream;
-import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.jute.BinaryInputArchive;
@@ -59,41 +59,41 @@ public class SnapshotComparer {
private SnapshotComparer() {
options = new Options();
options.addOption(
- OptionBuilder
+ Option.builder("l")
.hasArg()
- .isRequired(true)
- .withLongOpt(leftOption)
- .withDescription("(Required) The left snapshot file.")
- .withArgName("LEFT")
- .withType(File.class)
- .create("l"));
+ .required(true)
+ .longOpt(leftOption)
+ .desc("(Required) The left snapshot file.")
+ .argName("LEFT")
+ .type(File.class)
+ .build());
options.addOption(
- OptionBuilder
+ Option.builder("r")
.hasArg()
- .isRequired(true)
- .withLongOpt(rightOption)
- .withDescription("(Required) The right snapshot file.")
- .withArgName("RIGHT")
- .withType(File.class)
- .create("r"));
+ .required(true)
+ .longOpt(rightOption)
+ .desc("(Required) The right snapshot file.")
+ .argName("RIGHT")
+ .type(File.class)
+ .build());
options.addOption(
- OptionBuilder
+ Option.builder("b")
.hasArg()
- .isRequired(true)
- .withLongOpt(byteThresholdOption)
- .withDescription("(Required) The node data delta size threshold,
in bytes, for printing the node.")
- .withArgName("BYTETHRESHOLD")
- .withType(String.class)
- .create("b"));
+ .required(true)
+ .longOpt(byteThresholdOption)
+ .desc("(Required) The node data delta size threshold, in bytes,
for printing the node.")
+ .argName("BYTETHRESHOLD")
+ .type(String.class)
+ .build());
options.addOption(
- OptionBuilder
+ Option.builder("n")
.hasArg()
- .isRequired(true)
- .withLongOpt(nodeThresholdOption)
- .withDescription("(Required) The descendant node delta size
threshold, in nodes, for printing the node.")
- .withArgName("NODETHRESHOLD")
- .withType(String.class)
- .create("n"));
+ .required(true)
+ .longOpt(nodeThresholdOption)
+ .desc("(Required) The descendant node delta size threshold, in
nodes, for printing the node.")
+ .argName("NODETHRESHOLD")
+ .type(String.class)
+ .build());
options.addOption("d", debugOption, false, "Use debug output.");
options.addOption("i", interactiveOption, false, "Enter interactive
mode.");
}
@@ -117,7 +117,7 @@ public class SnapshotComparer {
private void compareSnapshots(String[] args) throws Exception {
CommandLine parsedOptions;
try {
- parsedOptions = new BasicParser().parse(options, args);
+ parsedOptions = new DefaultParser().parse(options, args);
} catch (ParseException e) {
System.err.println(e.getMessage());
usage();
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java
index 389caea..8e5b24b 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java
@@ -39,11 +39,11 @@ import java.util.zip.Adler32;
import java.util.zip.Checksum;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
@@ -383,7 +383,7 @@ public class TxnLogToolkit implements Closeable {
}
private static TxnLogToolkit parseCommandLine(String[] args) throws
TxnLogToolkitException, FileNotFoundException {
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
Options options = new Options();
Option helpOpt = new Option("h", "help", false, "Print help message");
