janhoy commented on PR #3254: URL: https://github.com/apache/solr/pull/3254#issuecomment-5132255883
This branch is now up to date with latest `main` (~250 commits merged in). All of `precommit`, the CLI unit tests (`org.apache.solr.cli.*`), and the create/delete/status/version/zk BATS suites pass — the BATS suites in both default commons-cli mode and with `SOLR_PICOCLI=true`. What it took, beyond routine conflict resolution: - **Regenerated all gradle lockfiles** (`resolveAndLockAll --write-locks` plus a `precommit --write-locks` pass for the jar-check `*Copy` configurations), and dropped `permitUnusedDeclared` from `test-framework/build.gradle` — replaced on main by the opt-in DAGP plugin. - **Adopted main's move away from direct ZooKeeper access**: DeleteTool now resolves its target via `CLIUtils.getSolrConnection` and deletes configsets through the ConfigSets API (echoing *"Connecting to Solr at …"*); CreateTool uses the new `CloudSolrClientConnection` API with the `isZookeeper()` guard for config upload, and only takes the Solr URL from explicit connection options so the live-node fallback works as on main. - **Brought the picocli path to parity with main's `--solr-connection` change** (`-s` now means `--solr-connection`, `--solr-url` is long-only) in `ZkConnectionOptions`, the create/delete `ConnectionOptions`, and StatusTool — whose picocli target options are now a mutually-exclusive group mirroring the commons-cli `OptionGroup`. Connection parsing is string-only; network calls happen only at tool execution time, never during picocli parsing. - **`solr --version` under picocli** now prints `Client version: …` to match main's new commons-cli output (which also prints `Server version:` when a connection option is given). - **Small fixes along the way**: defaulted picocli `--max-wait-secs` to 0 (NPE for plain `solr status`), and relaxed the `test_status.bats` mutual-exclusion assertion to accept both engines' error messages (same pattern as `test_create.bats`). The zk→live-node URL resolution needed by StatusTool was extracted into `CLIUtils.solrUrlFromConnection()`, proposed separately against main in #4683 to keep non-picocli drift off this branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
