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

Merge conflict resolution from main #205

Closed
wants to merge 10 commits into from
Closed

Merge conflict resolution from main #205

wants to merge 10 commits into from

Commits on Jun 11, 2024

  1. Merge pull request #158 from siemens/feature/hashaddition 

    Updating SBOM with component Hashes
    @Vijayalakshmi027
    Vijayalakshmi027 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3cde00e View commit details
    Browse the repository at this point in the history

  2. Revert "Updating SBOM with component Hashes"

    @Vijayalakshmi027
    Vijayalakshmi027 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5a9d7e1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #172 from siemens/revert-158-feature/hashaddition 

    Revert "Updating SBOM with component Hashes"
    @Vijayalakshmi027
    Vijayalakshmi027 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    1b4cf77 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Bugfix: Components are not present in the BOM

    @karthika-g
    karthika-g committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    a9f1795 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Chnaged error to warn

    @karthika-g
    karthika-g committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    aadd24c View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. nuspec update

    @karthika-g
    karthika-g committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    696ffd1 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge pull request #179 from siemens/defect/maven_fileparse 

    Error to be displayed when Components are not present in the BOM for MAVEN package type
    @karthika-g
    karthika-g authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    49a215b View commit details
    Browse the repository at this point in the history

  2. version update

    @karthika-g
    karthika-g committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    00826fd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #180 from siemens/defect/maven_fileparse 

    version update
    @karthika-g
    karthika-g authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    538cd81 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge branch 'main' into feature/merge_check

    @karthika-g
    karthika-g committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    1eeb442 View commit details
    Browse the repository at this point in the history