Merge branch 'main' into renovate/major-okhttp-monorepo

Author: lojzatran

.git-blame-ignore-revs

@@ -4,3 +4,5 @@ a8ec45c8ea4ba559247b654d01b0d35b21a68865
 d0129c1095216d5c830900c8a6223ef5d4274de1
 4bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7
 352051999507bd78542e177d67ce1548a0752691
+bbe9f971763ca1b27687a6a51067a385a0d23b04
+de95c481329aa8b821e6e71ac35c1b8bc67e3e86

.github/workflows/benchmark.yml

@@ -4,7 +4,7 @@ on:
 name: Benchmark
 
 # Declare default permissions as read only.
-permissions: read-all
+permissions: { }
 
 jobs:
     benchmark:

.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

.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
 

.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
 

.yarn/install-state.gz

@@ -1,48 +1,167 @@
 
-# 17.16.0 (2024-10-07)
+# 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 Property(s)</summary>
+<summary>Added Resource(s)</summary>
 
-- added property `warnings` to type `ProductTailoring`
-- added property `attributes` to type `ProductVariantTailoring`
-- added property `attributes` to type `ProductVariantTailoringDraft`
-- added property `attributes` to type `ProductTailoringAddVariantAction`
-- added property `warnings` to type `Product`
-- added property `customers` to type `SearchIndexingConfiguration`
+- added resource `/{projectKey}/channels/key={key}`
 </details>
 
 
 <details>
-<summary>Added Type(s)</summary>
+<summary>Added Method(s)</summary>
 
-- added type `SearchNotReadyError`
-- added type `GraphQLSearchNotReadyError`
-- added type `ProductTailoringAttribute`
-- added type `ProductTailoringSetAttributeAction`
-- added type `ProductTailoringSetAttributeInAllVariantsAction`
-- added type `ImageProcessingOngoingWarning`
-- added type `WarningObject`
+- 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>Removed Type(s)</summary>
+<summary>Added Type(s)</summary>
 
-- :warning: removed type `ProductSearchStatus`
+- 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 `customer-group` to type `ExtensionResourceTypeId`
-- added enum `product-tailoring` to type `MessageSubscriptionResourceTypeId`
-- added enum `product-tailoring` to type `ResourceTypeId`
+- 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
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/739
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/740
+* optimize OkHttp3 client by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/741
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/743
+* fix exportSignatures plugin by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/745
+* Fix deserialization if subtype discriminator is missing by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/746
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/747
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/749
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.16.0...17.17.0
+
+# 17.16.0 (2024-10-07)
+
+## What's Changed
+* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/728
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/729
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/730
+* update service regions by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/731
+* Create config.yml by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/732
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/733
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/735
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/736
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/737
+* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/738
+
+
+**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.15.1...17.16.0
 
 # 17.15.1 (2024-09-17)
 

CHANGELOG.md

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

README.md

@@ -19,6 +19,9 @@ plugins {
 
     id "me.champeau.jmh" version "0.6.8"
     id "jacoco"
+
+    id "versioning"
+    id "srcinfo"
 }
 
 import java.text.SimpleDateFormat
@@ -87,6 +90,10 @@ subprojects { project ->
     apply from: "$rootDir/gradle-scripts/subproject-dependencies.gradle"
     apply from: "$rootDir/gradle-scripts/subproject-config.gradle"
 
+    if (project.file("build.gradle").exists()) {
+        apply from: "$rootDir/gradle-scripts/subproject-srcinfo-plugin.gradle"
+    }
+
     group='com.commercetools.sdk'
 
     version = globalVersion
@@ -109,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)
@@ -359,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) {