SOLR-16824: Replace deprecated single-dash arguments (#2577)

malliaridis · epugh · web-flow · commit 030b0dcd02b0 · 2024-08-02T16:55:20.000-04:00
Migrate dash patterns in documentation, various tests, and various user messages generated by tools to reflect the move to --kebab-case and double dashes.

---------

Co-authored-by: Eric Pugh &lt;epugh@opensourceconnections.com&gt;
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -181,7 +181,7 @@ Improvements
 
 * SOLR-16824: Adopt Linux standard pattern of -- for long option commands, and make all commands "kebab" formatting.  I.e -zkHost is now -zk-host.  The old parameters
   such as -zkHost continue to be supported in the 9.x line of Solr.  -u is now used to specify user credentials everywhere, this only impacts the bin/solr assert
-  commands "same user" check which has -u as the short form of --same-user. (Eric Pugh, janhoy, Jason Gerlowski)
+  commands "same user" check which has -u as the short form of --same-user. (Eric Pugh, janhoy, Jason Gerlowski, Christos Malliaridis)
 
 * SOLR-17346: Synchronise stopwords from snowball with those in Lucene (Alastair Porter via Houston Putman)
 
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
@@ -246,6 +246,7 @@ set FIRST_ARG=%1
 
 IF [%1]==[] goto usage
 
+REM -help is a special case to faciliate folks learning about how to use Solr.
 IF "%1"=="-help" goto run_solrcli
 IF "%1"=="-usage" goto run_solrcli
 IF "%1"=="-h" goto run_solrcli
@@ -293,7 +294,6 @@ IF "%FIRST_ARG%"=="-help" goto run_solrcli
 IF "%FIRST_ARG%"=="-usage" goto run_solrcli
 IF "%FIRST_ARG%"=="-h" goto run_solrcli
 IF "%FIRST_ARG%"=="--help" goto run_solrcli
-IF "%FIRST_ARG%"=="-help" goto run_solrcli
 IF "%FIRST_ARG%"=="/?" goto run_solrcli
 IF "%SCRIPT_CMD%"=="start" goto start_usage
 IF "%SCRIPT_CMD%"=="restart" goto start_usage
@@ -316,7 +316,7 @@ goto done
 @echo   -f            Start Solr in foreground; default starts Solr in the background
 @echo                   and sends stdout / stderr to solr-PORT-console.log
 @echo.
-@echo   -c or -cloud  Start Solr in SolrCloud mode; if -z not supplied and ZK_HOST not defined in
+@echo   -c or --cloud Start Solr in SolrCloud mode; if -z not supplied and ZK_HOST not defined in
 @echo                   solr.in.cmd, an embedded ZooKeeper instance is started on Solr port+1000,
 @echo                   such as 9983 if Solr is bound to 8983
 @echo.
@@ -1493,10 +1493,10 @@ IF "!ZK_OP!"=="" (
 set CONNECTION_PARAMS=""
 
 IF "!ZK_OP!"=="" (
-  set CONNECTION_PARAMS="-solrUrl !ZK_SOLR_URL!"
+  set CONNECTION_PARAMS="--solr-url !ZK_SOLR_URL!"
 )
 ELSE (
-  set CONNECTION_PARAMS="-zkHost ZK_HOST!"
+  set CONNECTION_PARAMS="--zk-host ZK_HOST!"
 )
 
 IF "!ZK_OP!"=="upconfig" (
diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -411,7 +411,7 @@ private void printDefaultConfigsetWarningIfNecessary(CommandLine cli) {
       final String configCommand =
           String.format(
               Locale.ROOT,
-              "bin/solr config -c %s -solrUrl %s -action set-user-property -property update.autoCreateFields -value false",
+              "bin/solr config -c %s -s %s --action set-user-property --property update.autoCreateFields --value false",
               collectionName,
               solrUrl);
       echo(
diff --git a/solr/core/src/java/org/apache/solr/cli/PackageTool.java b/solr/core/src/java/org/apache/solr/cli/PackageTool.java
@@ -205,8 +205,9 @@ public void runImpl(CommandLine cli) throws Exception {
                           : new String[] {};
                   packageManager.undeploy(packageName, collections, cli.hasOption("cluster"));
                 } else {
+
                   printRed(
-                      "Either specify -cluster to undeploy cluster level plugins or -collections <list-of-collections> to undeploy collection level plugins");
+                      "Either specify --cluster to undeploy cluster level plugins or -collections <list-of-collections> to undeploy collection level plugins");
                 }
                 break;
               }
@@ -259,7 +260,7 @@ public String getHeader() {
     format(sb, "");
     formatGreen(
         sb,
-        "bin/solr package deploy <package-name>[:<version>] [-y] [--update] -collections <comma-separated-collections> [-p <param1>=<val1> -p <param2>=<val2> ...] ");
+        "bin/solr package deploy <package-name>[:<version>] [-y] [--update] --collections <comma-separated-collections> [-p <param1>=<val1> -p <param2>=<val2> ...] ");
     format(
         sb,
         "Bootstraps a previously installed package into the specified collections. It the package accepts parameters for its setup commands, they can be specified (as per package documentation).");
@@ -277,7 +278,7 @@ public String getHeader() {
     format(sb, "Print a list of collections on which a given package has been deployed.");
     format(sb, "");
     formatGreen(
-        sb, "bin/solr package undeploy <package-name> -collections <comma-separated-collections>");
+        sb, "bin/solr package undeploy <package-name> --collections <comma-separated-collections>");
     format(sb, "Undeploy a package from specified collection(s)");
     format(sb, "");
     formatGreen(sb, "bin/solr package uninstall <package-name>:<version>");
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
@@ -121,7 +121,7 @@ public void uninstall(String packageName, String version)
                 + packageName
                 + " is currently deployed on collection: "
                 + collection
-                + ". Undeploy the package with undeploy <package-name> -collections <collection1>[,<collection2>,...] before attempting to uninstall the package.");
+                + ". Undeploy the package with undeploy <package-name> --collections <collection1>[,<collection2>,...] before attempting to uninstall the package.");
         System.exit(1);
       }
     }
@@ -138,7 +138,7 @@ public void uninstall(String packageName, String version)
                 + packageName
                 + "is currently deployed as a cluster-level plugin ("
                 + clusterPackageInstance.getCustomData()
-                + "). Undeploy the package with undeploy <package-name> -collections <collection1>[,<collection2>,...] before uninstalling the package.");
+                + "). Undeploy the package with undeploy <package-name> --collections <collection1>[,<collection2>,...] before uninstalling the package.");
         System.exit(1);
       }
     }
diff --git a/solr/core/src/test/org/apache/solr/cli/AuthToolTest.java b/solr/core/src/test/org/apache/solr/cli/AuthToolTest.java
@@ -70,7 +70,7 @@ public void testEnableAuth() throws Exception {
       dir.toAbsolutePath().toString(),
       "--solr-include-file",
       solrIncludeFile.toAbsolutePath().toString(),
-      "-credentials",
+      "--credentials",
       "solr:solr",
       "--block-unknown",
       "true"
diff --git a/solr/core/src/test/org/apache/solr/cli/CreateToolTest.java b/solr/core/src/test/org/apache/solr/cli/CreateToolTest.java
@@ -49,7 +49,7 @@ public void testCreateCollectionWithBasicAuth() throws Exception {
       "cloud-minimal",
       "-z",
       cluster.getZkClient().getZkServerAddress(),
-      "-credentials",
+      "--credentials",
       SecurityJson.USER_PASS,
       "-verbose"
     };
diff --git a/solr/core/src/test/org/apache/solr/cli/DeleteToolTest.java b/solr/core/src/test/org/apache/solr/cli/DeleteToolTest.java
@@ -64,7 +64,7 @@ public void testDeleteCollectionWithBasicAuth() throws Exception {
       "false",
       "-z",
       cluster.getZkClient().getZkServerAddress(),
-      "-credentials",
+      "--credentials",
       SecurityJson.USER_PASS,
       "-verbose"
     };
diff --git a/solr/core/src/test/org/apache/solr/cli/PostToolTest.java b/solr/core/src/test/org/apache/solr/cli/PostToolTest.java
@@ -127,7 +127,7 @@ public void testRunWithCollectionParam() throws Exception {
     fw.flush();
 
     String[] args = {
-      "post", "-c", collection, "-credentials", SecurityJson.USER_PASS, jsonDoc.getAbsolutePath()
+      "post", "-c", collection, "--credentials", SecurityJson.USER_PASS, jsonDoc.getAbsolutePath()
     };
     assertEquals(0, runTool(args));
 
@@ -167,7 +167,7 @@ public void testRunCsvWithCustomSeparatorParam() throws Exception {
       "post",
       "-c",
       collection,
-      "-credentials",
+      "--credentials",
       SecurityJson.USER_PASS,
       "--params",
       "\"separator=%09&header=false&fieldnames=id,title_s\"",
diff --git a/solr/core/src/test/org/apache/solr/cli/SolrCLIZkToolsTest.java b/solr/core/src/test/org/apache/solr/cli/SolrCLIZkToolsTest.java
@@ -768,7 +768,8 @@ public void testRm() throws Exception {
     int res = tool.runTool(SolrCLI.processCommandLineArgs(tool, args));
 
     assertTrue(
-        "Should have failed to remove node with children unless -recurse is set to true", res != 0);
+        "Should have failed to remove node with children unless --recurse is set to true",
+        res != 0);
 
     // Are we sure all the znodes are still there?
     verifyZkLocalPathsMatch(srcPathCheck, "/configs/rm1");
@@ -783,7 +784,7 @@ public void testRm() throws Exception {
     res = tool.runTool(SolrCLI.processCommandLineArgs(tool, args));
 
     assertTrue(
-        "Should have failed to remove node with children if -recurse is set to false", res != 0);
+        "Should have failed to remove node with children if --recurse is set to false", res != 0);
 
     args =
         new String[] {
diff --git a/solr/core/src/test/org/apache/solr/cli/TestExportTool.java b/solr/core/src/test/org/apache/solr/cli/TestExportTool.java
@@ -245,7 +245,7 @@ public void testWithBasicAuth() throws Exception {
         "export",
         "-url",
         cluster.getJettySolrRunner(0).getBaseUrl() + "/" + COLLECTION_NAME,
-        "-credentials",
+        "--credentials",
         SecurityJson.USER_PASS,
         "-out",
         outFile.getAbsolutePath(),
diff --git a/solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java b/solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java
@@ -635,14 +635,14 @@ public void testSetClusterProperty() throws Exception {
     // add property urlScheme=http
     String[] args =
         new String[] {
-          "cluster", "-property", "urlScheme", "-value", "http", "-z", zkServer.getZkAddress()
+          "cluster", "--property", "urlScheme", "--value", "http", "-z", zkServer.getZkAddress()
         };
     ClusterTool tool = new ClusterTool();
     assertEquals(0, runTool(args, tool));
 
     assertEquals("http", properties.getClusterProperty("urlScheme", "none"));
 
-    args = new String[] {"cluster", "-property", "urlScheme", "-z", zkServer.getZkAddress()};
+    args = new String[] {"cluster", "--property", "urlScheme", "-z", zkServer.getZkAddress()};
     assertEquals(0, runTool(args, tool));
     assertNull(properties.getClusterProperty("urlScheme", (String) null));
   }
diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.java
@@ -54,7 +54,7 @@ public static void recoverFileLease(
 
   /*
    * Run the dfs recover lease. recoverLease is asynchronous. It returns:
-   *    -false when it starts the lease recovery (i.e. lease recovery not *yet* done)
+   *    - false when it starts the lease recovery (i.e. lease recovery not *yet* done)
    *    - true when the lease recovery has succeeded or the file is closed.
    * But, we have to be careful.  Each time we call recoverLease, it starts the recover lease
    * process over from the beginning.  We could put ourselves in a situation where we are
diff --git a/solr/packaging/test/test_adminconsole_urls.bats b/solr/packaging/test/test_adminconsole_urls.bats
@@ -25,7 +25,7 @@ teardown() {
   # save a snapshot of SOLR_HOME for failed tests
   save_home_on_failure
 
-  solr stop -all >/dev/null 2>&1
+  solr stop --all >/dev/null 2>&1
 }
 
 @test "assert able to launch solr admin console" {
diff --git a/solr/packaging/test/test_basic_auth.bats b/solr/packaging/test/test_basic_auth.bats
@@ -49,15 +49,15 @@ teardown() {
   assert_output --partial "Created collection 'COLL_NAME'"
   
   # Test config
-  run solr config -u name:password -c COLL_NAME --action set-property -property updateHandler.autoCommit.maxDocs --value 100 --solr-url http://localhost:${SOLR_PORT}/solr
+  run solr config -u name:password -c COLL_NAME --action set-property --property updateHandler.autoCommit.maxDocs --value 100 --solr-url http://localhost:${SOLR_PORT}/solr
   assert_output --partial "Successfully set-property updateHandler.autoCommit.maxDocs to 100"
   
   # Test api
-  run solr api -u name:password --solr-url "http://localhost:${SOLR_PORT}/solr/COLL_NAME/select?q=*:*" -verbose
+  run solr api -u name:password --solr-url "http://localhost:${SOLR_PORT}/solr/COLL_NAME/select?q=*:*" --verbose
   assert_output --partial '"numFound":0'
   
   # Test delete
-  run solr delete --credentials name:password -c COLL_NAME -z localhost:${ZK_PORT} -verbose
+  run solr delete --credentials name:password -c COLL_NAME -z localhost:${ZK_PORT} --verbose
   assert_output --partial "Deleted collection 'COLL_NAME'"
   refute collection_exists "COLL_NAME"
   
@@ -69,7 +69,7 @@ run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 
   # Test post
-  run solr post -u name:password -type application/xml --solr-update-url http://localhost:${SOLR_PORT}/solr/monitors/update ${SOLR_TIP}/example/exampledocs/monitor.xml
+  run solr post -u name:password -t application/xml --solr-update-url http://localhost:${SOLR_PORT}/solr/monitors/update ${SOLR_TIP}/example/exampledocs/monitor.xml
   assert_output --partial '1 files indexed.'
 
   # Test postlogs
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
@@ -63,7 +63,7 @@ teardown() {
 }
 
 @test "reject d option with invalid config dir" {
-  run ! solr create -c COLL_NAME -d /asdf  -solrUrl http://localhost:${SOLR_PORT}
+  run ! solr create -c COLL_NAME -d /asdf  --solr-url http://localhost:${SOLR_PORT}
   assert_output --partial "Specified configuration directory /asdf not found!"
 }
 
diff --git a/solr/packaging/test/test_extraction.bats b/solr/packaging/test/test_extraction.bats
@@ -73,7 +73,7 @@ teardown() {
   }' "http://localhost:${SOLR_PORT}/solr/content_extraction/config"
   
   # We filter to pdf to invoke the Extract handler.
-  run solr post -filetypes pdf -url http://localhost:${SOLR_PORT}/solr/content_extraction/update ${SOLR_TIP}/example/exampledocs
+  run solr post --filetypes pdf -url http://localhost:${SOLR_PORT}/solr/content_extraction/update ${SOLR_TIP}/example/exampledocs
 
   assert_output --partial '1 files indexed.'
   refute_output --partial 'ERROR'
@@ -99,8 +99,8 @@ teardown() {
     }
   }' "http://localhost:${SOLR_PORT}/solr/website_extraction/config"
   
-  # Change to -recursive 1 to crawl multiple pages, but may be too slow.
-  run solr post -mode web -url http://localhost:${SOLR_PORT}/solr/website_extraction/update -recursive 0 -delay 1 https://solr.apache.org/
+  # Change to --recursive 1 to crawl multiple pages, but may be too slow.
+  run solr post --mode web --solr-update-url http://localhost:${SOLR_PORT}/solr/website_extraction/update --recursive 0 --delay 1 https://solr.apache.org/
 
   assert_output --partial 'POSTed web resource https://solr.apache.org (depth: 0)'
   refute_output --partial 'ERROR'
diff --git a/solr/packaging/test/test_packages.bats b/solr/packaging/test/test_packages.bats
@@ -44,15 +44,15 @@ teardown() {
   solr create -c foo-1.2
 
   # Deploy package - the package doesn't need to exist before the collection validation kicks in
-  run solr package deploy PACKAGE_NAME -collections foo-1.2
+  run solr package deploy PACKAGE_NAME --collections foo-1.2
   # assert_output --partial "Deployment successful"
   refute_output --partial "Invalid collection"
   
   # Until PACKAGE_NAME refers to an actual installable package, this is as far as we get.
   assert_output --partial "Package instance doesn't exist: PACKAGE_NAME:null"
 
   # Undeploy package
-  run solr package undeploy PACKAGE_NAME -collections foo-1.2
+  run solr package undeploy PACKAGE_NAME --collections foo-1.2
   refute_output --partial "Invalid collection"
   assert_output --partial "Package PACKAGE_NAME not deployed on collection foo-1.2"
 }
@@ -72,7 +72,7 @@ teardown() {
 #  run solr package install solr-splainer
 #  assert_output --partial "solr-splainer installed."
 
-#  run solr package deploy solr-splainer -y -cluster
+#  run solr package deploy solr-splainer -y --cluster
 #  assert_output --partial "Deployment successful"
   
 #  run -0 curl --fail http://localhost:${SOLR_PORT}/v2/splainer/index.html
diff --git a/solr/packaging/test/test_post.bats b/solr/packaging/test/test_post.bats
@@ -162,14 +162,14 @@ teardown() {
   run solr create -c test_args -d _default
   assert_output --partial "Created collection 'test_args'"
 
-  run solr post --solr-update-url http://localhost:${SOLR_PORT}/solr/test_args/update --mode args -type application/xml --out "<delete><query>*:*</query></delete>"
+  run solr post --solr-update-url http://localhost:${SOLR_PORT}/solr/test_args/update --mode args --type application/xml --out "<delete><query>*:*</query></delete>"
   assert_output --partial '<int name="status">0</int>'
 
   # confirm default type
   run solr post --solr-update-url http://localhost:${SOLR_PORT}/solr/test_args/update --mode args --out "{'delete': {'query': '*:*'}}"
   assert_output --partial '"status":0'
 
-  # confirm we don't get back output without -out
+  # confirm we don't get back output without --out
   run solr post --solr-update-url http://localhost:${SOLR_PORT}/solr/test_args/update --mode args "{'delete': {'query': '*:*'}}"
   refute_output --partial '"status":0'
 
diff --git a/solr/packaging/test/test_prometheus.bats b/solr/packaging/test/test_prometheus.bats
@@ -25,7 +25,7 @@ teardown() {
   # save a snapshot of SOLR_HOME for failed tests
   save_home_on_failure
 
-  solr stop -all >/dev/null 2>&1
+  solr stop --all >/dev/null 2>&1
   
   shutdown_exporter
 }
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
@@ -604,7 +604,7 @@ teardown() {
   run solr api --solr-url "https://localhost:${SOLR2_PORT}/solr/test-single-shard/select?q=query4"
   assert_output --partial '"numFound":0'
 
-  run solr post -url https://localhost:${SOLR_PORT}/solr/test/update ${SOLR_TIP}/example/exampledocs/books.csv
+  run solr post --solr-update-url https://localhost:${SOLR_PORT}/solr/test/update ${SOLR_TIP}/example/exampledocs/books.csv
 
   run solr api --solr-url "https://localhost:${SOLR_PORT}/solr/test/select?q=*:*"
   assert_output --partial '"numFound":10'
diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.bats
@@ -122,7 +122,7 @@ teardown() {
 @test "bin/solr zk cp gets 'solrhome' from '--solr-home' command line option" {
   touch afile.txt
 
-  run solr zk cp afile.txt zk:/afile.txt -z localhost:${ZK_PORT} -verbose --solr-home ${SOLR_TIP}/server/solr
+  run solr zk cp afile.txt zk:/afile.txt -z localhost:${ZK_PORT} --verbose --solr-home ${SOLR_TIP}/server/solr
   assert_output --partial "Using SolrHome: ${SOLR_TIP}/server/solr"
   refute_output --partial 'Failed to load solr.xml from ZK or SolrHome'
 
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc
@@ -109,7 +109,7 @@ or
 
 [source,bash]
 ----
-$ bin/solr package deploy <package-name>:[version] -cluster
+$ bin/solr package deploy <package-name>:[version] --cluster
 ----
 
 If the package accepts parameters for its setup commands, they can be specified (as per package documentation):
@@ -170,12 +170,12 @@ Assuming the old version is `1.0.0` of the package `mypackage`, and the new vers
 
 [source,bash]
 ----
-$ bin/solr package deploy mypackage:2.0.0 --update -collections mycollection
+$ bin/solr package deploy mypackage:2.0.0 --update --collections mycollection
 ----
 or
 [source,bash]
 ----
-$ bin/solr package deploy mypackage:2.0.0 --update -cluster
+$ bin/solr package deploy mypackage:2.0.0 --update --cluster
 ----
 
 You can run the `list-deployed` command to verify that this collection is using the newly added version.
@@ -186,7 +186,7 @@ If a package supports undeploying the plugins it contains (check package author'
 
 [source,bash]
 ----
-$ bin/solr package undeploy <package-name> -collections <collection1>[,<collection2>,...]
+$ bin/solr package undeploy <package-name> --collections <collection1>[,<collection2>,...]
 ----
 
 === Uninstall a Package
@@ -202,7 +202,7 @@ or
 
 [source,bash]
 ----
-$ bin/solr package deploy <package-name>:<package-version> -cluster
+$ bin/solr package deploy <package-name>:<package-version> --cluster
 ----
 
 Both package name and version are required.
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/taking-solr-to-production.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/taking-solr-to-production.adoc
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-utilities.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-utilities.adoc
diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/post-tool.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/post-tool.adoc
diff --git a/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc
diff --git a/solr/solr-ref-guide/modules/query-guide/pages/tagger-handler.adoc b/solr/solr-ref-guide/modules/query-guide/pages/tagger-handler.adoc
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkMaintenanceUtils.java

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void uninstall(String packageName, String version)`
`121`	`121`	`+ packageName`
`122`	`122`	`+ " is currently deployed on collection: "`
`123`	`123`	`+ collection`
`124`		`- + ". Undeploy the package with undeploy <package-name> -collections <collection1>[,<collection2>,...] before attempting to uninstall the package.");`
	`124`	`+ + ". Undeploy the package with undeploy <package-name> --collections <collection1>[,<collection2>,...] before attempting to uninstall the package.");`
`125`	`125`	`System.exit(1);`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -138,7 +138,7 @@ public void uninstall(String packageName, String version)`
`138`	`138`	`+ packageName`
`139`	`139`	`+ "is currently deployed as a cluster-level plugin ("`
`140`	`140`	`+ clusterPackageInstance.getCustomData()`
`141`		`- + "). Undeploy the package with undeploy <package-name> -collections <collection1>[,<collection2>,...] before uninstalling the package.");`
	`141`	`+ + "). Undeploy the package with undeploy <package-name> --collections <collection1>[,<collection2>,...] before uninstalling the package.");`
`142`	`142`	`System.exit(1);`
`143`	`143`	`}`
`144`	`144`	`}`