Repository navigation
fix(licensing, v1.2): restore the ScalaPB notice on the vendored scalapb.proto - #8868
Merged
mengw15 merged 2 commits intoOct 27, 2026
Conversation
…oto (#8806) ### What changes were proposed in this PR? Per the note at the end of #8802, `common/workflow-core/src/main/protobuf/scalapb/scalapb.proto` is vendored from ScalaPB (Apache-2.0) but carried the standard ASF header — the same class of problem as #8775. Mirroring that fix: - `scalapb.proto`: ASF header → a vendored-from notice (upstream ships the file with no header; its license is the repository-level Apache-2.0, so no separate license copy is needed); - root `LICENSE`: a ScalaPB entry next to the other Apache-2.0 third-party entries ("this LICENSE file"); - `.licenserc.yaml`: exempt the file from the ASF-header check. Comment-only change to the proto; protoc output is unaffected. This addresses only the vendored-file item in #8802 — the build-time-generation proposal stays open there. ### Any related issues, documentation, discussions? Addresses the vendored scalapb.proto item in #8802. Same pattern as #8775/#8776. ### How was this PR tested? License-metadata-only change; the Check License Headers CI job verifies the exemption. The file is identical on main and both release branches. ### Was this PR authored or co-authored using generative AI tooling? (backported from commit 1df2c56) Generated-by: Claude Code (claude-fable-5)
Contributor
Author
|
The cherry-pick conflicted and was committed with conflict markers. Resolve the conflicts on this branch, then mark this PR ready for review. Conflicting files:
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
xuang7
marked this pull request as ready for review
October 14, 2026 22:12
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release/v1.2 #8868 +/- ##
==================================================
- Coverage 53.47% 53.45% -0.02%
+ Complexity 2569 2565 -4
==================================================
Files 1078 1078
Lines 42359 42359
Branches 4563 4563
==================================================
- Hits 22651 22645 -6
- Misses 18396 18398 +2
- Partials 1312 1316 +4
*This pull request uses carry forward flags. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Contributor
Author
Automated Reviewer SuggestionsBased on the
|
mengw15
deleted the
backport/8806-restore-the-scalapb-notice-on-the-vendor-v1.2
branch
October 27, 2026 23:02
mengw15
added a commit
that referenced
this pull request
Oct 27, 2026
…lease/v1.2 This brings in release/v1.2, which now has the ScalaPB entry (#8868), and applies #9010 on top: scalapb.ts joins that entry, and the descriptor.ts entry goes into a new BSD 3-Clause section. The other entries the cherry-pick carried (Material Symbols, ORCID, Jupyter, Iris, Apple) belong to other changes or to files release/v1.2 does not have. #9009 also turns the Iris entry into a BSD 3-Clause one; whichever of the two merges second folds the two sections into one.
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.
What changes were proposed in this PR?
Automated backport of #8806 to
release/v1.2.Source: 1df2c56 · automation run
Any related issues, documentation, discussions?
Backport of #8806.
How was this PR tested?
Release-branch CI runs on this branch once the conflicts are resolved and this PR is marked ready for review.
Was this PR authored or co-authored using generative AI tooling?
No.