dsmiley commented on PR #4806:
URL: https://github.com/apache/solr/pull/4806#issuecomment-5441644900
_ai written_
SOLR-18397 (#4806) was NOT backported to branch_10x — deliberately skipped.
The commit's diff on main bundles two unrelated things:
1. The stated purpose: stripping stale "...Copy" configuration tokens
(compileClasspathCopy, runtimeClasspathCopy, testCompileClasspathCopy,
testRuntimeClasspathCopy) from gradle.lockfile entries. This is the
follow-up cleanup to SOLR-18396, which stopped locking those throwaway
copyRecursive() configurations.
2. Dependency version bumps that are already regenerated into main's
lockfiles but landed via other, not-yet-backported PRs:
- calcite 1.37.0 -> 1.42.0
- calcite-avatica 1.25.0 -> 1.28.0
- httpclient5 5.2.1 -> 5.5, httpcore5 5.2/5.2.3 -> 5.3.x
- janino / commons-compiler 3.1.11 -> 3.1.12
- new: joou-java-6 0.9.5
- checker-qual 3.54.0 -> 4.2.0 (+ deletes the 3.54.0 license sha1)
branch_10x genuinely still uses the older versions, so cherry-picking this
commit would write false version claims into its lockfiles.
Regeneration doesn't fix it either: after SOLR-18396, dependency locking is
*deactivated* for the "...Copy" configs, so `gradlew resolveAndLockAll
--write-locks` orphans the existing stale entries rather than removing them.
Removing them on branch_10x would require a mechanical, version-preserving
strip of just the *Copy tokens.
Decision: leave SOLR-18397 off branch_10x. The leftover "...Copy" entries are
harmless orphaned lock state for configurations that only exist transiently
while a task runs and that nothing ever refreshes. A dedicated branch_10x
cleanup can be done later if desired. Milestone left at 10.x.
SOLR-18396 itself WAS backported (5b7135d9) and is fine standalone.
--
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]
