Skip to content

Commit 14b7d2b

Browse files
authored
Merge branch 'main' into update_to_java_11
2 parents 8c3539b + 919440a commit 14b7d2b

File tree

208 files changed

+10501
-1187
lines changed

Some content is hidden

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

208 files changed

+10501
-1187
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4
2020

2121
- name: Setup Java
22-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
22+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
2323
with:
2424
distribution: 'temurin'
2525
java-version: '17'

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# Get GitHub token via the CT SDKs App
2525
- name: Generate GitHub token (via CT SDKs App)
2626
id: generate_github_token
27-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
27+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
2828
with:
2929
app-id: ${{ secrets.CT_SDKS_APP_ID }}
3030
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -47,7 +47,7 @@ jobs:
4747
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4
4848

4949
- name: Setup Java
50-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
50+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
5151
with:
5252
distribution: 'temurin'
5353
java-version: '17'
@@ -140,7 +140,7 @@ jobs:
140140
run: ./gradlew codeCoverageReport
141141

142142
- name: Send code coverage report to Codecov.io
143-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
143+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
144144
with:
145145
token: ${{ secrets.CODECOV_TOKEN }}
146146
docs:
@@ -152,7 +152,7 @@ jobs:
152152
# Get GitHub token via the CT SDKs App
153153
- name: Generate GitHub token (via CT SDKs App)
154154
id: generate_github_token
155-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
155+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
156156
with:
157157
app-id: ${{ secrets.CT_SDKS_APP_ID }}
158158
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -165,7 +165,7 @@ jobs:
165165
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4
166166

167167
- name: Setup Java
168-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
168+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
169169
with:
170170
distribution: 'temurin'
171171
java-version: '17'
@@ -182,7 +182,7 @@ jobs:
182182
# Get GitHub token via the CT SDKs App
183183
- name: Generate GitHub token (via CT SDKs App)
184184
id: generate_github_token
185-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
185+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
186186
with:
187187
app-id: ${{ secrets.CT_SDKS_APP_ID }}
188188
private-key: ${{ secrets.CT_SDKS_APP_PEM }}

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
57+
uses: github/codeql-action/init@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
5858
with:
5959
languages: ${{ matrix.language }}
6060
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
6868
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6969
# If this step fails, then you should remove it and run the build manually (see below)
7070
- name: Autobuild
71-
uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
71+
uses: github/codeql-action/autobuild@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
7272

7373
# ℹ️ Command-line programs to run using the OS shell.
7474
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -81,6 +81,6 @@ jobs:
8181
# ./location_of_script_within_repo/buildscript.sh
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
84+
uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
8585
with:
8686
category: "/language:${{matrix.language}}"

.github/workflows/create-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Get GitHub token via the CT SDKs App
1919
- name: Generate GitHub token (via CT SDKs App)
2020
id: generate_github_token
21-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
21+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
2222
with:
2323
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2424
private-key: ${{ secrets.CT_SDKS_APP_PEM }}

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Get GitHub token via the CT SDKs App
2323
- name: Generate GitHub token (via CT SDKs App)
2424
id: generate_github_token
25-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
25+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
2626
with:
2727
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2828
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -49,7 +49,7 @@ jobs:
4949
token: ${{ steps.generate_github_token.outputs.token }}
5050

5151
- name: Setup Java
52-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
52+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
5353
with:
5454
distribution: 'temurin'
5555
java-version: '17'

.github/workflows/release-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Get GitHub token via the CT SDKs App
1717
- name: Generate GitHub token (via CT SDKs App)
1818
id: generate_github_token
19-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
19+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
2020
with:
2121
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2222
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -29,7 +29,7 @@ jobs:
2929
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4
3030

3131
- name: Setup Java
32-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
32+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
3333
with:
3434
distribution: 'temurin'
3535
java-version: '17'

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4
2323

2424
- name: Setup Java
25-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
25+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
2626
with:
2727
distribution: 'temurin'
2828
java-version: '17'
@@ -56,7 +56,7 @@ jobs:
5656
# Get GitHub token via the CT SDKs App
5757
- name: Generate GitHub token (via CT SDKs App)
5858
id: generate_github_token
59-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
59+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
6060
with:
6161
app-id: ${{ secrets.CT_SDKS_APP_ID }}
6262
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -118,7 +118,7 @@ jobs:
118118
# Get GitHub token via the CT SDKs App
119119
- name: Generate GitHub token (via CT SDKs App)
120120
id: generate_github_token
121-
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1
121+
uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1
122122
with:
123123
app-id: ${{ secrets.CT_SDKS_APP_ID }}
124124
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -145,7 +145,7 @@ jobs:
145145
token: ${{ steps.generate_github_token.outputs.token }}
146146

147147
- name: Setup Java
148-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
148+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
149149
with:
150150
distribution: 'temurin'
151151
java-version: '17'

.github/workflows/scorecard.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/semgrep.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Name of this GitHub Actions workflow.
2+
name: Semgrep Scan for CodeQL
3+
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
- cron: '0 5 * * 1'
8+
9+
permissions:
10+
# required for all workflows
11+
security-events: write
12+
# only required for workflows in private repositories
13+
actions: read
14+
contents: read
15+
16+
jobs:
17+
semgrep:
18+
# User definable name of this GitHub Actions job.
19+
name: semgrep
20+
# If you are self-hosting, change the following `runs-on` value:
21+
runs-on: ubuntu-latest
22+
23+
container:
24+
# A Docker image with Semgrep installed. Do not change this.
25+
image: returntocorp/semgrep
26+
27+
# Skip any PR created by dependabot to avoid permission issues:
28+
if: (github.actor != 'dependabot[bot]')
29+
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
33+
with:
34+
persist-credentials: false
35+
36+
- name: Run Semgrep
37+
run: semgrep scan --sarif --output=semgrep.sarif --config=p/auto --config=p/dockerfile --config=p/typescript --config=p/javascript --config=p/java --metrics=off --verbose
38+
- name: Upload SARIF file for GitHub Advanced Security Dashboard
39+
uses: github/codeql-action/upload-sarif@65c74964a9ed8c44ed9f19d4bbc5757a6a8e9ab9 # CodeQL Bundle v2.16.1
40+
with:
41+
sarif_file: semgrep.sarif
42+
if: always()

CHANGELOG.md

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

2+
# 17.29.0 (2025-03-19)
3+
4+
## What's Changed
5+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/846
6+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/847
7+
* fix exception with invalid date deserialization by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/849
8+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/850
9+
10+
**Api changes**
11+
12+
<details>
13+
<summary>Added QueryParameter(s)</summary>
14+
15+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/products`
16+
- added query parameter `priceCustomerGroupAssignments` to method `post /{projectKey}/products`
17+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/product-projections`
18+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/products/key={key}`
19+
- added query parameter `priceCustomerGroupAssignments` to method `post /{projectKey}/products/key={key}`
20+
- added query parameter `priceCustomerGroupAssignments` to method `delete /{projectKey}/products/key={key}`
21+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/products/{ID}`
22+
- added query parameter `priceCustomerGroupAssignments` to method `post /{projectKey}/products/{ID}`
23+
- added query parameter `priceCustomerGroupAssignments` to method `delete /{projectKey}/products/{ID}`
24+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/product-projections/search`
25+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/product-projections/key={key}`
26+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/product-projections/{ID}`
27+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/in-store/key={storeKey}/product-projections/key={key}`
28+
- added query parameter `priceCustomerGroupAssignments` to method `get /{projectKey}/in-store/key={storeKey}/product-projections/{ID}`
29+
</details>
30+
31+
32+
<details>
33+
<summary>Added Type(s)</summary>
34+
35+
- added type `CustomerGroupAssignment`
36+
- added type `CustomerGroupAssignmentDraft`
37+
- added type `CustomerAddCustomerGroupAssignmentAction`
38+
- added type `CustomerRemoveCustomerGroupAssignmentAction`
39+
- added type `CustomerSetCustomerGroupAssignmentsAction`
40+
- added type `CustomerGroupAssignmentAddedMessage`
41+
- added type `CustomerGroupAssignmentRemovedMessage`
42+
- added type `CustomerGroupAssignmentsSetMessage`
43+
- added type `CustomerGroupAssignmentAddedMessagePayload`
44+
- added type `CustomerGroupAssignmentRemovedMessagePayload`
45+
- added type `CustomerGroupAssignmentsSetMessagePayload`
46+
</details>
47+
48+
49+
<details>
50+
<summary>Added Property(s)</summary>
51+
52+
- added property `customerGroupAssignments` to type `Customer`
53+
- added property `customerGroupAssignments` to type `CustomerDraft`
54+
- added property `priceCustomerGroupAssignments` to type `ProductSearchProjectionParams`
55+
</details>
56+
57+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.28.0...17.29.0
58+
59+
# 17.28.0 (2025-03-19)
60+
61+
## What's Changed
62+
* Update changelog by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/833
63+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/834
64+
* [DEVX-495] make serviceregion configurable in examples by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/835
65+
* [DEVX-322] QueryAll allows different field than id to be used by @jenschude in https://github.com/commercetools/commercetools-sdk-java-v2/pull/837
66+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/838
67+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/839
68+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/840
69+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/841
70+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/842
71+
* Update generated SDKs by @ct-sdks in https://github.com/commercetools/commercetools-sdk-java-v2/pull/843
72+
* feat: always deserialize to long for jsonutils by @lojzatran in https://github.com/commercetools/commercetools-sdk-java-v2/pull/845
73+
74+
75+
**Full Changelog**: https://github.com/commercetools/commercetools-sdk-java-v2/compare/17.27.0...17.28.0
76+
277
# 17.27.0 (2025-02-19)
378

479
## 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.27.0"
24+
commercetools: "17.29.0"
2525
]
2626
}
2727
@@ -42,7 +42,7 @@ dependencies {
4242

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

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ allprojects {
6666

6767
configurations {
6868
taglet {
69-
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2025.0")
69+
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2025.2")
7070
}
7171
}
7272

7373
dependencies {
7474
taglet 'com.commercetools.build.taglets:commercetools-taglets:3.6.3'
75-
taglet 'com.google.guava:guava:33.4.0-jre'
75+
taglet 'com.google.guava:guava:33.4.5-jre'
7676
taglet 'org.jdrupes.taglets:plantuml-taglet:3.1.0'
7777
}
7878
}

0 commit comments

Comments
 (0)