Merge branch 'main' into gen-sdk-updates

Author: jenschude

.git-blame-ignore-revs

@@ -9,5 +9,11 @@ de95c481329aa8b821e6e71ac35c1b8bc67e3e86
 78c44064f4ec15091bde7a2dc590aa2b3a99341d
 03665b75a1e1c3a3cf28df1dec52e91b308e4368
 7e25c796da25ae080a952936de535a1228fed448
+a0945d605699e8e7aca9448767ba1286b7ebb2c1
 7ceb871552e5d9cb0379fbba014690aa067061eb
 af9205fa592e4ae32ceca951c560a48b512b7744
+6154ba1d1461d9279a305b52d8dd4b842e848545
+0b5dd8bee320456962d94cb845e9d27469a34091
+f58dd73747791edcd45722a4903da44da1b9b2d3
+fcdaa3d6735d2382a44d066a6ce051a2c5e6469f
+9bbe16b7d1600fc96100f54cb25869cbdf425521

CHANGELOG.md

@@ -1,4 +1,109 @@
 
+# 19.6.2 (2025-11-10)
+
+## What's Changed
+* fixing build.gradle by @ShipilA in https://github.com/commercetools/commercetools-sdk-java-v2/pull/1004
+
+**Api changes**
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `DiscountCombinationMode`
+- added type `DiscountsConfiguration`
+- added type `ProjectSetDiscountsConfigurationAction`
+</details>
+
+
+<details>
+<summary>Removed Property(s)</summary>
+
+- :warning: removed property `skipConfiguration` from type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+
+<details>
+<summary>Added Property(s)</summary>
+
+- added property `discounts` to type `Project`
+- added property `skipConfigurationInputDraft` to type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/19.6.1...19.6.2
+
+
+# 19.6.1 (2025-11-07)
+
+## What's Changed
+* DEVX-657: overriding equals and hashCode for LocalizedStringEntry by @ShipilA in https://github.com/commercetools/commercetools-sdk-java-v2/pull/1002
+
+**Api changes**
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `DiscountCombinationMode`
+- added type `DiscountsConfiguration`
+- added type `ProjectSetDiscountsConfigurationAction`
+</details>
+
+
+<details>
+<summary>Removed Property(s)</summary>
+
+- :warning: removed property `skipConfiguration` from type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+
+<details>
+<summary>Added Property(s)</summary>
+
+- added property `discounts` to type `Project`
+- added property `skipConfigurationInputDraft` to type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/19.6.0...19.6.1
+
+# 19.6.0 (2025-11-03)
+
+## What's Changed
+* Update changelog by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/992
+* Update generated SDKs by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/993
+* Update generated SDKs by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/994
+* Update generated SDKs by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/995
+* Update generated SDKs by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/996
+* Update generated SDKs by @ct-sdks[bot] in https://github.com/commercetools/commercetools-sdk-java-v2/pull/997
+* DEVX-640-helper-method-from-Coco-product-to-import-API-product by @ShipilA in https://github.com/commercetools/commercetools-sdk-java-v2/pull/1000
+
+**Api changes**
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `DiscountCombinationMode`
+- added type `DiscountsConfiguration`
+- added type `ProjectSetDiscountsConfigurationAction`
+</details>
+
+
+<details>
+<summary>Removed Property(s)</summary>
+
+- :warning: removed property `skipConfiguration` from type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+
+<details>
+<summary>Added Property(s)</summary>
+
+- added property `discounts` to type `Project`
+- added property `skipConfigurationInputDraft` to type `RecurringOrderSetOrderSkipConfigurationAction`
+</details>
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/19.5.0...19.6.0
+
 # 19.5.0 (2025-09-22)
 
 ## What's Changed

README.md

@@ -21,7 +21,7 @@ The latest stable SDK release can be retrieved from [Maven Central](https://sear
 ```gradle
 ext {
     versions = [
-        commercetools: "19.5.0"
+        commercetools: "19.6.2"
     ]
 }
 
@@ -42,7 +42,7 @@ dependencies {
 
 ```maven
 <properties>
-    <commercetools.version>19.5.0</commercetools.version>
+    <commercetools.version>19.6.2</commercetools.version>
 </properties>
 <dependencies>
     <dependency>

commercetools/commercetools-importapi-utils/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    implementation(project(":commercetools:commercetools-sdk-java-api"))
+    implementation(project(":commercetools:commercetools-sdk-java-importapi"))
+}

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/ExpandObjResolverService.java

@@ -0,0 +1,16 @@
+
+package com.commercetools.sdk;
+
+import java.util.Optional;
+
+import com.commercetools.api.models.IdentifiableObjHolder;
+import com.commercetools.api.models.WithKey;
+import com.commercetools.api.models.common.Reference;
+
+public class ExpandObjResolverService implements KeyResolverService {
+
+    @Override
+    public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable) {
+        return Optional.ofNullable(identifiable).map(T::getObj).map(TRes::getKey).orElse(null);
+    }
+}

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/KeyResolverService.java

@@ -0,0 +1,10 @@
+
+package com.commercetools.sdk;
+
+import com.commercetools.api.models.IdentifiableObjHolder;
+import com.commercetools.api.models.WithKey;
+import com.commercetools.api.models.common.Reference;
+
+public interface KeyResolverService {
+    public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable);
+}