Apache Solr open-source search software
SOLR-17315: Fix message formatting (#2511)
Eric Pugh99a9b10feb0a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 9dd14ff6b99..42748426ddd 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -150,6 +150,8 @@ Bug Fixes* SOLR-17317: v2 APIs no longer return the incorrect content-type when 'wt=json' specified (Jason Gerlowski)+* SOLR-17315: Fixed "next step" example urls generated by bin/solr create commands to use the newly created collection/core name. (Eric Pugh)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.javaindex 36a3247e7ec..c1065dfdc88 100644--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java@@ -345,20 +345,21 @@ public class CreateTool extends ToolBase {if (confDirectoryName.equals("_default")&& (confName.equals("") || confName.equals("_default"))) {- final String collectionName = cli.getOptionValue("collection");+ final String collectionName = cli.getOptionValue("name");final String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.getDefaultSolrUrl());final String curlCommand =String.format(Locale.ROOT,- "curl %s/%s/config -d "+ "curl %s/solr/%s/config -d "+ "'{\"set-user-property\": {\"update.autoCreateFields\":\"false\"}}'",solrUrl,collectionName);final String configCommand =String.format(Locale.ROOT,- "bin/solr config -c %s -p 8983 -action set-user-property -property update.autoCreateFields -value false",- collectionName);+ "bin/solr config -c %s -solrUrl %s -action set-user-property -property update.autoCreateFields -value false",+ collectionName,+ solrUrl);echo("WARNING: Using _default configset. Data driven schema functionality is enabled by default, which is");echo(" NOT RECOMMENDED for production use.");