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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
run: ./gradlew codeCoverageReport

- name: Send code coverage report to Codecov.io
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
with:
token: ${{ secrets.CODECOV_TOKEN }}
docs:
Expand Down Expand Up @@ -191,6 +191,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@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
uses: gradle/actions/dependency-submission@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19

# ℹ️ 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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ allprojects {

configurations {
taglet {
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2025.2")
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2025.3")
}
}

Expand Down
4 changes: 2 additions & 2 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.4" version {
api "org.apache.httpcomponents.client5:httpclient5:5.5" version {
strictly "[5.4.4,5.99999]"
prefer "5.4.4"
prefer "5.5"
}

api commons.io version commons.io_version
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

package com.commercetools.http.apachehttp;

import com.fasterxml.jackson.core.Version;
import com.vdurmont.semver4j.Semver;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -9,6 +11,7 @@ public class SolutionInfoTest {
public void version() {
String version = new ApacheHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).startsWith("5.4.");
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("5.4.1"))).isGreaterThanOrEqualTo(0);
Assertions.assertThat(version).startsWith("5.");
}
}
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.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"
api "io.netty:netty-codec:4.2.2.Final"
api "io.netty:netty-codec-http:4.2.2.Final"
api "io.netty:netty-codec-socks:4.2.2.Final"
api "io.netty:netty-handler-proxy:4.2.2.Final"
api "io.netty:netty-handler:4.2.2.Final"
implementation javax.validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.commercetools.http.asynchttp.AsyncHttpClientSolutionInfo;

import com.vdurmont.semver4j.Semver;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -11,6 +12,7 @@ public class SolutionInfoTest {
public void version() {
String version = new AsyncHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).startsWith("2.12.");
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("2.12.0"))).isGreaterThanOrEqualTo(0);
Assertions.assertThat(version).startsWith("2.");
}
}
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.4"
implementation "com.datadoghq:datadog-api-client:2.34.1"
implementation "com.datadoghq:datadog-api-client:2.35.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 'com.newrelic.agent.java:newrelic-api:8.20.0'
implementation 'com.newrelic.agent.java:newrelic-api:8.21.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.49.0'
implementation 'io.opentelemetry:opentelemetry-api:1.50.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.11.0"
implementation "com.squareup.okio:okio:3.12.0"
api "com.squareup.okhttp3:okhttp:3.14.9" version {
strictly "[3.0,3.99999]"
prefer "3.14.9"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

package com.commercetools.http.okhttp3;

import com.vdurmont.semver4j.Semver;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -9,6 +10,7 @@ public class SolutionInfoTest {
public void version() {
String version = new OkHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).startsWith("3.14.");
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("3.14.0"))).isGreaterThanOrEqualTo(0);
Assertions.assertThat(version).startsWith("3.");
}
}
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,4.99999]'
prefer "4.12.0"
}
implementation "com.squareup.okio:okio:3.11.0"
implementation "com.squareup.okio:okio:3.12.0"

implementation javax.validation
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

package com.commercetools.http.okhttp4;

import com.vdurmont.semver4j.Semver;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -9,6 +10,7 @@ public class SolutionInfoTest {
public void version() {
String version = new OkHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).startsWith("4.12.");
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("4.12.0"))).isGreaterThanOrEqualTo(0);
Assertions.assertThat(version).startsWith("4.");
}
}
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.5"
api "io.projectreactor.netty:reactor-netty-core:1.2.5"
api "io.projectreactor.netty:reactor-netty-http:1.2.6"
api "io.projectreactor.netty:reactor-netty-core:1.2.6"

implementation javax.validation
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

package com.commercetools.http.netty;

import com.vdurmont.semver4j.Semver;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -9,6 +10,7 @@ public class SolutionInfoTest {
public void version() {
String version = new NettyHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).startsWith("1.2.");
Assertions.assertThat(new Semver(version, Semver.SemverType.LOOSE).compareTo(new Semver("1.2.0"))).isGreaterThanOrEqualTo(0);
Assertions.assertThat(version).startsWith("1.");
}
}
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.2.0.Final"
api "io.netty:netty-codec-http:4.2.0.Final"
api "io.netty:netty-codec:4.2.2.Final"
api "io.netty:netty-codec-http:4.2.2.Final"

jmhImplementation project(':commercetools:commercetools-async-http-client')
jmhImplementation project(':commercetools:commercetools-apachehttp-client')
Expand Down
2 changes: 1 addition & 1 deletion common-plugins/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-gradle-plugin'
id 'idea'
id 'org.jetbrains.kotlin.jvm' version "2.1.20"
id 'org.jetbrains.kotlin.jvm' version "2.1.21"
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions gradle-scripts/extensions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ ext {
]

junit = [
junit: 'org.junit.jupiter:junit-jupiter:5.12.2',
junit: 'org.junit.jupiter:junit-jupiter:5.13.0',
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.17.0',
junit: 'org.mockito:mockito-junit-jupiter:5.18.0',
]

failsafe = [
Expand Down
1 change: 1 addition & 0 deletions gradle-scripts/subproject-dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ dependencies {
testImplementation mockito.inline
testImplementation mockito.junit
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'com.vdurmont:semver4j:3.1.0'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
10 changes: 6 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -112,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -203,15 +205,15 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
6 changes: 4 additions & 2 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -68,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

:end
@rem End local scope for the variables with windows NT shell
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": "[email protected].1",
"packageManager": "[email protected].2",
"dependencies": {
"husky": "9.1.7",
"lint-staged": "15.5.1"
"lint-staged": "15.5.2"
},
"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.1"
lint-staged: "npm:15.5.2"
languageName: unknown
linkType: soft

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

"lint-staged@npm:15.5.1":
version: 15.5.1
resolution: "lint-staged@npm:15.5.1"
"lint-staged@npm:15.5.2":
version: 15.5.2
resolution: "lint-staged@npm:15.5.2"
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/86deddb08bf10428f2eb96c02326a9ee403360729225f0b12afb0c0f13c287a75daa01e179d86f64e3432576446d8643d204a47417296f9ef0aa56f1340ff2af
checksum: 10c0/618386254600ada3af3672486a9d082250108245e7c0863d9dfe0a21e7764e3b2eb6416b0f8970e548f4e9d368637331598b27df5a1306925feabbaf16a667e1
languageName: node
linkType: hard

Expand Down