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 from CatenaX fork #383

Merged
merged 44 commits into from
Jan 23, 2024
Merged

Merge from CatenaX fork #383

merged 44 commits into from
Jan 23, 2024

Commits on Dec 20, 2023

  1. chore(docs):[#223] Create concept for transfer to PCWM

    @ds-jhartmann
    ds-jhartmann committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    ee0f03b View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. chore(docs):[#223] Updates after review

    @ds-jhartmann
    ds-jhartmann authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    762a250 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. chore(#322):[#322] prepare template for concept

    @mkanal
    mkanal committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    7f14aa4 View commit details
    Browse the repository at this point in the history

  2. chore(concept):[#322] add initial concept

    @mkanal
    mkanal committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    5d46bc9 View commit details
    Browse the repository at this point in the history

  3. chore(concept):[#322] add requirements and initial idea how to store … 

    …contractAgreementId
    @mkanal
    mkanal committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    0a21ff3 View commit details
    Browse the repository at this point in the history

  4. chore(concept):[#322] add edc management api endpoints and abstract d… 

    …efinition
    @mkanal
    mkanal committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    adf5ef4 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. chore(concept):[#322] alignment meeting with trace-x follow ups

    @mkanal
    mkanal committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    a044034 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. chore(concept):[#322] add sequence diagram for receiving EDR token

    @mkanal
    mkanal committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d23b925 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #723 from eclipse-tractusx/main 

    sync with upstream
    @dsmf
    dsmf authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    fdb3863 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. chore(concept):[#322] adapted toc

    @mkanal
    mkanal committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c73097d View commit details
    Browse the repository at this point in the history

  2. chore(concept):[#322] adapted toc of template

    @mkanal
    mkanal committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    50d115b View commit details
    Browse the repository at this point in the history

  3. chore(concept):[#322] adjusted fontfamiliy because of readabiliy reasons

    @mkanal
    mkanal committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4d9262d View commit details
    Browse the repository at this point in the history

  4. chore(concept):[#322] adjusted the concept first corrections

    @mkanal
    mkanal committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    71487e8 View commit details
    Browse the repository at this point in the history

  5. chore(concept):[#322] typo and corrections filled missing summary

    @mkanal
    mkanal committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    edf9163 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. feat(decentral-client-library):412-tracex changed lookupGlobalAssetId… 

    …s to lookupShellsByBPN. Response now delivery the full object instead of the globalAssetId string as list.
    @ds-mwesener
    ds-mwesener committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d479140 View commit details
    Browse the repository at this point in the history

  2. feat(decentral-client-library):412-tracex fixed typo.

    @ds-mwesener
    ds-mwesener committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    4ec170c View commit details
    Browse the repository at this point in the history

  3. feat(decentral-client-library):412-tracex add changelog entry.

    @ds-mwesener
    ds-mwesener committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    5b9e1a2 View commit details
    Browse the repository at this point in the history

  4. chore(workflows): Skip checkstyle and pmd for sonar scan

    @ds-jhartmann
    ds-jhartmann committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    42fdc76 View commit details
    Browse the repository at this point in the history

  5. chore(workflows): Revert secret placeholder change

    @ds-jhartmann
    ds-jhartmann committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    ecb6ab0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #726 from catenax-ng/chore/improve-sonar-scan 

    chore(workflows): Skip checkstyle and PMD for sonar scan
    @ds-jhartmann
    ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0d02b99 View commit details
    Browse the repository at this point in the history

  7. chore(docs):[#223] Add review suggestions 

    Co-authored-by: ds-mkanal <[email protected]>
    @ds-jhartmann @mkanal
    ds-jhartmann and mkanal authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d179f13 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into feature/412-tracex-adapt-registry-lookup

    @ds-mwesener
    ds-mwesener committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    ee9baea View commit details
    Browse the repository at this point in the history

  9. Merge pull request #701 from catenax-ng/chore/#223-concept-for-pcwm 

    chore(docs):[#223] Create concept for transfer to PCWM
    @ds-jhartmann
    ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d832f04 View commit details
    Browse the repository at this point in the history

  10. chore(concept):[#322] Update docs/concept/#322-Provisioning-of-contra… 

    …ct-definiton-for-assets/#322-Provisioning-of-contract-definiton-for-assets.md

Co-authored-by: Jaro Hartmann <[email protected]>
    @mkanal @ds-jhartmann
    mkanal and ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0873179 View commit details
    Browse the repository at this point in the history

  11. chore(concept):[#322] Update docs/concept/#322-Provisioning-of-contra… 

    …ct-definiton-for-assets/#322-Provisioning-of-contract-definiton-for-assets.md

Co-authored-by: Jaro Hartmann <[email protected]>
    @mkanal @ds-jhartmann
    mkanal and ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    cb510ed View commit details
    Browse the repository at this point in the history

  12. chore(concept):[#322] Update docs/concept/#322-Provisioning-of-contra… 

    …ct-definiton-for-assets/#322-Provisioning-of-contract-definiton-for-assets.md

Co-authored-by: Jaro Hartmann <[email protected]>
    @mkanal @ds-jhartmann
    mkanal and ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    9a5f848 View commit details
    Browse the repository at this point in the history

  13. chore(concept):[#322] Update docs/concept/#322-Provisioning-of-contra… 

    …ct-definiton-for-assets/#322-Provisioning-of-contract-definiton-for-assets.md

Co-authored-by: Jaro Hartmann <[email protected]>
    @mkanal @ds-jhartmann
    mkanal and ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    4803eea View commit details
    Browse the repository at this point in the history

  14. chore(concept):[#322] Update docs/concept/#322-Provisioning-of-contra… 

    …ct-definiton-for-assets/#322-Provisioning-of-contract-definiton-for-assets.md

Co-authored-by: Jaro Hartmann <[email protected]>
    @mkanal @ds-jhartmann
    mkanal and ds-jhartmann authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    747ea9e View commit details
    Browse the repository at this point in the history

  15. chore(concept):[#322] add title and rename files 

     typo and corrections filled missing summary
    @mkanal
    mkanal committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    707d1f3 View commit details
    Browse the repository at this point in the history

  16. chore(concept):[#322] remove html links in toc

    @mkanal
    mkanal committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d834f60 View commit details
    Browse the repository at this point in the history

  17. chore(concept):[#322] add changelog entry

    @mkanal
    mkanal committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0fda2a6 View commit details
    Browse the repository at this point in the history

  18. fix(concept):[#322] fix review comments

    @mkanal
    mkanal committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    47cfa23 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. fix(concept):[#322] remove <> from status add sequence diagram for ca… 

    …se 3
    @mkanal
    mkanal committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    54cdfc8 View commit details
    Browse the repository at this point in the history

  2. chore(irs-build): Remove JaCoCo package-level coverage check. This is… 

    … already done by Sonar
    @ds-jhartmann
    ds-jhartmann committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a5b40e1 View commit details
    Browse the repository at this point in the history

  3. chore(concept):[#322] Formatting

    @ds-jhartmann
    ds-jhartmann committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a95adb0 View commit details
    Browse the repository at this point in the history

  4. chore(concept):[#322] Formatting

    @ds-jhartmann
    ds-jhartmann committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e2b69ae View commit details
    Browse the repository at this point in the history

  5. Merge pull request #724 from catenax-ng/chore/#322-Provisioning-of-co… 

    …ntract-negotiation-and-contract-assessment-for-assets

Chore/#322 provisioning of contract negotiation and contract assessment for assets
    @ds-jhartmann
    ds-jhartmann authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    0746ce4 View commit details
    Browse the repository at this point in the history

  6. chore(concept):[#322] correct tombstone using UsagePolicyValidation

    @mkanal
    mkanal committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ebff564 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #730 from catenax-ng/chore/#322-Provisioning-of-co… 

    …ntract-aggreement-id

chore(concept):[#322] correct tombstone using UsagePolicyValidation
    @ds-jhartmann
    ds-jhartmann authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    cab0c48 View commit details
    Browse the repository at this point in the history

  8. chore(foss):[#349] Also update the detailed copyright section in the … 

    …license headers

This change was neither described in the acceptance criteria nor did the TRG 7.02  require it, but this additional change was requested by the PO in the iteration session.
    @dsmf
    dsmf committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d51258c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge pull request #728 from catenax-ng/chore/code-coverage 

    chore(irs-build): Remove JaCoCo package-level coverage check. This is…
    @ds-jhartmann
    ds-jhartmann authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    22f1c92 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/412-tracex-adapt-registry-lookup

    @ds-jhartmann
    ds-jhartmann committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    34e2713 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #731 from catenax-ng/chore/349-update-license-headers 

    chore(foss):[#349] Also update the detailed copyright section
    @dsmf
    dsmf authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    016b65a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #725 from catenax-ng/feature/412-tracex-adapt-regi… 

    …stry-lookup

feat(decentral-client-library):412-tracex changed lookupGlobalAssetId request
    @ds-jhartmann
    ds-jhartmann authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    e7b757a View commit details
    Browse the repository at this point in the history