SOLR-14115: Remove deprecated zkcli script. (#2427)

Replaced by bin/solr sub command equivalents.
apache · Apr 30, 2024 · f1fc03f · f1fc03f
1 parent b530aa5
commit f1fc03f
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 1,243 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -63,6 +63,9 @@ Deprecation Removals
   in favor of the new CompletableFuture based methods.  Remove the related deprecated interfaces `AsyncListener` and ``Cancellable`
   (James Dyer)
 
+* SOLR-14115: Remove deprecated zkcli script in favour of equivalent bin/solr sub commmands. (Eric Pugh)
+
+
 Dependency Upgrades
 ---------------------
 (No changes)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java b/solr/core/src/java/org/apache/solr/cloud/ZkConfigSetService.java
@@ -62,7 +62,7 @@ public ZkConfigSetService(CoreContainer cc) {
     this.zkClient = cc.getZkController().getZkClient();
   }
 
-  /** This is for ZkCLI and some tests */
+  /** This is for some tests */
   public ZkConfigSetService(SolrZkClient zkClient) {
     super(null, false);
     this.zkController = null;

diff --git a/solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java b/solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java
@@ -59,7 +59,6 @@
 
 // TODO: This test would be a lot faster if it used a solrhome with fewer config
 // files - there are a lot of them to upload
-// This was copied from org.apache.solr.cloud.ZkCLITest
 public class ZkSubcommandsTest extends SolrTestCaseJ4 {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());