diff --git a/CHANGELOG.md b/CHANGELOG.md index e463b78f7e..df776b7964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,18 +5,28 @@ 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). ## [Unreleased] + + + +## [4.6.0] - 2024-02-20 ### Added - Added concept to conform with IndustryCore Changes CX-0126 and CX-127 +- Added release instructions to CONTRIBUTING.md - EdcAssetService capable to create assets inside EDC - EdcPolicyDefinitionService capable to create polices inside EDC - EdcContractDefinitionService capable to create contracts inside EDC ### Changed - Updated AUTHORS.md +- Reduced log level in MeterRegistryService in order to avoid excessive logging -## [4.5.1] - 2024-02-07 +### Fixed +- Fixed Log4J configuration +- Fix tavern and cucumber tests + +## [4.5.1] - 2024-02-20 ### Changed -- moved Docker notice to separate file #425 +- Moved Docker notice to separate file #425 ## [4.5.0] - 2024-02-07 ### Added @@ -524,7 +534,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Unresolved - **Select Aspects you need** You are able to select the needed aspects for which you want to collect the correct endpoint information. -[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.5.1...HEAD +[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.6.0...HEAD +[4.6.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.5.1...4.6.0 +[4.5.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.5.0...4.5.1 [4.5.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.5.0...4.5.1 [4.5.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.4.0...4.5.0 [4.4.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.3.0...4.4.0 diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md index 9f80503b13..1d5acd4792 100644 --- a/COMPATIBILITY_MATRIX.md +++ b/COMPATIBILITY_MATRIX.md @@ -2,6 +2,22 @@ Full changelog of IRS: [changelog](CHANGELOG.md) + +## [4.6.0] - 2024-02-20 +| Dependency | Version | Helm | Comments | +|---------------------------|------------------------------|------------|-----------------| +| EDC | 0.5.3 | 0.5.3 | | +| EDC PostgresSQL | 15.1.0-debian-11-r12 | 12.1.6 | Optional | +| MIW | 0.1.0 | 0.1.0 | REST connection | +| Semantics Hub | 0.1.29 | v0.2.11-M1 | REST connection | +| DTR | 0.3.14-M1 | 0.3.22 | REST connection | +| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | | +| SingleLevelBomAsBuilt | 2.0.0 | - | Model version | +| SingleLevelBomAsPlanned | 2.0.0 | - | Model version | +| SingleLevelBomAsSpecified | 1.0.0 | - | Model version | +| SingleLevelUsageAsBuilt | 2.0.0 | - | Model version | + + ## [4.2.0] - 2023-11-28 | Dependency | Version | Helm | Comments | |---------------------------|------------------------------|------------|-----------------| diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c6bc91c34..8300354d0e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -152,14 +152,28 @@ https://github.com/google/google-java-format/blob/master/README.md#intellij-jre- ### Create a release -1. Choose a release version. Use semantic versioning! +1. Choose a release version. Use semantic versioning! Create a respective branch e.g. `chore/prepare-release-2.6.1`. 2. Add release notes for new version in [CHANGELOG.md](CHANGELOG.md) and [charts/irs-helm/CHANGELOG.md](charts/irs-helm/CHANGELOG.md) (e.g. https://github.com/catenax-ng/tx-item-relationship-service/pull/328) -3. Update [COMPATIBILITY_MATRIX.md](COMPATIBILITY_MATRIX.md) -4. Create Git tag for the desired release version `git tag x.x.x` -5. Push Git tag to repository `git push origin x.x.x` -6. Wait for release workflow to complete -7. Merge the automatically opened PR by github-actions bot -8. Notify about the release in IRS Matrix Chat +3. Update [COMPATIBILITY_MATRIX.md](COMPATIBILITY_MATRIX.md) (see [catena-x-environments](https://github.com/catenax-ng/tx-item-relationship-service/tree/catena-x-environments/charts/irs-environments)) +4. Create pull request and merge to main +5. Create Git tag for the desired release version `git tag x.x.x` + (the irs-helm tag will be created by the github workflow based on the version in the irs-helm changelog) +6. Push Git tag to repository `git push origin x.x.x` +7. Wait for release workflow to complete +8. Merge the automatically opened PR by github-actions bot +9. Create pull request to eclipse-tractusx +10. Notify about the release in IRS Matrix Chat. Template: + + > **IRS Release x.x.x** + > + > IRS version x.x.x is released. + > + > https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/x.x.x
+ > https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/irs-helm-y.y.y
+ > **Full Changelog:** https://github.com/eclipse-tractusx/item-relationship-service/compare/w.w.w...x.x.x + + _(replace x.x.x with IRS version to release, y.y.y with IRS helm version to release and w.w.w with previous IRS version)_ + ## Contact diff --git a/charts/irs-helm/CHANGELOG.md b/charts/irs-helm/CHANGELOG.md index 5905fbac62..d5cc57894e 100644 --- a/charts/irs-helm/CHANGELOG.md +++ b/charts/irs-helm/CHANGELOG.md @@ -6,10 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [6.14.1] - 2024-02-20 +## [6.15.0] - 2024-02-20 ### Changed -- Update IRS version to 4.5.1 - +- Update IRS version to 4.6.0 ## [6.14.0] - 2024-02-07 ### Added