Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into chore/#000-add-irs-log
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
ds-jhartmann committed Feb 27, 2024
2 parents a9cf5f3 + 98d7086 commit 4e69594
Show file tree
Hide file tree
Showing 48 changed files with 2,617 additions and 142 deletions.
1 change: 1 addition & 0 deletions .github/workflows/irs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ jobs:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
readme-filepath: ./DOCKER_NOTICE.md

trigger-trivy-image-scan:
if: >-
Expand Down
3 changes: 2 additions & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 31 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,35 @@ 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

### Changed
- Change logo of irs

## [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-20
### Changed
- Moved Docker notice to separate file #425

## [4.5.0] - 2024-02-07
### Added
Expand Down Expand Up @@ -515,7 +541,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.0...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
Expand Down
16 changes: 16 additions & 0 deletions COMPATIBILITY_MATRIX.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
|---------------------------|------------------------------|------------|-----------------|
Expand Down
24 changes: 24 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 4e69594

Please sign in to comment.