From 3b052ff102882e78ef28abd981035b7e5b4a10f0 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 9 Nov 2023 14:50:56 +0100 Subject: [PATCH 1/3] fix(edc-client):[#262] Add status "started" as acceptable state to complete the transfer process --- CHANGELOG.md | 2 ++ .../eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da82c88ff1..76ab4e5d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ 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] +### Changed +- Added state `STARTED` as acceptable state to complete the EDC transfer process to be compatible with EDC 0.5.1 ## [4.0.0] - 2023-10-27 ### Added diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java index ab38b2ceb4..b6b3378973 100644 --- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java +++ b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java @@ -59,6 +59,7 @@ public class EdcControlPlaneClient { public static final String STATUS_FINALIZED = "FINALIZED"; public static final String STATUS_COMPLETED = "COMPLETED"; + public static final String STATUS_STARTED = "STARTED"; public static final String STATUS_ERROR = "ERROR"; public static final String DATASPACE_PROTOCOL_HTTP = "dataspace-protocol-http"; public static final String STATUS_TERMINATED = "TERMINATED"; @@ -209,7 +210,7 @@ private NegotiationResponse getContractNegotiationResponse(final Response negoti if (transferProcessState != null) { return switch (transferProcessState.getState()) { - case STATUS_COMPLETED -> Optional.of( + case STATUS_COMPLETED, STATUS_STARTED -> Optional.of( getTransferProcessResponse(transferProcessId, objectHttpEntity)); case STATUS_ERROR -> throw new IllegalStateException( "TransferProcessResponse with id " + getTransferProcessResponse( From a8519ca21ec1d02a6da134c8812fc839a8c79eb4 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Fri, 10 Nov 2023 09:47:31 +0100 Subject: [PATCH 2/3] chore(docs):[#262] Prepare changelog for release --- CHANGELOG.md | 2 ++ charts/irs-helm/CHANGELOG.md | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76ab4e5d1d..8f65fd3305 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ 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.0.1] - 2023-11-10 ### Changed - Added state `STARTED` as acceptable state to complete the EDC transfer process to be compatible with EDC 0.5.1 diff --git a/charts/irs-helm/CHANGELOG.md b/charts/irs-helm/CHANGELOG.md index bc46d95556..6c4e1d8969 100644 --- a/charts/irs-helm/CHANGELOG.md +++ b/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.9.1] +### Changed +- Update IRS version to 4.0.1 + ## [6.9.0] ### Changed - Update IRS version to 4.0.0 From 810d820cb75fed2a2034f09dabb1559897b77393 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Fri, 10 Nov 2023 09:48:54 +0100 Subject: [PATCH 3/3] chore(docs):[#262] Prepare changelog for release --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f65fd3305..bb4e9a6d81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -405,7 +405,8 @@ 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.0.0...HEAD +[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.1...HEAD +[4.0.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.4...4.0.0 [3.5.4]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.3...3.5.4 [3.5.3]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.2...3.5.3