Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOLR-17595: Fix Solr examples for Windows #2909

Merged
merged 4 commits into from
Dec 17, 2024
Merged

SOLR-17595: Fix Solr examples for Windows #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0acc39
Fix argument parsing for -D options with multiple values on Windows
malliaridis Dec 14, 2024
b633a66
Fix invalid usage of wildcards in RunExampleTool / PostTool
malliaridis Dec 14, 2024
f1a4ac9
Merge remote-tracking branch 'apache/main' into SOLR-17595/fix-examples
malliaridis Dec 14, 2024
91dcd0d
Include bugfixes in CHANGES.txt
malliaridis Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ Bug Fixes

* SOLR-17574: Fix AllowListUrlChecker when liveNodes changes. Remove ClusterState.getHostAllowList (Bruno Roustant, David Smiley)

* SOLR-17595: Fix two issues in Solr CLI that prevent Solr from starting with the techproducts example and from
correctly parsing arguments on Windows that start with -D and have multiple values separated by "," or spaces. (Christos Malliaridis)

Dependency Upgrades
---------------------
(No changes)
Expand Down
1 change: 0 additions & 1 deletion solr/bin/solr.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ goto repeat_passthru

:end_passthru
set "PASSTHRU=%PASSTHRU_KEY%=%PASSTHRU_VALUES%"
echo "Passing through %PASSTHRU%"

IF NOT "%SOLR_OPTS%"=="" (
set "SOLR_OPTS=%SOLR_OPTS% %PASSTHRU%"
Expand Down
4 changes: 3 additions & 1 deletion solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
collectionName,
"--type",
"application/xml",
exampledocsDir.toAbsolutePath() + "/*.xml"
"--filetypes",
"xml",
exampledocsDir.toAbsolutePath().toString()
};
PostTool postTool = new PostTool();
CommandLine postToolCli = SolrCLI.parseCmdLine(postTool, args);
Expand Down
Loading