Skip to content

docs(1788): SolrJ call-site inventory vs Solr 10 (#1996) - #2002

Merged
natechadwick merged 1 commit into
mainfrom
docs/issue-1996-solrj10-inventory
Aug 5, 2026
Merged

natechadwick merged 1 commit into
mainfrom
docs/issue-1996-solrj10-inventory

Conversation

@natechadwick-intsof

Copy link
Copy Markdown
Collaborator

Summary

Slice 1 of parent epic #1788 (Solr / SolrJ 9.10.1 → 10.x). Delivers a frozen docs-only inventory and cutover matrix for implementers of slices 2–4.

Document: docs/ai-generated/tasks/1788-solrj-10/00-inventory.md

Key findings

Area Finding
Pin Root solr.version = 9.10.1 (unchanged)
Java importers One file: system/.../PSSolrDeliveryHandler.java (9 org.apache.solr imports)
Primary client HttpSolrClient.Builder + setUseMultiPartPost(true) — removed in Solr 10
Cloud path CloudSolrClient.Builder(List.of(host)) when serverCloudType=true; ZK module excluded + enforcer-banned (#1673)
Extract ContentStreamUpdateRequest("/update/extract") — Solr 10 requires Tika Server ops-side
POM edges Root depMgmt + exclusions/Jetty strip; system optional; WebUI direct dep with zero imports
Tests SolrConfigLoaderTest config-only — no client tests

Cutover matrix (summary)

Hard ban: Do not merge Dependabot #1777 version-only; no bare pin bump in this PR.

Test plan

  • Full-tree grep for org.apache.solr imports and solr-solrj POM edges
  • Mapped call sites to Solr 10 major changes
  • Docs-only: no production Java / no solr.version change
  • Spotless: mvnw.cmd -DspotlessFiles=docs/ai-generated/tasks/1788-solrj-10/00-inventory.md spotless:apply then spotless:check (BUILD SUCCESS); out-of-scope Spotless rewrites discarded (not in this PR)
  • Maven clean install: N/A (docs-only; no module sources/tests/POMs changed)

Gates evidence

Gate Result
Erlang self-review Docs inventory only; absolute paths documented as repo-relative; no secrets; no non-portable path code
Spotless apply → check Pass (scoped file); monorepo reformat noise not committed
Module clean install Skipped — docs only
Change-class companions Inventory doc + matrix linking sibling issues #1997–#2000

Operator

Operator: Grok: night-issue-prs (model grok-4.5)

Fixes #1996

Slice 1 of parent #1788: freeze full-tree SolrJ import census, POM/enforcer
edges, and cutover matrix (HttpSolrClient removal, solr-solrj-jetty, Cloud
builder/URL rules, non-transitive modules, Tika Server for extract).

No solr.version bump; no production Java changes. Unblocks #1997-#2000.

Fixes #1996

> Co-Authored by Grok Build using grok-4.5 with agent main.
@kilo-code-bot

kilo-code-bot Bot commented Aug 5, 2026 •

Copy link
Copy Markdown
Contributor

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (1 file)
  • docs/ai-generated/tasks/1788-solrj-10/00-inventory.md - docs-only inventory; all factual claims verified against source

Reviewed by step-3.7-flash · Input: 124.1K · Output: 3.1K · Cached: 322.8K

Review guidance: REVIEW.md from base branch main

@natechadwick
natechadwick merged commit e594988 into main Aug 5, 2026
5 checks passed
@natechadwick
natechadwick deleted the docs/issue-1996-solrj10-inventory branch August 5, 2026 13:33
natechadwick-intsof added a commit that referenced this pull request Aug 29, 2026
Contain getApplicationFile and lock streams under requireUnderBase
(alerts #2002/#1920/#1921). Sink-line + query-filter + model pack.

Parent: #2470
Tests: PSXmlObjectStoreHandlerPathInjectionTest
Module: cd system && ../mvnw.cmd clean install (Tests run: 2582, Failures: 0)

> Co-Authored by Grok Build 1.0.5 using grok-4.6 with agent night-issue-prs-security.
natechadwick-intsof added a commit that referenced this pull request Aug 30, 2026
Contain getApplicationFile and lock streams under requireUnderBase
(alerts #2002/#1920/#1921). Sink-line + query-filter + model pack.

Parent: #2470
Tests: PSXmlObjectStoreHandlerPathInjectionTest
Module: cd system && ../mvnw.cmd clean install (Tests run: 2582, Failures: 0)

> Co-Authored by Grok Build 1.0.5 using grok-4.6 with agent night-issue-prs-security.
natechadwick pushed a commit that referenced this pull request Aug 30, 2026
* fix(codeql): path-injection #2002 object-store application files

Contain getApplicationFile and lock streams under requireUnderBase
(alerts #2002/#1920/#1921). Sink-line + query-filter + model pack.

Parent: #2470
Tests: PSXmlObjectStoreHandlerPathInjectionTest
Module: cd system && ../mvnw.cmd clean install (Tests run: 2582, Failures: 0)

> Co-Authored by Grok Build 1.0.5 using grok-4.6 with agent night-issue-prs-security.

* fix(codeql): object-store path-injection review follow-up #3979

Translate getApplicationFile IAE to PSNotFoundException at
loadApplication/updateSummaryEntry. Align resolveApplicationXmlFile
Javadoc with requireUnderBase. Keep exists() sink-line annotation.
Add getApplicationFile and lock stream behavioral tests.

Parent: #2470
Tests: PSXmlObjectStoreHandlerPathInjectionTest
Module: cd system && ../mvnw.cmd clean install (Tests run: 2586, Failures: 0)

> Co-Authored by Grok Build 1.0.5 using grok-4.6 with agent night-issue-prs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

model:grok-4.5 Grok 4.5 model operator:grok Changes authored by Grok operator:night-issue-prs night-issue-prs workflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

issue 1788 slice 1: SolrJ call-site + dependency inventory vs Solr 10 breaking changes

2 participants