Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
run: ./gradlew spotlessApply

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
id: commit_style_fix
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand All @@ -75,7 +75,7 @@ jobs:
env:
HASH: ${{steps.commit_style_fix.outputs.commit_hash}}

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
id: commit_rev_ignore
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand All @@ -94,7 +94,7 @@ jobs:
if: ${{ failure() }}
run: cat licenses/dependencies-without-allowed-license.json

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
id: commit_license_change
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
run: ./gradlew codeCoverageReport

- name: Send code coverage report to Codecov.io
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
with:
token: ${{ secrets.CODECOV_TOKEN }}
docs:
Expand Down Expand Up @@ -190,6 +190,6 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Generate and submit dependency graph
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: gradle/actions/dependency-submission@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
uses: gradle/actions/dependency-submission@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
with:
github-token: ${{ steps.generate_github_token.outputs.token }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

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

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
with:
repository: doc
commit_message: "Update javadoc"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
run: rm -rf reference.txt
continue-on-error: true

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
with:
branch: after-release
commit_message: "TASK: Updating version in README"
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:

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

- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
with:
repository: doc
commit_message: "Update javadoc"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ allprojects {

dependencies {
taglet 'com.commercetools.build.taglets:commercetools-taglets:3.6.3'
taglet 'com.google.guava:guava:33.4.5-jre'
taglet 'com.google.guava:guava:33.4.8-jre'
taglet 'org.jdrupes.taglets:plantuml-taglet:3.1.0'
}
}
Expand Down
6 changes: 3 additions & 3 deletions commercetools/commercetools-apachehttp-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

dependencies {
api project(":rmf:rmf-java-base")
api "org.apache.httpcomponents.client5:httpclient5:5.4.2" version {
strictly "[5.4.1,6.0["
prefer "5.4.2"
api "org.apache.httpcomponents.client5:httpclient5:5.4.4" version {
strictly "[5.4.4,6.0["
prefer "5.4.4"
}

api commons.io version commons.io_version
Expand Down
10 changes: 5 additions & 5 deletions commercetools/commercetools-async-http-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ dependencies {
api project(":rmf:rmf-java-base")
api "org.asynchttpclient:async-http-client:2.12.4"
api commons.io version commons.io_version
api "io.netty:netty-codec:4.1.119.Final"
api "io.netty:netty-codec-http:4.1.119.Final"
api "io.netty:netty-codec-socks:4.1.119.Final"
api "io.netty:netty-handler-proxy:4.1.119.Final"
api "io.netty:netty-handler:4.1.119.Final"
api "io.netty:netty-codec:4.2.0.Final"
api "io.netty:netty-codec-http:4.2.0.Final"
api "io.netty:netty-codec-socks:4.2.0.Final"
api "io.netty:netty-handler-proxy:4.2.0.Final"
api "io.netty:netty-handler:4.2.0.Final"
implementation javax.validation
}
2 changes: 1 addition & 1 deletion commercetools/commercetools-money/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api "javax.money:money-api:1.1"
api('org.javamoney.moneta:moneta-core:1.4.4') {
api('org.javamoney.moneta:moneta-core:1.4.5') {
exclude group: "com.squareup.okhttp3", module: "okhttp"
}
}
4 changes: 2 additions & 2 deletions commercetools/commercetools-monitoring-datadog/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
api project(":rmf:rmf-java-base")
implementation "com.datadoghq:java-dogstatsd-client:4.4.3"
implementation "com.datadoghq:datadog-api-client:2.33.1"
implementation "com.datadoghq:java-dogstatsd-client:4.4.4"
implementation "com.datadoghq:datadog-api-client:2.34.1"

testImplementation project(":commercetools:commercetools-sdk-java-api")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
api project(":rmf:rmf-java-base")
implementation 'com.newrelic.agent.java:newrelic-api:8.19.0'
implementation 'com.newrelic.agent.java:newrelic-api:8.20.0'

testImplementation project(":commercetools:commercetools-sdk-java-api")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
api project(":rmf:rmf-java-base")
implementation 'io.opentelemetry:opentelemetry-api:1.48.0'
implementation 'io.opentelemetry:opentelemetry-api:1.49.0'

testImplementation project(":commercetools:commercetools-sdk-java-api")
}
Expand Down
2 changes: 1 addition & 1 deletion commercetools/commercetools-okhttp-client3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jmh {
dependencies {
api project(":rmf:rmf-java-base")

implementation "com.squareup.okio:okio:3.10.2"
implementation "com.squareup.okio:okio:3.11.0"
api "com.squareup.okhttp3:okhttp:3.14.9" version {
strictly "[3.0,4.0["
prefer "3.14.9"
Expand Down
2 changes: 1 addition & 1 deletion commercetools/commercetools-okhttp-client4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
strictly '[4.0,5.0['
prefer "4.12.0"
}
implementation "com.squareup.okio:okio:3.10.2"
implementation "com.squareup.okio:okio:3.11.0"

implementation javax.validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
dependencies {
api project(":rmf:rmf-java-base")

api "io.projectreactor.netty:reactor-netty-http:1.2.4"
api "io.projectreactor.netty:reactor-netty-core:1.2.4"
api "io.projectreactor.netty:reactor-netty-http:1.2.5"
api "io.projectreactor.netty:reactor-netty-core:1.2.5"

implementation javax.validation
}
4 changes: 2 additions & 2 deletions commercetools/commercetools-sdk-compat-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies {
api project(':commercetools:commercetools-sdk-java-api')
api ctsdkv1.client version ctsdkv1.version
api ctsdkv1.models version ctsdkv1.version
api "io.netty:netty-codec:4.1.119.Final"
api "io.netty:netty-codec-http:4.1.119.Final"
api "io.netty:netty-codec:4.2.0.Final"
api "io.netty:netty-codec-http:4.2.0.Final"

jmhImplementation project(':commercetools:commercetools-async-http-client')
jmhImplementation project(':commercetools:commercetools-apachehttp-client')
Expand Down
4 changes: 2 additions & 2 deletions common-plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ gradlePlugin {

dependencies {
implementation project(path: ':javaparser', configuration: 'shadow')
implementation "com.google.code.gson:gson:2.12.1"
implementation "com.google.code.gson:gson:2.13.1"
implementation 'com.squareup:javapoet:1.13.0'
implementation 'com.google.guava:guava:33.4.5-jre'
implementation 'com.google.guava:guava:33.4.8-jre'
}
2 changes: 1 addition & 1 deletion common-plugins/javaparser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ shadowJar {
}

dependencies {
implementation 'com.github.javaparser:javaparser-core:3.26.3'
implementation 'com.github.javaparser:javaparser-core:3.26.4'
}
18 changes: 9 additions & 9 deletions gradle-scripts/extensions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ ext {
]

commons = [
text: 'org.apache.commons:commons-text:1.13.0',
text: 'org.apache.commons:commons-text:1.13.1',
lang3: 'org.apache.commons:commons-lang3:3.17.0',
io: 'commons-io:commons-io:2.18.0',
io: 'commons-io:commons-io:2.19.0',
io_version: {
strictly '[2.8.0,)'
prefer '2.16.1'
Expand All @@ -28,15 +28,15 @@ ext {
]

jackson_core = [
annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.18.3',
databind: 'com.fasterxml.jackson.core:jackson-databind:2.18.3',
core: 'com.fasterxml.jackson.core:jackson-core:2.18.3',
datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.3',
annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.19.0',
databind: 'com.fasterxml.jackson.core:jackson-databind:2.19.0',
core: 'com.fasterxml.jackson.core:jackson-core:2.19.0',
datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0',
]

google = [
findbugs: 'com.google.code.findbugs:jsr305:3.0.2',
gson: 'com.google.code.gson:gson:2.12.1',
gson: 'com.google.code.gson:gson:2.13.1',
]

graphql = [
Expand All @@ -51,15 +51,15 @@ ext {
]

junit = [
junit: 'org.junit.jupiter:junit-jupiter:5.11.4',
junit: 'org.junit.jupiter:junit-jupiter:5.12.2',
dataprovider: 'com.tngtech.junit.dataprovider:junit-jupiter-dataprovider:2.10',
jsonassert: 'org.skyscreamer:jsonassert:1.5.3',
assertj: 'org.assertj:assertj-core:3.27.3'
]

mockito = [
inline: 'org.mockito:mockito-inline:5.2.0',
junit: 'org.mockito:mockito-junit-jupiter:5.16.1',
junit: 'org.mockito:mockito-junit-jupiter:5.17.0',
]

failsafe = [
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"node": ">=14.15",
"npm": ">=5"
},
"packageManager": "yarn@4.7.0",
"packageManager": "yarn@4.9.1",
"dependencies": {
"husky": "9.1.7",
"lint-staged": "15.5.0"
"lint-staged": "15.5.1"
},
"scripts": {
"postinstall": "husky install",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ __metadata:
resolution: "commercetools-sdk-java-v2@workspace:."
dependencies:
husky: "npm:9.1.7"
lint-staged: "npm:15.5.0"
lint-staged: "npm:15.5.1"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -230,9 +230,9 @@ __metadata:
languageName: node
linkType: hard

"lint-staged@npm:15.5.0":
version: 15.5.0
resolution: "lint-staged@npm:15.5.0"
"lint-staged@npm:15.5.1":
version: 15.5.1
resolution: "lint-staged@npm:15.5.1"
dependencies:
chalk: "npm:^5.4.1"
commander: "npm:^13.1.0"
Expand All @@ -246,7 +246,7 @@ __metadata:
yaml: "npm:^2.7.0"
bin:
lint-staged: bin/lint-staged.js
checksum: 10c0/393b24d85d705a36e6556dc9d9b710594163be60f7789a2ca71bbf8f31debc10f7fde9cd0e868466ac2b7c154661983602decd7abbb6c685b21007bc70dbbdd6
checksum: 10c0/86deddb08bf10428f2eb96c02326a9ee403360729225f0b12afb0c0f13c287a75daa01e179d86f64e3432576446d8643d204a47417296f9ef0aa56f1340ff2af
languageName: node
linkType: hard

Expand Down
Loading