Merge branch 'main' into hotfix/4.5.2

AUTHORS.md

@@ -17,4 +17,5 @@ The following people have contributed to this repository:
 - Zied Belkhiria, MHP, https://github.com/Zied-Belkhiria-Mhp
 - Adam Bugajewski, doubleSlash Net-Business GmbH, https://github.com/ds-ext-abugajewski
 - Matthias Fischer, doubleSlash Net-Business GmbH, https://github.com/dsmf
-
+- Sebastian Ceronik, doubleSlash Net-Business GmbH, https://github.com/ds-ext-sceronik
+- Maximilian Wesener, doubleSlash Net-Business GmbH, https://github.com/ds-mwesener

CHANGELOG.md

@@ -5,14 +5,33 @@ 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]
+### Added
+- DigitalTwinRegistryCreateShellService in irs-registry-client for creating shells in DTR directly
+
+
+## [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
+
+### Fixed
+- Fixed Log4J configuration
+- Fix tavern and cucumber tests
 
 ## [4.5.2] - 2024-02-22
 ## Changed
 - Updated IRS OpenAPI version to 4.5.2
 
-## [4.5.1] - 2024-02-07
+## [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
@@ -520,9 +539,11 @@ 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.2...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.2]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.5.1...4.5.2
 [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
 [4.3.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.2.0...4.3.0

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        |
 |---------------------------|------------------------------|------------|-----------------|

CONTRIBUTING.md

@@ -150,6 +150,30 @@ The plugin will be disabled by default. To enable it in the current project, go
 More info:  
 https://github.com/google/google-java-format/blob/master/README.md#intellij-jre-config
 
+### Create a release
+
+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) (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<br>
+   >   https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/irs-helm-y.y.y<br>
+   >   **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
 

charts/irs-helm/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.15.0] - 2024-02-20
+### Changed
+- Update IRS version to 4.6.0
+
 ## [6.14.2] - 2024-02-22
 ### Changed
 - Update IRS version to 4.5.2

charts/irs-helm/Chart.yaml

@@ -35,12 +35,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 6.14.2
+version: 6.15.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.5.2"
+appVersion: "4.6.0"
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami