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

Allow for custom non SPDX licenses (including content) #3366

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Allow for custom non SPDX licenses (including content) #3366

wants to merge 21 commits into from

Commits on Oct 17, 2024

  1. - Implement support for custom licenses. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c3d4306 View commit details
    Browse the repository at this point in the history

  2. - Make sure custom licenses are also exported for the CycloneDX format. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    19611de View commit details
    Browse the repository at this point in the history

  3. - Export license URL for custom licenses in the CycloneDX format, if … 

    …available.

Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6ebc5fa View commit details
    Browse the repository at this point in the history

  4. - Retain custom license contents for golang licenses. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1ba2393 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. - Harmonize custom license line endings to UNIX style before registra… 

    …tion in order to avoid incompatibilities (and multiple instances of the same license).

Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    64a433e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into Custom_Licenses

    @HeyeOpenSource
    HeyeOpenSource committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    b6b8ca5 View commit details
    Browse the repository at this point in the history

  3. - Fix for static analysis. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    48254a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'anchore:main' into Custom_Licenses

    @HeyeOpenSource
    HeyeOpenSource authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    243ecb4 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Merge commit '14355aac2157482fc6d4dc34a608f779912e6d2b' into Custom_L… 

    …icenses
    @HeyeOpenSource
    HeyeOpenSource committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a67d7b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into Custom_Licenses 

    Signed-off-by: HeyeOpenSource <[email protected]>

# Conflicts:
#	internal/licenses/parser.go
    @HeyeOpenSource
    HeyeOpenSource committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9ae8aad View commit details
    Browse the repository at this point in the history

  3. - Ignore custom license contents in hash. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    cbb9ddd View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. - Added some Unit Tests. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    02efff7 View commit details
    Browse the repository at this point in the history

  2. - Added Golang license specific conversion test. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    83613cc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into Custom_Licenses

    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9f6bb95 View commit details
    Browse the repository at this point in the history

  4. - Merge licenses_test package into licenses package to try to fix sta… 

    …tic analysis.

Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1dd8c87 View commit details
    Browse the repository at this point in the history

  5. - Increment JSONSchemaVersion. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b177b4e View commit details
    Browse the repository at this point in the history

  6. - Adapt JSON schema. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    beda1b6 View commit details
    Browse the repository at this point in the history

  7. Revert "- Adapt JSON schema." 

    This reverts commit beda1b6.

Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    52e1fab View commit details
    Browse the repository at this point in the history

  8. - Add schema-16.0.19.json again. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    bb5a0eb View commit details
    Browse the repository at this point in the history

  9. Revert "- Add schema-16.0.19.json again." 

    This reverts commit 9b90378.

Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ef8875f View commit details
    Browse the repository at this point in the history

  10. - Added new schema as created by 'make generate-json-schema'. 

    Signed-off-by: HeyeOpenSource <[email protected]>
    @HeyeOpenSource
    HeyeOpenSource committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3e546de View commit details
    Browse the repository at this point in the history