You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2024/02/19 17:10:36 UTC
(solr) 02/02: backporting from main
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit f30d5e7975da5d7271ab05635ede694ff4668049
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Mon Feb 19 12:10:27 2024 -0500
backporting from main
---
solr/core/src/java/org/apache/solr/cli/PostTool.java | 4 ++--
solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cli/PostTool.java b/solr/core/src/java/org/apache/solr/cli/PostTool.java
index 0e3bc6b77c1..b75e839aa7f 100644
--- a/solr/core/src/java/org/apache/solr/cli/PostTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/PostTool.java
@@ -719,7 +719,7 @@ public class PostTool extends ToolBase {
info("COMMITting Solr index changes to " + solrUpdateUrl + "...");
String url = solrUpdateUrl.toString();
url = url.substring(0, url.lastIndexOf("/update"));
- try (final SolrClient client = SolrCLI.getSolrClient(url, credentials)) {
+ try (final SolrClient client = SolrCLI.getSolrClient(url)) {
client.commit();
}
}
@@ -729,7 +729,7 @@ public class PostTool extends ToolBase {
info("Performing an OPTIMIZE to " + solrUpdateUrl + "...");
String url = solrUpdateUrl.toString();
url = url.substring(0, url.lastIndexOf("/update"));
- try (final SolrClient client = SolrCLI.getSolrClient(url, credentials)) {
+ try (final SolrClient client = SolrCLI.getSolrClient(url)) {
client.optimize();
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
index a40903c1f0a..b3087503a7b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
@@ -35,6 +35,7 @@ import org.apache.solr.util.ExternalPaths;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.solr.SolrTestCaseJ4;
/**
* Emulates bin/solr start -e cloud -noprompt; bin/solr post -c gettingstarted
@@ -42,6 +43,7 @@ import org.slf4j.LoggerFactory;
* docs in collections that use data driven functionality and managed schema features of the default
* configset (configsets/_default).
*/
+@SolrTestCaseJ4.SuppressSSL
public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());