diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index ae51b74d8cf..a89c8848a58 100755 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -1294,7 +1294,7 @@ IF "%1"=="-V" ( ) ELSE IF "%1"=="-n" ( goto set_config_name ) ELSE IF "%1"=="-r" ( - goto set_zk_recurse + goto set_zk_recursive ) ELSE IF "%1"=="-configname" ( goto set_config_name ) ELSE IF "%1"=="-d" ( @@ -1369,8 +1369,8 @@ set ZK_DST=%~1 SHIFT goto parse_zk_args -:set_zk_recurse -set ZK_RECURSE="true" +:set_zk_recursive +set ZK_RECURSIVE="true" SHIFT goto parse_zk_args @@ -1455,7 +1455,7 @@ IF "!ZK_OP!"=="upconfig" ( "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^ - org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --source !ZK_SRC! --destination !ZK_DST! --recurse !ZK_RECURSE! %ZK_VERBOSE% + org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --source !ZK_SRC! --destination !ZK_DST! --recursive !ZK_RECURSIVE! %ZK_VERBOSE% ) ELSE IF "!ZK_OP!"=="mv" ( IF "%ZK_SRC%"=="" ( set ERROR_MSG=" must be specified for 'mv' command" @@ -1477,7 +1477,7 @@ IF "!ZK_OP!"=="upconfig" ( "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^ - org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --path !ZK_SRC! --recurse !ZK_RECURSE! %ZK_VERBOSE% + org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --path !ZK_SRC! --recursive !ZK_RECURSIVE! %ZK_VERBOSE% ) ELSE IF "!ZK_OP!"=="ls" ( IF "%ZK_SRC"=="" ( set ERROR_MSG="Zookeeper path to remove must be specified when using the 'ls' command" @@ -1486,7 +1486,7 @@ IF "!ZK_OP!"=="upconfig" ( "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^ - org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --path !ZK_SRC! --recurse !ZK_RECURSE! %ZK_VERBOSE% + org.apache.solr.cli.SolrCLI !ZK_OP! -z !ZK_HOST! --path !ZK_SRC! --recursive !ZK_RECURSIVE! %ZK_VERBOSE% ) ELSE IF "!ZK_OP!"=="mkroot" ( IF "%ZK_SRC"=="" ( set ERROR_MSG="Zookeeper path to create must be specified when using the 'mkroot' command" diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java index 056a7792bb5..7e3fa93a25a 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -156,9 +156,22 @@ public class SolrCLI implements CLIO { public static final Option OPTION_HELP = Option.builder("h").longOpt("help").required(false).desc("Print this message.").build(); - public static final Option OPTION_RECURSE = - Option.builder("r") + public static final Option OPTION_RECURSE_DEPRECATED = + Option.builder() .longOpt("recurse") + .deprecated( + DeprecatedAttributes.builder() + .setForRemoval(true) + .setSince("9.8") + .setDescription("Use --recursive instead") + .get()) + .required(false) + .desc("Apply the command recursively.") + .build(); + + public static final Option OPTION_RECURSIVE = + Option.builder("r") + .longOpt("recursive") .required(false) .desc("Apply the command recursively.") .build(); diff --git a/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java b/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java index 44c0afa94b7..087cc36df83 100644 --- a/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java +++ b/solr/core/src/java/org/apache/solr/cli/ZkCpTool.java @@ -62,7 +62,8 @@ public List