From 64a2f26c00be01bbf4876e90495c063d1d99aedb Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Fri, 5 Jul 2024 15:05:37 +0200 Subject: [PATCH 1/3] feature(xxx):xxx release/12.0.0 --- CHANGELOG.md | 26 +++++++++++----------- COMPATIBILITY_MATRIX.md | 31 +++++++++++++++++++++++++++ charts/traceability-foss/CHANGELOG.md | 2 ++ 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67883af8c3..05ca610f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,19 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_ ## [UNRELEASED - DD.MM.YYYY] + +## [12.0.0 - 05.07.2024] + +### Added +- #832 added policymanagement list view, creator and editor +- #737 Added concept: Contract table -> parts link action +- XXX Added interceptor to EdcRestTemplates to log requests +- #915 Added section to documentation: EDC-BPN configuration +- #1037 Added link from contracts view to the corresponding filtered part table view +- #1017 added file for CC BY 4.0 license for TRG 7 +- #985 Added reference to part/notification under contract +- #786 Added icons on part table to let admin reload registry / sync assets via IRS + ### Changed - #965 Implement proxy functionality of the IRS policy store - #962 Changed notification model to new one in frontend/backend @@ -33,22 +46,9 @@ _**For better traceability add the corresponding GitHub issue number in each cha - #875 owasp dependency check tool is now used from github action image instead of maven plugin - XXX fixed display of semantic data model in parts as planned table - -### Added -- #832 added policymanagement list view, creator and editor -- #737 Added concept: Contract table -> parts link action -- XXX Added interceptor to EdcRestTemplates to log requests -- #915 Added section to documentation: EDC-BPN configuration -- #1037 Added link from contracts view to the corresponding filtered part table view -- #1017 added file for CC BY 4.0 license for TRG 7 -- #985 Added reference to part/notification under contract -- #786 Added icons on part table to let admin reload registry / sync assets via IRS - ### Known knowns - - #786 Implemented short term solution for securing EDC Callback APIs - ### Removed - XXX Removed EdcNotifiactionMockServiceImpl class and replaced with mocks diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md index dcd68ecaff..20e7d793c8 100644 --- a/COMPATIBILITY_MATRIX.md +++ b/COMPATIBILITY_MATRIX.md @@ -1,4 +1,35 @@ # Compatibility matrix Trace-X +## Trace-X version [12.0.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/12.0.0) - 2024-07-05 + +### Catena-X Release? + +- [] yes +- [x] no + +### Helm Version [1.3.40](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.40) + +| Dependency | Name of Service | Version | Helm | Comments | +|------------------|------------------------------|----------------------|----------|-----------------------------------------------------| +| EDC | edc-postgresql | 15.4.0-debian-11-r45 | 12.12.10 | Enterprise Data Connector for PostgreSQL | +| IRS | item-relationship-service | 5.1.4 | 7.1.4 | Helm charts for Item Relationship Service | +| EDC | tractusx-connector | 0.7.0 | 0.7.0 | Connector for Data Transfer and Registration | +| Discovery Finder | discovery service | 0.2.5 | - | Service for discovering and registering artifacts | +| Portal | portal | 1.8.0 | - | Web portal for interacting with Trace-X | +| SD-Factory | SD-Factory | 2.1.7 | - | Service Discovery Factory for managing dependencies | +| Registry | sldt-digital-twin-registry | 0.4.1 | 0.4.9 | Digital Twin Registry | +| Submodel Server | submodelservers | 0.1.0 | 0.0.1 | Submodel Server | +| Aspect Model | SerialPart | 3.0.0 | - | | +| Aspect Model | Batch | 3.0.0 | - | | +| Aspect Model | PartAsPlanned | 2.0.0 | - | | +| Aspect Model | PartSiteInformationAsPlanned | 1.0.0 | - | | +| Aspect Model | JustInSequencePart | 3.0.0 | - | | +| Aspect Model | TractionBatteryCode | 2.0.0 | - | | +| Aspect Model | SingleLevelUsageAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsPlanned | 3.0.0 | - | + + + ## Trace-X version [11.0.2](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.2) - 2024-05-29 ### Catena-X Release? diff --git a/charts/traceability-foss/CHANGELOG.md b/charts/traceability-foss/CHANGELOG.md index 100ebe8f3b..f160d9f8c5 100644 --- a/charts/traceability-foss/CHANGELOG.md +++ b/charts/traceability-foss/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.40] - 2024-05-29 +### No changes ## [1.3.39] - 2024-05-29 ### No changes From be2e9353cbed145a64a2d837dfea940eb0622d5c Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Fri, 5 Jul 2024 15:06:45 +0200 Subject: [PATCH 2/3] feature(xxx):xxx release/12.0.0 --- docs/RELEASE.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 00dec9489d..e7d4836d27 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -3,34 +3,34 @@

Product Traceability FOSS Release guide

-# Release Numbering +# Release Numbering Trace-X using semantic versioning three-part version number. https://semver.org/ ## Major Release * If there are any incompatible API changes. -* Changes with high impact +* Changes with high impact * Contains new features and changes with critical business impact. -* Full regression tests are covered. +* Full regression tests are covered. ## Minor Release * Add functionality in a backwards compatible manner * Features (backwards compatible has to be ensured) * Minor release does not add features or changes with critical business impact. -* Regression impact should be low. -* No training effort necessary -* INT Test environment should be stable. No changes on depending on systems required. No changes on consumer side necessary. -* Operational risks should be low. +* Regression impact should be low. +* No training effort necessary +* INT Test environment should be stable. No changes on depending on systems required. No changes on consumer side necessary. +* Operational risks should be low. ## Bug fix / Patch Release * Backwards compatible bug fixes * Bug fixes and Hotfixes -* Covers Bug fixes and changes with no critical business impact. -* No changes on depending on or consuming systems required. -* INT Test environment should be stable. No changes on depending on systems required. No changes on consumer side necessary. +* Covers Bug fixes and changes with no critical business impact. +* No changes on depending on or consuming systems required. +* INT Test environment should be stable. No changes on depending on systems required. No changes on consumer side necessary. -## Tag -* Defined software state. +## Tag +* Defined software state. # Release an app @@ -58,21 +58,21 @@ The goal is to not use a -SNAPSHOT version in the Trace-X Release. 4) Edit changelog: Align the new version (1.0.0) with the changes and add a new UNRELEASED section 5) Edit /charts/traceability-foss/CHANGELOG.md 6) Add an Entry for an incremented (patch) version (1.0.0 -> 1.0.1) -7) Update the [Compatability Matrix](https://github.com/catenax-ng/tx-traceability-foss/blob/main/COMPATIBILITY_MATRIX.md) with a new entry for the release version +7) Update the [Compatability Matrix](https://github.com/eclipse-tractusx/traceability-foss/blob/main/COMPATIBILITY_MATRIX.md) with a new entry for the release version 8) Push onto /release/1.0.0 catena and eclipse -9) Open Release App Page Catena: https://github.com/catenax-ng/tx-traceability-foss/releases +9) Open Release App Page Catena: https://github.com/eclipse-tractusx/traceability-foss/releases 10) Draft a new release 11) On dropdown choose a tag - use the version 1.0.0 (Create new tag will appear - select it) 12) On dropdown target use your /release/1.0.0 13) Title = Version of app -> 1.0.0 14) Description = Changelog Content of app 15) Checkbox set as latest release -16) Verify that GitHub action [Release](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/release.yaml) generation has been triggered +16) Verify that GitHub action [Release](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/release.yaml) generation has been triggered 17) Verify that an automatic pull request has been opened (Prepare Helm release for next version) 18) Validate that the versions within that pull requests are correct 19) Merge pull request (Prepare Helm release for next version) 20) Merge release branch into main (when merging make sure to restore release branch since it should stay) -21) Open the GitHub action for helm release generation: https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/helm-chart-release.yaml +21) Open the GitHub action for helm release generation: https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/helm-chart-release.yaml 22) Execute it from main branch 23) Validate that the helm charts release has been generated within the release page 24) Create a new branch from release/1.0.0 and name it release/helm-environments-1.0.0 (helm app version not chart version) From d8a61aa6f8340b43e1f0bdc8dba46910c14a2da2 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Fri, 5 Jul 2024 15:14:56 +0200 Subject: [PATCH 3/3] feature(xxx):xxx release/12.0.0 --- .github/workflows/release.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 675b8c70e4..9b83ddf5d4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -83,22 +83,22 @@ jobs: Please check whether the Chart was updated correctly and that the CHANGELOG contains the relevant information for this release. Also, make sure that the values.yaml is correct before merging this PR. - - name: Update OpenAPI spec - run: mvn test -Dsurefire.failIfNoSpecifiedTests=false -Dtest=OpenApiDocumentationIT -Dopenapi-doc.generate=true - - - name: Create pull request - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.GITHUB_TOKEN }} - branch: action/update-openapi-spec - title: "chore(OpenAPI): updated OpenAPI spec" - labels: automated - delete-branch: true - body: | - This PR updates the OpenAPI spec. Please check whether the spec was updated correctly. Unfortunately, this - action causes a lot of nonsensical changes which should, however, be clearly recognizable. - You can safely ignore these. - + # - name: Update OpenAPI spec + # run: mvn test -Dsurefire.failIfNoSpecifiedTests=false -Dtest=OpenApiDocumentationIT -Dopenapi-doc.generate=true +# + # - name: Create pull request + # uses: peter-evans/create-pull-request@v6 + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + # branch: action/update-openapi-spec + # title: "chore(OpenAPI): updated OpenAPI spec" + # labels: automated + # delete-branch: true + # body: | + # This PR updates the OpenAPI spec. Please check whether the spec was updated correctly. Unfortunately, this + # action causes a lot of nonsensical changes which should, however, be clearly recognizable. + # You can safely ignore these. +# - name: Get previous version run: echo PREVIOUS_VERSION=$(git tag | grep -E ^[0-9]+\\.[0-9]+\\.[0-9]+ | tail -2 | head -n +1) >> $GITHUB_ENV