This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch jira/SOLR-17697-picocli
in repository https://gitbox.apache.org/repos/asf/solr.git
from 1ae21164b5b Merge branch 'main' into jira/SOLR-17697-picocli
add 7ad14131257 SOLR-17697 Prepare for landing on main branch (#4909)
No new revisions were added by this update.
Summary of changes:
.github/workflows/bin-solr-test.yml | 8 +-
.../SOLR-17697-picocli-experimental-cli.yml | 12 ++
changelog/unreleased/SOLR-17697-picocli.yml | 8 --
dev-docs/ref-guide/antora.adoc | 29 +++-
gradle/java/javac.gradle | 3 +-
solr/core/build.gradle | 1 -
solr/core/gradle.lockfile | 4 +-
.../src/java/org/apache/solr/cli/CLIUtils.java | 3 +
.../apache/solr/cli/CliDefaultValueProvider.java | 3 +-
.../src/java/org/apache/solr/cli/CreateTool.java | 1 -
.../src/java/org/apache/solr/cli/DeleteTool.java | 1 -
.../core/src/java/org/apache/solr/cli/SolrCLI.java | 81 ++++++++++-
.../src/java/org/apache/solr/cli/StatusTool.java | 12 ++
solr/core/src/java/org/apache/solr/cli/Tool.java | 20 ++-
.../src/java/org/apache/solr/cli/ToolBase.java | 23 +++-
.../src/java/org/apache/solr/cli/VersionTool.java | 24 +++-
.../src/java/org/apache/solr/cli/ZkMkrootTool.java | 16 ++-
.../src/java/org/apache/solr/cli/ZkRmTool.java | 19 ++-
...PicocliTest.java => CreateToolPicocliTest.java} | 10 +-
.../test/org/apache/solr/cli/CreateToolTest.java | 7 +-
...PicocliTest.java => DeleteToolPicocliTest.java} | 10 +-
.../test/org/apache/solr/cli/DeleteToolTest.java | 11 +-
.../org/apache/solr/cli/SolrCLIPicocliTest.java | 151 +++++++++++++++++++++
.../apache/solr/cli/StatusToolPicocliTest.java} | 28 ++--
.../test/org/apache/solr/cli/StatusToolTest.java | 16 ++-
.../apache/solr/cli/VersionToolPicocliTest.java} | 27 ++--
.../test/org/apache/solr/cli/VersionToolTest.java | 18 +--
solr/packaging/build.gradle | 81 +++++++----
solr/solr-ref-guide/README.adoc | 6 +
solr/solr-ref-guide/build.gradle | 128 +++++++++++++++--
.../modules/deployment-guide/deployment-nav.adoc | 35 ++---
.../modules/deployment-guide/pages/cli/index.adoc | 96 +++++++++++++
.../deployment-guide/pages/cli/solr-auth.adoc | 26 ++--
.../deployment-guide/pages/cli/solr-create.adoc | 31 ++---
.../deployment-guide/pages/cli/solr-delete.adoc | 31 ++---
.../deployment-guide/pages/cli/solr-start.adoc | 24 +---
.../deployment-guide/pages/cli/solr-status.adoc | 29 ++--
.../deployment-guide/pages/cli/solr-stop.adoc | 24 +---
.../deployment-guide/pages/cli/solr-version.adoc | 40 +++---
.../deployment-guide/pages/cli/solr-zk-cp.adoc | 28 ++--
.../pages/cli/solr-zk-downconfig.adoc | 29 ++--
.../deployment-guide/pages/cli/solr-zk-ls.adoc | 26 ++--
.../deployment-guide/pages/cli/solr-zk-mkroot.adoc | 28 ++--
.../deployment-guide/pages/cli/solr-zk-mv.adoc | 28 ++--
.../deployment-guide/pages/cli/solr-zk-rm.adoc | 26 ++--
.../pages/cli/solr-zk-upconfig.adoc | 29 ++--
.../pages/cli/solr-zk-updateacls.adoc | 26 ++--
.../deployment-guide/pages/cli/solr-zk.adoc | 21 +--
.../pages/solr-control-script-reference.adoc | 74 ++--------
solr/test-framework/build.gradle | 2 +-
solr/test-framework/gradle.lockfile | 3 +-
51 files changed, 925 insertions(+), 492 deletions(-)
create mode 100644 changelog/unreleased/SOLR-17697-picocli-experimental-cli.yml
delete mode 100644 changelog/unreleased/SOLR-17697-picocli.yml
copy solr/core/src/test/org/apache/solr/cli/{AuthToolPicocliTest.java =>
CreateToolPicocliTest.java} (77%)
copy solr/core/src/test/org/apache/solr/cli/{AuthToolPicocliTest.java =>
DeleteToolPicocliTest.java} (77%)
create mode 100644
solr/core/src/test/org/apache/solr/cli/SolrCLIPicocliTest.java
copy solr/core/src/{java/org/apache/solr/cli/CliDefaultValueProvider.java =>
test/org/apache/solr/cli/StatusToolPicocliTest.java} (53%)
copy solr/core/src/{java/org/apache/solr/cli/CliDefaultValueProvider.java =>
test/org/apache/solr/cli/VersionToolPicocliTest.java} (53%)
create mode 100644
solr/solr-ref-guide/modules/deployment-guide/pages/cli/index.adoc
