Skip to content

Commit 8a56fd4

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/cross-spawn-7.0.6
2 parents 68aad8e + 6850436 commit 8a56fd4

File tree

571 files changed

+16908
-1875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

571 files changed

+16908
-1875
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ a8ec45c8ea4ba559247b654d01b0d35b21a68865
44
d0129c1095216d5c830900c8a6223ef5d4274de1
55
4bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7
66
352051999507bd78542e177d67ce1548a0752691
7+
bbe9f971763ca1b27687a6a51067a385a0d23b04
8+
de95c481329aa8b821e6e71ac35c1b8bc67e3e86

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
name: Benchmark
55

66
# Declare default permissions as read only.
7-
permissions: read-all
7+
permissions: { }
88

99
jobs:
1010
benchmark:

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
name: CI
1010

1111
# Declare default permissions as read only.
12-
permissions: read-all
12+
permissions: {}
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
@@ -71,7 +71,9 @@ jobs:
7171

7272
- name: "Run if style changes have been detected"
7373
if: steps.commit_style_fix.outputs.changes_detected == 'true'
74-
run: echo "${{steps.commit_style_fix.outputs.commit_hash}}" >> .git-blame-ignore-revs
74+
run: echo "$HASH" >> .git-blame-ignore-revs
75+
env:
76+
HASH: ${{steps.commit_style_fix.outputs.commit_hash}}
7577

7678
- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
7779
id: commit_rev_ignore

.github/workflows/docs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ jobs:
5959
- name: Setup Graphviz
6060
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
6161

62-
- run: ./gradlew -Pversion=${{ github.event.inputs.version }} alljavadoc
62+
- run: ./gradlew -Pversion=$VERSION alljavadoc
6363
working-directory: sdk
64+
env:
65+
VERSION: ${{ github.event.inputs.version }}
6466

6567
- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc
6668

.github/workflows/release.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ jobs:
3636
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
3737
PASSPHRASE: ${{ secrets.PASSPHRASE }}
3838

39-
- run: ./gradlew -Pversion=${{ github.ref_name }} clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
39+
- run: ./gradlew -Pversion=$REF_NAME clean test javadoc publishToSonatype closeAndReleaseSonatypeStagingRepository
4040
env:
41+
REF_NAME: ${{ github.ref_name }}
4142
CTP_OSS_USER: ${{ secrets.OSS_USER }}
4243
CTP_OSS_SECRET: ${{ secrets.OSS_SECRET }}
4344
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -76,7 +77,9 @@ jobs:
7677

7778
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
7879

79-
- run: ./gradlew -Pversion=${{ github.ref_name }} writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
80+
- run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
81+
env:
82+
REF_NAME: ${{ github.ref_name }}
8083

8184
- name: "Switch SDK to after release branch"
8285
run: |
@@ -150,8 +153,11 @@ jobs:
150153
- name: Setup Graphviz
151154
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
152155

153-
- run: ./gradlew -Pversion=${{ github.ref_name }} alljavadoc
156+
- run: ./gradlew -Pversion=$REF_NAME alljavadoc
154157
working-directory: sdk
158+
env:
159+
REF_NAME: ${{ github.ref_name }}
160+
155161

156162
- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc
157163

CHANGELOG.md

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,136 @@
11

2+
# 17.21.0 (2024-12-19)
3+
4+
## What's Changed
5+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/767
6+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/768
7+
* DEVX-496 update spring boot version by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/765
8+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/769
9+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/770
10+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/771
11+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/774
12+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/775
13+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/776
14+
* DEVX-460 make metrics more precise for values below 0 ms by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/772
15+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/777
16+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/778
17+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/779
18+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/780
19+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/781
20+
* Update Apache AsyncHttpClient by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/773
21+
22+
**Api changes**
23+
24+
<details>
25+
<summary>Added Resource(s)</summary>
26+
27+
- added resource `/{projectKey}/channels/key={key}`
28+
</details>
29+
30+
31+
<details>
32+
<summary>Added Method(s)</summary>
33+
34+
- added method `apiRoot.withProjectKey().channels().withKey().get()`
35+
- added method `apiRoot.withProjectKey().channels().withKey().head()`
36+
- added method `apiRoot.withProjectKey().channels().withKey().post()`
37+
- added method `apiRoot.withProjectKey().channels().withKey().delete()`
38+
</details>
39+
40+
41+
<details>
42+
<summary>Added Type(s)</summary>
43+
44+
- added type `CartDiscountPatternTarget`
45+
- added type `CountOnCustomLineItemUnits`
46+
- added type `CountOnLineItemUnits`
47+
- added type `PatternComponent`
48+
- added type `ShoppingListLineItemAddedMessage`
49+
- added type `ShoppingListLineItemRemovedMessage`
50+
- added type `ShoppingListMessage`
51+
- added type `ShoppingListLineItemAddedMessagePayload`
52+
- added type `ShoppingListLineItemRemovedMessagePayload`
53+
- added type `ShoppingListMessagePayload`
54+
</details>
55+
56+
57+
<details>
58+
<summary>Added Enum(s)</summary>
59+
60+
- added enum `Canceled` to type `ShipmentState`
61+
- added enum `shopping-list` to type `MessageSubscriptionResourceTypeId`
62+
</details>
63+
64+
65+
<details>
66+
<summary>Added Property(s)</summary>
67+
68+
- added property `applicationMode` to type `CartDiscountValueFixed`
69+
- added property `applicationMode` to type `CartDiscountValueFixedDraft`
70+
- added property `custom` to type `CartSetCustomShippingMethodAction`
71+
- added property `custom` to type `StagedOrderSetCustomShippingMethodAction`
72+
- added property `custom` to type `StagedOrderSetShippingAddressAndCustomShippingMethodAction`
73+
</details>
74+
75+
**History changes**
76+
77+
<details>
78+
<summary>Added Type(s)</summary>
79+
80+
- added type `ChangeTargetPatternChangeValue`
81+
- added type `PatternComponent`
82+
</details>
83+
84+
85+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.20.0...17.21.0
86+
87+
# 17.20.0 (2024-12-02)
88+
89+
## What's Changed
90+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/763
91+
* 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
92+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/766
93+
94+
95+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.19.0...17.20.0
96+
97+
# 17.19.0 (2024-11-21)
98+
99+
## Important notice
100+
101+
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.
102+
103+
## What's Changed
104+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/761
105+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/762
106+
* [SUPPORT-29621] fix regression with jackson 2.18.x by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/760
107+
108+
**Api changes**
109+
110+
<details>
111+
<summary>Changed Property(s)</summary>
112+
113+
- :warning: changed property `totalPrice` of type `StagedOrder` from type `TypedMoney` to `CentPrecisionMoney`
114+
- :warning: changed property `totalPrice` of type `Order` from type `TypedMoney` to `CentPrecisionMoney`
115+
</details>
116+
117+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.18.0...17.19.0
118+
119+
# 17.18.0 (2024-11-20)
120+
121+
## What's Changed
122+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/750
123+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/751
124+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/752
125+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/753
126+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/754
127+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/756
128+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/759
129+
* SUPPORT-28804 add custom deserializer for attrs in import api by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/748
130+
131+
132+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.17.0...17.18.0
133+
2134
# 17.17.0 (2024-11-07)
3135

4136
## What's Changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The latest stable SDK release can be retrieved from [Maven Central](https://sear
2121
```gradle
2222
ext {
2323
versions = [
24-
commercetools: "17.17.0"
24+
commercetools: "17.21.0"
2525
]
2626
}
2727
@@ -42,7 +42,7 @@ dependencies {
4242

4343
```maven
4444
<properties>
45-
<commercetools.version>17.17.0</commercetools.version>
45+
<commercetools.version>17.21.0</commercetools.version>
4646
</properties>
4747
<dependencies>
4848
<dependency>

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ subprojects { project ->
116116
languageVersion = JavaLanguageVersion.of(17)
117117
}
118118
}
119+
compileIntegrationTestJava {
120+
javaCompiler = javaToolchains.compilerFor {
121+
languageVersion = JavaLanguageVersion.of(17)
122+
}
123+
}
119124
compileTestJava {
120125
javaCompiler = javaToolchains.compilerFor {
121126
languageVersion = JavaLanguageVersion.of(17)
@@ -366,6 +371,7 @@ tasks.register("writeVersionToExamples") {
366371
include(name: 'examples/spring-otel/build.gradle')
367372
include(name: 'examples/spring-datadog/build.gradle')
368373
include(name: 'examples/spring-datadog-statsd/build.gradle')
374+
include(name: 'examples/spring-dynatrace-oneagent/build.gradle')
369375
}
370376
}
371377
ant.replaceregexp(match: '<commercetools.version>.+</commercetools.version>', replace: "<commercetools.version>${globalVersion}</commercetools.version>", flags:'g', byline:true) {

changes.md

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,45 @@
33
<details>
44
<summary>Changed Property(s)</summary>
55

6-
- :warning: changed property `line` of type `GraphQLErrorLocation` from type `integer` to `number`
7-
- :warning: changed property `column` of type `GraphQLErrorLocation` from type `integer` to `number`
6+
- :warning: changed property `exact` of type `SearchExactExpression` from type `SearchAnyValue` to `SearchExactValue`
87
</details>
98

109

1110
<details>
12-
<summary>Added QueryParameter(s)</summary>
11+
<summary>Added Property(s)</summary>
1312

14-
- added query parameter `where` to method `get /{projectKey}/product-selections/key={key}/products`
15-
- added query parameter `where` to method `get /{projectKey}/product-selections/{ID}/products`
13+
- added property `businessUnits` to type `SearchIndexingConfiguration`
14+
</details>
15+
16+
17+
<details>
18+
<summary>Added Resource(s)</summary>
19+
20+
- added resource `/{projectKey}/business-units/search`
21+
- added resource `/{projectKey}/business-units/search/indexing-status`
22+
</details>
23+
24+
25+
<details>
26+
<summary>Added Method(s)</summary>
27+
28+
- added method `apiRoot.withProjectKey().businessUnits().search().post()`
29+
- added method `apiRoot.withProjectKey().businessUnits().search().head()`
30+
- added method `apiRoot.withProjectKey().businessUnits().searchIndexingStatus().get()`
31+
</details>
32+
33+
34+
<details>
35+
<summary>Added Type(s)</summary>
36+
37+
- added type `BusinessUnitIndexingProgress`
38+
- added type `BusinessUnitIndexingStatus`
39+
- added type `BusinessUnitPagedSearchResponse`
40+
- added type `BusinessUnitSearchIndexingStatusResponse`
41+
- added type `BusinessUnitSearchRequest`
42+
- added type `BusinessUnitSearchResult`
43+
- added type `BusinessUnitSearchStatus`
44+
- added type `ProjectChangeBusinessUnitSearchStatusAction`
45+
- added type `SearchExactValue`
1646
</details>
1747

commercetools/commercetools-apachehttp-client/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
dependencies {
33
api project(":rmf:rmf-java-base")
4-
api "org.apache.httpcomponents.client5:httpclient5:5.3.1" version {
5-
strictly "[5.0,6.0["
6-
prefer "5.1.3"
4+
api "org.apache.httpcomponents.client5:httpclient5:5.4.1" version {
5+
strictly "[5.4.1,6.0["
6+
prefer "5.4.1"
77
}
88

99
api commons.io version commons.io_version

0 commit comments

Comments
 (0)