remove license files that are no longer part of the dependency tree - #4751
Conversation
There was a problem hiding this comment.
Pull request overview
Removes stale third-party LICENSE/NOTICE text files under solr/licenses/ that no longer correspond to any dependency artifacts validated by Solr’s Gradle dependency/license checks (follow-up cleanup after prior dependency tree changes).
Changes:
- Delete unused license/notice files for dependencies no longer present (e.g., Micrometer core, JAXB-related, Jakarta EE artifacts).
- Remove leftover public-domain notice/license files (HdrHistogram/LatencyUtils) that are no longer referenced.
- Clean up other dangling license texts (e.g., txw2, istack-commons-runtime, Angus).
Reviewed changes
Copilot reviewed 22 out of 22 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| solr/licenses/txw2-LICENSE-CDDL.txt | Remove unused CDDL license text for txw2. |
| solr/licenses/micrometer-core-NOTICE.txt | Remove unused Micrometer notice file. |
| solr/licenses/micrometer-core-LICENSE-ASL.txt | Remove unused Micrometer Apache-2.0 license text. |
| solr/licenses/LatencyUtils-NOTICE.txt | Remove unused LatencyUtils notice stub. |
| solr/licenses/LatencyUtils-LICENSE-PD.txt | Remove unused LatencyUtils public-domain license text. |
| solr/licenses/jaxb-NOTICE.txt | Remove unused JAXB notice file. |
| solr/licenses/jaxb-LICENSE-BSD.txt | Remove unused JAXB BSD license text. |
| solr/licenses/jakarta.websocket-client-NOTICE.txt | Remove unused Jakarta WebSocket client notice file. |
| solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt | Remove unused Jakarta WebSocket client license text. |
| solr/licenses/jakarta.websocket-api-NOTICE.txt | Remove unused Jakarta WebSocket API notice file. |
| solr/licenses/jakarta.websocket-api-LICENSE-EPL.txt | Remove unused Jakarta WebSocket API EPL license text. |
| solr/licenses/jakarta.transaction-LICENSE-EPL.txt | Remove unused Jakarta Transaction EPL license text. |
| solr/licenses/jakarta.interceptor-LICENSE-EPL.txt | Remove unused Jakarta Interceptor EPL license text. |
| solr/licenses/jakarta.enterprise.lang-NOTICE.txt | Remove unused Jakarta CDI-lang notice file. |
| solr/licenses/jakarta.enterprise.lang-LICENSE-ASL.txt | Remove unused Jakarta CDI-lang Apache-2.0 license text. |
| solr/licenses/jakarta.enterprise.cdi-NOTICE.txt | Remove unused Jakarta CDI notice file. |
| solr/licenses/jakarta.enterprise.cdi-LICENSE-ASL.txt | Remove unused Jakarta CDI Apache-2.0 license text. |
| solr/licenses/istack-commons-runtime-LICENSE-CDDL.txt | Remove unused CDDL license text for istack-commons-runtime. |
| solr/licenses/HdrHistogram-NOTICE.txt | Remove unused HdrHistogram notice stub. |
| solr/licenses/HdrHistogram-LICENSE-PD.txt | Remove unused HdrHistogram public-domain license text. |
| solr/licenses/angus-NOTICE.txt | Remove unused Eclipse Angus notice file. |
| solr/licenses/angus-LICENSE-BSD.txt | Remove unused Eclipse Angus BSD license text. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
janhoy
left a comment
There was a problem hiding this comment.
Don’t need approval to do small fixes like this. Wonder why precommit didn’t fail on the s3 PR though…
thanks.. mostly wanted another set of eyes cause I havne't done a lot in the license and upgrade side of things... I was actually shocked by this, and thought "eric, what did you do wrong" ;-). Even re-cloned my solr repo jsut to make sure I had a fresh code base! |
|
@epugh was the problem detected by precommit or "just" log/warning output? I recall the latter. Nonetheless, looks like the bot should be updated. |
It was precommit. And it may be that the bot can't identify the changes to licenses that are needed? This is an area I'm really just learning aobut! |
|
The bot won't add LICENSE/NOTICE files, it will re-build sha1 checksum files and delete old/stale. I think this lie https://github.com/apache/solr/blob/main/.github/renovate.json#L16 may limit the postUpgrade commands to only commit changes to sha1 and lock files, not LICENSE or NOTICE files, so probably fixed by adding a third regex to that line. |
This is a follow up to the #3122 ticket. We need to see if Solrbot is also checking/fixing licenses.
These licenses exist on
mainandbranch_10xand need to be removed.