Repository navigation
docs(1788): SolrJ call-site inventory vs Solr 10 (#1996) - #2002
Merged
Merged
Conversation
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.
This was referenced Aug 5, 2026
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (1 file)
Reviewed by step-3.7-flash · Input: 124.1K · Output: 3.1K · Cached: 322.8K Review guidance: REVIEW.md from base branch |
natechadwick
approved these changes
Aug 5, 2026
4 tasks done
This was referenced Aug 29, 2026
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.mdKey findings
solr.version= 9.10.1 (unchanged)system/.../PSSolrDeliveryHandler.java(9org.apache.solrimports)HttpSolrClient.Builder+setUseMultiPartPost(true)— removed in Solr 10CloudSolrClient.Builder(List.of(host))whenserverCloudType=true; ZK module excluded + enforcer-banned (#1673)ContentStreamUpdateRequest("/update/extract")— Solr 10 requires Tika Server ops-sidesystemoptional;WebUIdirect dep with zero importsSolrConfigLoaderTestconfig-only — no client testsCutover matrix (summary)
HttpSolrClient; Cloud URL builder; unit testssolr-solrj-jetty; reconcile Jetty exclusionssolr.versionbump + Dependabot build(deps): bump org.apache.solr:solr-solrj from 9.10.1 to 10.0.0 #1777 dispositionHard ban: Do not merge Dependabot #1777 version-only; no bare pin bump in this PR.
Test plan
org.apache.solrimports andsolr-solrjPOM edgessolr.versionchangemvnw.cmd -DspotlessFiles=docs/ai-generated/tasks/1788-solrj-10/00-inventory.md spotless:applythenspotless:check(BUILD SUCCESS); out-of-scope Spotless rewrites discarded (not in this PR)Gates evidence
Operator
Operator: Grok: night-issue-prs (model grok-4.5)
Fixes #1996