From cf6040db87d631d3fd8364486726ce5e1322001b Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Wed, 20 Nov 2024 09:08:26 +0100 Subject: [PATCH 1/5] fix regression with jackson 2.18.x bump jackson to 2.18.1 --- build.gradle | 5 +++++ .../api/models/common/LocalizedStringImpl.java | 3 +-- .../java/com/commercetools/LocalizedStringTest.java | 10 ++++++++++ .../src/test/resources/product-data.json | 5 +++++ gradle-scripts/extensions.gradle | 8 ++++---- 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json diff --git a/build.gradle b/build.gradle index e487fbb034c..a861c17934c 100644 --- a/build.gradle +++ b/build.gradle @@ -116,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) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java index a70872a232d..b5ce79d8685 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java @@ -5,7 +5,6 @@ import java.util.*; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; @@ -23,7 +22,7 @@ public class LocalizedStringImpl implements LocalizedString, ModelBase { private Map values; @JsonCreator - LocalizedStringImpl(@JsonProperty("values") final Map values) { + LocalizedStringImpl(final Map values) { this.values = values; } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java index b422c923ac9..45ed908d604 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/LocalizedStringTest.java @@ -1,6 +1,7 @@ package com.commercetools; +import static com.commercetools.TestUtils.stringFromResource; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -12,6 +13,7 @@ import com.commercetools.api.models.common.LocalizedString; import com.commercetools.api.models.common.LocalizedStringEntry; +import com.commercetools.api.models.product.ProductData; import io.vrap.rmf.base.client.utils.json.JsonUtils; @@ -370,4 +372,12 @@ public void ofStringToStringMap() { .plus(Locale.ITALIAN, "Giacche"); assertThat(actual).isEqualTo(expected); } + + public static final String DEFAULT_LOCALE = "en-US"; + + @Test + public void getLocale() { + ProductData p = JsonUtils.fromJsonString(stringFromResource("product-data.json"), ProductData.class); + assertThat(p.getName().get(DEFAULT_LOCALE)).isEqualTo("Hoodie"); + } } diff --git a/commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json b/commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json new file mode 100644 index 00000000000..239bc3f68eb --- /dev/null +++ b/commercetools/commercetools-sdk-java-api/src/test/resources/product-data.json @@ -0,0 +1,5 @@ +{ + "name": { + "en-US": "Hoodie" + } +} diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle index de9c4f45c3a..02225ef97ab 100644 --- a/gradle-scripts/extensions.gradle +++ b/gradle-scripts/extensions.gradle @@ -31,10 +31,10 @@ ext { ] jackson_core = [ - annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.17.1', - databind: 'com.fasterxml.jackson.core:jackson-databind:2.17.1', - core: 'com.fasterxml.jackson.core:jackson-core:2.17.1', - datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1', + annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.18.1', + databind: 'com.fasterxml.jackson.core:jackson-databind:2.18.1', + core: 'com.fasterxml.jackson.core:jackson-core:2.18.1', + datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1', ] google = [ From 36fb92421b3c57691d6f6f5809ea6c9757a0be16 Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:13:18 +0000 Subject: [PATCH 2/5] TASK: Updating license information --- .../commercetools-apachehttp-client/index.json | 8 ++++---- .../commercetools-async-http-client/index.json | 8 ++++---- licenses/commercetools-graphql-api/index.json | 8 ++++---- licenses/commercetools-http-client/index.json | 8 ++++---- licenses/commercetools-javanet-client/index.json | 8 ++++---- .../commercetools-monitoring-datadog/index.json | 10 +++++----- .../commercetools-monitoring-newrelic/index.json | 8 ++++---- .../index.json | 8 ++++---- licenses/commercetools-okhttp-client3/index.json | 8 ++++---- licenses/commercetools-okhttp-client4/index.json | 8 ++++---- .../commercetools-reactornetty-client/index.json | 8 ++++---- licenses/commercetools-sdk-compat-v1/index.json | 12 ++++++------ licenses/commercetools-sdk-java-api/index.json | 8 ++++---- licenses/commercetools-sdk-java-history/index.json | 8 ++++---- .../commercetools-sdk-java-importapi/index.json | 8 ++++---- licenses/index.json | 14 +++++++------- licenses/rmf-java-base/index.json | 8 ++++---- 17 files changed, 74 insertions(+), 74 deletions(-) diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json index 723f7bd8bbe..3971f070a14 100644 --- a/licenses/commercetools-apachehttp-client/index.json +++ b/licenses/commercetools-apachehttp-client/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json index c253c43c56c..febce7d26d1 100644 --- a/licenses/commercetools-async-http-client/index.json +++ b/licenses/commercetools-async-http-client/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-graphql-api/index.json b/licenses/commercetools-graphql-api/index.json index 656e2bef85c..bd198266da9 100644 --- a/licenses/commercetools-graphql-api/index.json +++ b/licenses/commercetools-graphql-api/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json index c253c43c56c..febce7d26d1 100644 --- a/licenses/commercetools-http-client/index.json +++ b/licenses/commercetools-http-client/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json index b46d6d12829..89cda78b1db 100644 --- a/licenses/commercetools-javanet-client/index.json +++ b/licenses/commercetools-javanet-client/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-monitoring-datadog/index.json b/licenses/commercetools-monitoring-datadog/index.json index 2d25ade83f6..61a486ff5c9 100644 --- a/licenses/commercetools-monitoring-datadog/index.json +++ b/licenses/commercetools-monitoring-datadog/index.json @@ -32,7 +32,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -45,7 +45,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -58,7 +58,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -71,7 +71,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], @@ -84,7 +84,7 @@ }, { "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-base" ], diff --git a/licenses/commercetools-monitoring-newrelic/index.json b/licenses/commercetools-monitoring-newrelic/index.json index fb68ded6421..bd5f8f5b802 100644 --- a/licenses/commercetools-monitoring-newrelic/index.json +++ b/licenses/commercetools-monitoring-newrelic/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-monitoring-opentelemetry/index.json b/licenses/commercetools-monitoring-opentelemetry/index.json index 73f96500bd0..0dd3a040666 100644 --- a/licenses/commercetools-monitoring-opentelemetry/index.json +++ b/licenses/commercetools-monitoring-opentelemetry/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-okhttp-client3/index.json b/licenses/commercetools-okhttp-client3/index.json index c89fb21ba38..c4d8e33ad16 100644 --- a/licenses/commercetools-okhttp-client3/index.json +++ b/licenses/commercetools-okhttp-client3/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-okhttp-client4/index.json b/licenses/commercetools-okhttp-client4/index.json index e4b1b318124..c0beafa8ae7 100644 --- a/licenses/commercetools-okhttp-client4/index.json +++ b/licenses/commercetools-okhttp-client4/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-reactornetty-client/index.json b/licenses/commercetools-reactornetty-client/index.json index 4b25074f500..2ef38980741 100644 --- a/licenses/commercetools-reactornetty-client/index.json +++ b/licenses/commercetools-reactornetty-client/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-sdk-compat-v1/index.json b/licenses/commercetools-sdk-compat-v1/index.json index bbae45a7130..3d29b075ec7 100644 --- a/licenses/commercetools-sdk-compat-v1/index.json +++ b/licenses/commercetools-sdk-compat-v1/index.json @@ -72,7 +72,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -85,7 +85,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -98,7 +98,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -111,7 +111,7 @@ }, { "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-dataformats-binary" ], @@ -124,7 +124,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], @@ -137,7 +137,7 @@ }, { "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names" ], diff --git a/licenses/commercetools-sdk-java-api/index.json b/licenses/commercetools-sdk-java-api/index.json index b18e8f1019c..b103e3388b6 100644 --- a/licenses/commercetools-sdk-java-api/index.json +++ b/licenses/commercetools-sdk-java-api/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-sdk-java-history/index.json b/licenses/commercetools-sdk-java-history/index.json index ce6e9de0a0f..88602da7e1c 100644 --- a/licenses/commercetools-sdk-java-history/index.json +++ b/licenses/commercetools-sdk-java-history/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/commercetools-sdk-java-importapi/index.json b/licenses/commercetools-sdk-java-importapi/index.json index ce6e9de0a0f..88602da7e1c 100644 --- a/licenses/commercetools-sdk-java-importapi/index.json +++ b/licenses/commercetools-sdk-java-importapi/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], diff --git a/licenses/index.json b/licenses/index.json index a5ca9be9d12..e11b88ee554 100644 --- a/licenses/index.json +++ b/licenses/index.json @@ -102,7 +102,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -115,7 +115,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -128,7 +128,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -141,7 +141,7 @@ }, { "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-dataformats-binary" ], @@ -154,7 +154,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], @@ -167,7 +167,7 @@ }, { "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-base" ], @@ -180,7 +180,7 @@ }, { "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names" ], diff --git a/licenses/rmf-java-base/index.json b/licenses/rmf-java-base/index.json index dd0ee2eefd5..adf7879371a 100644 --- a/licenses/rmf-java-base/index.json +++ b/licenses/rmf-java-base/index.json @@ -2,7 +2,7 @@ "dependencies": [ { "moduleName": "com.fasterxml.jackson.core:jackson-annotations", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -15,7 +15,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-core", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-core" ], @@ -28,7 +28,7 @@ }, { "moduleName": "com.fasterxml.jackson.core:jackson-databind", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson" ], @@ -41,7 +41,7 @@ }, { "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "moduleVersion": "2.17.1", + "moduleVersion": "2.18.1", "moduleUrls": [ "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310" ], From afba6804d86946d6d1df41b68459c460cc053db6 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Wed, 20 Nov 2024 13:52:34 +0100 Subject: [PATCH 3/5] add JsonAnySetter for pattern properties --- .../com/commercetools/api/models/error/ErrorObjectImpl.java | 3 ++- .../commercetools/api/models/common/LocalizedStringImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java index b72858ad256..6cd96fd9f12 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java @@ -4,6 +4,7 @@ import java.time.*; import java.util.*; +import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.*; @@ -33,7 +34,7 @@ public class ErrorObjectImpl implements ErrorObject, ModelBase { */ @JsonCreator ErrorObjectImpl(@JsonProperty("code") final String code, @JsonProperty("message") final String message, - @JsonProperty("values") final Map values) { + @JsonAnySetter final Map values) { this.code = code; this.message = message; this.values = values; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java index b5ce79d8685..daa986d5b92 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java @@ -4,6 +4,7 @@ import java.time.*; import java.util.*; +import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.databind.annotation.*; @@ -22,7 +23,7 @@ public class LocalizedStringImpl implements LocalizedString, ModelBase { private Map values; @JsonCreator - LocalizedStringImpl(final Map values) { + LocalizedStringImpl(@JsonAnySetter final Map values) { this.values = values; } From 652b33a20b48d93bb3e9e149b756dfe5bc208cef Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Wed, 20 Nov 2024 14:07:22 +0100 Subject: [PATCH 4/5] fix searchtest --- .../commercetools/api/models/product/FacetResultsImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java index 4945fb058eb..d33c33c8187 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java @@ -4,8 +4,8 @@ import java.time.*; import java.util.*; +import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; @@ -28,8 +28,7 @@ public class FacetResultsImpl implements FacetResults, ModelBase { * create instance with all properties */ @JsonCreator - FacetResultsImpl( - @JsonProperty("values") final Map values) { + FacetResultsImpl(@JsonAnySetter final Map values) { this.values = values; } From 3d059d3c0b62996461c86f8164390e1f02479884 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Wed, 20 Nov 2024 15:16:47 +0100 Subject: [PATCH 5/5] fix jackson annotations to be compatible with Jackson 2.17 and 2.18 --- .../com/commercetools/api/models/error/ErrorObjectImpl.java | 2 +- .../commercetools/api/models/product/FacetResultsImpl.java | 4 +++- .../commercetools/api/models/common/LocalizedStringImpl.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java index 6cd96fd9f12..fd2744ae006 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/error/ErrorObjectImpl.java @@ -34,7 +34,7 @@ public class ErrorObjectImpl implements ErrorObject, ModelBase { */ @JsonCreator ErrorObjectImpl(@JsonProperty("code") final String code, @JsonProperty("message") final String message, - @JsonAnySetter final Map values) { + @JsonAnySetter @JsonProperty("values") final Map values) { this.code = code; this.message = message; this.values = values; diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java index d33c33c8187..707c6de73cc 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product/FacetResultsImpl.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; @@ -28,7 +29,8 @@ public class FacetResultsImpl implements FacetResults, ModelBase { * create instance with all properties */ @JsonCreator - FacetResultsImpl(@JsonAnySetter final Map values) { + FacetResultsImpl( + @JsonAnySetter @JsonProperty("values") final Map values) { this.values = values; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java index daa986d5b92..f234ba3b8b2 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringImpl.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.*; import io.vrap.rmf.base.client.ModelBase; @@ -23,7 +24,7 @@ public class LocalizedStringImpl implements LocalizedString, ModelBase { private Map values; @JsonCreator - LocalizedStringImpl(@JsonAnySetter final Map values) { + LocalizedStringImpl(@JsonAnySetter @JsonProperty("values") final Map values) { this.values = values; }