Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: multi license mix #582

Open
wants to merge 2 commits into
base: 1.7-dev
Choose a base branch
from
Open

feat: multi license mix #582

wants to merge 2 commits into from

Conversation

jkowalleck
Copy link
Member

@jkowalleck jkowalleck commented Jan 20, 2025 •
edited
Loading

As discussed in ticket #454, this PR adds the following abilities:

  • have multiple license expressions
  • have a mix of license expressions, SPDX license IDs, and named licenses

fixes #454

TODO/DONE

  • showcase that this feature was not possible in 1.6
  • migrated now-passing tests from 1.6
  • add examples for XML
  • add examples for JSON
  • add examples for ProtoBuf
  • implement for XML
  • implement for JSON
  • implement for ProtoBuf

Java tests are expected to fail, as they dont use/know the new schema

@jkowalleck jkowalleck requested a review from a team as a code owner January 20, 2025 15:41
@jkowalleck jkowalleck changed the base branch from master to 1.7-dev January 20, 2025 15:41
@jkowalleck jkowalleck marked this pull request as draft January 20, 2025 15:41
@jkowalleck jkowalleck changed the title draft: Feat/licenses multi mix all feat: multi license mix Jan 20, 2025
@jkowalleck jkowalleck marked this pull request as ready for review January 20, 2025 16:02
@jkowalleck jkowalleck added this to the 1.7 milestone Jan 20, 2025
@jkowalleck jkowalleck mentioned this pull request Jan 20, 2025
Open
@jkowalleck jkowalleck force-pushed the feat/licenses-multi-mix-all branch 2 times, most recently from fb297fa to 9374fbe Compare January 22, 2025 08:38
jkowalleck
jkowalleck commented Jan 22, 2025
View reviewed changes
tools/src/test/resources/1.7/valid-license-declared-concluded-mix-1.7.textproto
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this example is new

tools/src/test/resources/1.7/valid-license-declared-concluded-mix-1.7.json
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this example is new

tools/src/test/resources/1.7/valid-license-declared-concluded-mix-1.7.xml
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this example is new

tools/src/test/resources/1.6/invalid-license-declared-concluded-mix-1.6.json
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a backport of a newly added valid example for CDX 1.7.
in CDX 1.6, it is invalid.

tools/src/test/resources/1.6/invalid-license-declared-concluded-mix-1.6.xml
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a backport of a newly added valid example for CDX 1.7.
in CDX 1.6, it is invalid.

@jkowalleck jkowalleck force-pushed the feat/licenses-multi-mix-all branch from 9374fbe to 9f5b308 Compare January 22, 2025 09:07
@jkowalleck jkowalleck marked this pull request as draft January 22, 2025 09:09
@jkowalleck
tests
4abbe2f 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck jkowalleck force-pushed the feat/licenses-multi-mix-all branch from c2dcce9 to 4abbe2f Compare January 22, 2025 09:40
jkowalleck
jkowalleck commented Jan 22, 2025
View reviewed changes
tools/src/test/resources/1.7/valid-license-choice-1.7.xml
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this case is now passing - as expected

tools/src/test/resources/1.7/valid-license-choice-1.7.json
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this case is now passing - as expected

tools/src/test/resources/1.7/valid-license-choice-1.7.textproto
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this case is now passing - as expected

@jkowalleck jkowalleck marked this pull request as ready for review January 22, 2025 09:55
@jkowalleck
Copy link
Member Author

@stevespringett this one is ready for review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
proposed core enhancement ready for review
Projects
None yet
Milestone
1.7
Development

Successfully merging this pull request may close these issues.

licenses: allow mix of multiple SPDX expressions AND/OR multiple named/spdx licenses
1 participant
@jkowalleck