Merge pull request #269 from catenax-ng/hotfix/release-23.12

Prepare IRS hotfix 4.0.1
eclipse-tractusx · Nov 10, 2023 · 4f538ec · 4f538ec
2 parents 3391975 + 810d820
commit 4f538ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [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
+
 ## [4.0.0] - 2023-10-27
 ### Added
 - Introduced new API endpoint to register ESS Jobs in Batch - POST {{IRS_HOST}}/irs/ess/orders
@@ -401,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

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

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