Merge branch 'main' into dependabot/npm_and_yarn/cross-spawn-7.0.6

commercetools · Jan 6, 2025 · 8a56fd4 · 8a56fd4
2 parents 68aad8e + 6850436
commit 8a56fd4
Show file tree

Hide file tree

Showing 571 changed files with 16,908 additions and 1,875 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -4,3 +4,5 @@ a8ec45c8ea4ba559247b654d01b0d35b21a68865
 d0129c1095216d5c830900c8a6223ef5d4274de1
 4bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7
 352051999507bd78542e177d67ce1548a0752691
+bbe9f971763ca1b27687a6a51067a385a0d23b04
+de95c481329aa8b821e6e71ac35c1b8bc67e3e86
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -4,7 +4,7 @@ on:
 name: Benchmark
 
 # Declare default permissions as read only.
-permissions: read-all
+permissions: { }
 
 jobs:
     benchmark:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 name: CI
 
 # Declare default permissions as read only.
-permissions: read-all
+permissions: {}
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
@@ -71,7 +71,9 @@ jobs:
 
       - name: "Run if style changes have been detected"
         if: steps.commit_style_fix.outputs.changes_detected == 'true'
-        run: echo "${{steps.commit_style_fix.outputs.commit_hash}}" >> .git-blame-ignore-revs
+        run: echo "$HASH" >> .git-blame-ignore-revs
+        env:
+            HASH: ${{steps.commit_style_fix.outputs.commit_hash}}
 
       - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
         id: commit_rev_ignore

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -59,8 +59,10 @@ jobs:
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
 
-      - run: ./gradlew -Pversion=${{ github.event.inputs.version }} alljavadoc
+      - run: ./gradlew -Pversion=$VERSION alljavadoc
         working-directory: sdk
+        env:
+          VERSION: ${{ github.event.inputs.version }}
 
       - run: rsync -r sdk/build/docs/javadoc/ doc/javadoc
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,8 +36,9 @@ jobs:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
 
-      - run: ./gradlew -Pversion=${{ github.ref_name }} clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
+      - run: ./gradlew -Pversion=$REF_NAME clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
+          REF_NAME: ${{ github.ref_name }}
           CTP_OSS_USER: ${{ secrets.OSS_USER }}
           CTP_OSS_SECRET: ${{ secrets.OSS_SECRET }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -76,7 +77,9 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
 
-      - run: ./gradlew -Pversion=${{ github.ref_name }} writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
+      - run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
+        env:
+          REF_NAME: ${{ github.ref_name }}
 
       - name: "Switch SDK to after release branch"
         run: |
@@ -150,8 +153,11 @@ jobs:
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
 
-      - run: ./gradlew -Pversion=${{ github.ref_name }} alljavadoc
+      - run: ./gradlew -Pversion=$REF_NAME alljavadoc
         working-directory: sdk
+        env:
+            REF_NAME: ${{ github.ref_name }}
+
 
       - run: rsync -r sdk/build/docs/javadoc/ doc/javadoc
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,136 @@
 
+# 17.21.0 (2024-12-19)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/767
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/768
+* DEVX-496 update spring boot version by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/765
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/769
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/770
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/771
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/774
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/775
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/776
+* DEVX-460 make metrics more precise for values below 0 ms by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/772
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/777
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/778
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/779
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/780
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/781
+* Update Apache AsyncHttpClient by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/773
+
+**Api changes**
+
+<details>
+<summary>Added Resource(s)</summary>
+
+- added resource `/{projectKey}/channels/key={key}`
+</details>
+
+
+<details>
+<summary>Added Method(s)</summary>
+
+- added method `apiRoot.withProjectKey().channels().withKey().get()`
+- added method `apiRoot.withProjectKey().channels().withKey().head()`
+- added method `apiRoot.withProjectKey().channels().withKey().post()`
+- added method `apiRoot.withProjectKey().channels().withKey().delete()`
+</details>
+
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `CartDiscountPatternTarget`
+- added type `CountOnCustomLineItemUnits`
+- added type `CountOnLineItemUnits`
+- added type `PatternComponent`
+- added type `ShoppingListLineItemAddedMessage`
+- added type `ShoppingListLineItemRemovedMessage`
+- added type `ShoppingListMessage`
+- added type `ShoppingListLineItemAddedMessagePayload`
+- added type `ShoppingListLineItemRemovedMessagePayload`
+- added type `ShoppingListMessagePayload`
+</details>
+
+
+<details>
+<summary>Added Enum(s)</summary>
+
+- added enum `Canceled` to type `ShipmentState`
+- added enum `shopping-list` to type `MessageSubscriptionResourceTypeId`
+</details>
+
+
+<details>
+<summary>Added Property(s)</summary>
+
+- added property `applicationMode` to type `CartDiscountValueFixed`
+- added property `applicationMode` to type `CartDiscountValueFixedDraft`
+- added property `custom` to type `CartSetCustomShippingMethodAction`
+- added property `custom` to type `StagedOrderSetCustomShippingMethodAction`
+- added property `custom` to type `StagedOrderSetShippingAddressAndCustomShippingMethodAction`
+</details>
+
+**History changes**
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `ChangeTargetPatternChangeValue`
+- added type `PatternComponent`
+</details>
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.20.0...17.21.0
+
+# 17.20.0 (2024-12-02)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/763
+* Add option to provide custom auth and api url for spring example project by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/764
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/766
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.19.0...17.20.0
+
+# 17.19.0 (2024-11-21)
+
+## Important notice
+
+Due to a regression with regards to deserialization in Jackson 2.18.x we introduced the usage of `JsonAnySetter` at some constructors e.g. to `LocalizedString`. The usage of `JsonAnySetter` annotation is made available with Jackson 2.17.x. Any version prior to Jackson 2.17 is not compatible with the SDK.
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/761
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/762
+* [SUPPORT-29621] fix regression with jackson 2.18.x by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/760
+
+**Api changes**
+
+<details>
+<summary>Changed Property(s)</summary>
+
+- :warning: changed property `totalPrice` of type `StagedOrder` from type `TypedMoney` to `CentPrecisionMoney`
+- :warning: changed property `totalPrice` of type `Order` from type `TypedMoney` to `CentPrecisionMoney`
+</details>
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.18.0...17.19.0
+
+# 17.18.0 (2024-11-20)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/750
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/751
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/752
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/753
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/754
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/756
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/759
+* SUPPORT-28804 add custom deserializer for attrs in import api by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/748
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.17.0...17.18.0
+
 # 17.17.0 (2024-11-07)
 
 ## What's Changed

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

diff --git a/build.gradle b/build.gradle
@@ -116,6 +116,11 @@ subprojects { project ->
             languageVersion = JavaLanguageVersion.of(17)
         }
     }
+    compileIntegrationTestJava {
+        javaCompiler = javaToolchains.compilerFor {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
     compileTestJava {
         javaCompiler = javaToolchains.compilerFor {
             languageVersion = JavaLanguageVersion.of(17)
@@ -366,6 +371,7 @@ tasks.register("writeVersionToExamples") {
                 include(name: 'examples/spring-otel/build.gradle')
                 include(name: 'examples/spring-datadog/build.gradle')
                 include(name: 'examples/spring-datadog-statsd/build.gradle')
+                include(name: 'examples/spring-dynatrace-oneagent/build.gradle')
             }
         }
         ant.replaceregexp(match: '<commercetools.version>.+</commercetools.version>', replace: "<commercetools.version>${globalVersion}</commercetools.version>", flags:'g', byline:true) {

diff --git a/changes.md b/changes.md
@@ -3,15 +3,45 @@
 <details>
 <summary>Changed Property(s)</summary>
 
-- :warning: changed property `line` of type `GraphQLErrorLocation` from type `integer` to `number`
-- :warning: changed property `column` of type `GraphQLErrorLocation` from type `integer` to `number`
+- :warning: changed property `exact` of type `SearchExactExpression` from type `SearchAnyValue` to `SearchExactValue`
 </details>
 
 
 <details>
-<summary>Added QueryParameter(s)</summary>
+<summary>Added Property(s)</summary>
 
-- added query parameter `where` to method `get /{projectKey}/product-selections/key={key}/products`
-- added query parameter `where` to method `get /{projectKey}/product-selections/{ID}/products`
+- added property `businessUnits` to type `SearchIndexingConfiguration`
+</details>
+
+
+<details>
+<summary>Added Resource(s)</summary>
+
+- added resource `/{projectKey}/business-units/search`
+- added resource `/{projectKey}/business-units/search/indexing-status`
+</details>
+
+
+<details>
+<summary>Added Method(s)</summary>
+
+- added method `apiRoot.withProjectKey().businessUnits().search().post()`
+- added method `apiRoot.withProjectKey().businessUnits().search().head()`
+- added method `apiRoot.withProjectKey().businessUnits().searchIndexingStatus().get()`
+</details>
+
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `BusinessUnitIndexingProgress`
+- added type `BusinessUnitIndexingStatus`
+- added type `BusinessUnitPagedSearchResponse`
+- added type `BusinessUnitSearchIndexingStatusResponse`
+- added type `BusinessUnitSearchRequest`
+- added type `BusinessUnitSearchResult`
+- added type `BusinessUnitSearchStatus`
+- added type `ProjectChangeBusinessUnitSearchStatusAction`
+- added type `SearchExactValue`
 </details>
 
diff --git a/commercetools/commercetools-apachehttp-client/build.gradle b/commercetools/commercetools-apachehttp-client/build.gradle
@@ -1,9 +1,9 @@
 
 dependencies {
     api project(":rmf:rmf-java-base")
-    api "org.apache.httpcomponents.client5:httpclient5:5.3.1" version {
-        strictly "[5.0,6.0["
-        prefer "5.1.3"
+    api "org.apache.httpcomponents.client5:httpclient5:5.4.1" version {
+        strictly "[5.4.1,6.0["
+        prefer "5.4.1"
     }
 
     api commons.io version commons.io_version

diff --git a/...-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java b/...-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java
@@ -0,0 +1,13 @@
+
+package com.commercetools.http.apachehttp;
+
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.core5.util.VersionInfo;
+
+public class ApacheHttpClientSolutionInfo extends io.vrap.rmf.base.client.SolutionInfo {
+    public ApacheHttpClientSolutionInfo() {
+        setName("ApacheHttpAsyncClient");
+        setVersion(
+            VersionInfo.loadVersionInfo("org.apache.hc.client5", HttpClient.class.getClassLoader()).getRelease());
+    }
+}
diff --git a/...apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java b/...apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java
@@ -19,6 +19,7 @@
 import org.apache.hc.client5.http.async.methods.SimpleBody;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleResponseConsumer;
+import org.apache.hc.client5.http.config.TlsConfig;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
@@ -32,7 +33,6 @@
 import org.apache.hc.core5.http.nio.support.AsyncRequestBuilder;
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.reactor.IOReactorStatus;
-import org.apache.hc.core5.reactor.ssl.TlsDetails;
 
 public class CtApacheHttpClient extends HttpClientBase {
     public static final int MAX_REQUESTS = 64;
@@ -46,19 +46,19 @@ public static HttpAsyncClientBuilder createClientBuilder() {
     }
 
     public static HttpAsyncClientBuilder createClientBuilder(AsyncClientConnectionManager cm) {
-        return HttpAsyncClientBuilder.create().setVersionPolicy(HttpVersionPolicy.NEGOTIATE).setConnectionManager(cm);
+        return HttpAsyncClientBuilder.create().setConnectionManager(cm);
     }
 
     public static PoolingAsyncClientConnectionManagerBuilder createConnectionManager(final int maxConnTotal,
             final int maxConnPerRoute) {
-        final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
-                .useSystemProperties()
-                .setTlsDetailsFactory(
-                    sslEngine -> new TlsDetails(sslEngine.getSession(), sslEngine.getApplicationProtocol()))
+        final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create().useSystemProperties().build();
+        final TlsConfig tlsConfig = TlsConfig.copy(TlsConfig.DEFAULT)
+                .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
                 .build();
         return PoolingAsyncClientConnectionManagerBuilder.create()
                 .setMaxConnPerRoute(maxConnPerRoute)
                 .setMaxConnTotal(maxConnTotal)
+                .setDefaultTlsConfig(tlsConfig)
                 .setTlsStrategy(tlsStrategy);
     }
 

diff --git a/...achehttp-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/...achehttp-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo
@@ -0,0 +1 @@
+com.commercetools.http.apachehttp.ApacheHttpClientSolutionInfo
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		com.commercetools.http.apachehttp.ApacheHttpClientSolutionInfo