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

IRS Release 4.6.0 #433

Merged
merged 6 commits into from
Feb 20, 2024
Merged

IRS Release 4.6.0 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36be2de
chore(release): prepare release 4.6.0
dsmf Feb 20, 2024
649ddca
chore(release): correct CHANGELOG and CONTRIBUTING.md
dsmf Feb 20, 2024
bf5bba0
Update CHANGELOG.md
dsmf Feb 20, 2024
2f0385e
Merge pull request #778 from catenax-ng/chore/prepare-release-4.6.0
dsmf Feb 20, 2024
e54fc84
chore(release): Prepare release for Helm version 6.15.0
dsmf Feb 20, 2024
83460a3
Merge pull request #782 from catenax-ng/chore/prepare-helm-release-6.…
dsmf Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions COMPATIBILITY_MATRIX.md
View file
Open in desktop
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
28 changes: 21 additions & 7 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<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
5 changes: 2 additions & 3 deletions charts/irs-helm/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/irs-helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
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.1"
appVersion: "4.6.0"
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
Expand Down
Loading