From e749e1c7fa7c38a6e1d5de18efe94b45b972cc49e7d144e8d82e8f14d6b0c541 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 9 Mar 2024 21:05:07 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=34 --- aws-sdk-java-jackson-databind.patch | 31 +++++++++++++++++++++++++++++ aws-sdk-java.spec | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 aws-sdk-java-jackson-databind.patch diff --git a/aws-sdk-java-jackson-databind.patch b/aws-sdk-java-jackson-databind.patch new file mode 100644 index 0000000..06d5a66 --- /dev/null +++ b/aws-sdk-java-jackson-databind.patch @@ -0,0 +1,31 @@ +--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f.orig/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java 2024-03-09 21:54:01.485016575 +0100 ++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java 2024-03-09 21:58:25.501906164 +0100 +@@ -20,7 +20,7 @@ + import com.fasterxml.jackson.databind.DeserializationFeature; + import com.fasterxml.jackson.databind.JsonNode; + import com.fasterxml.jackson.databind.ObjectMapper; +-import com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy; ++import com.fasterxml.jackson.databind.PropertyNamingStrategy.UpperCamelCaseStrategy; + + /** + * Unmarshaller for JSON error responses from AWS services. +@@ -34,7 +34,7 @@ + + private static final ObjectMapper MAPPER = new ObjectMapper().configure( + DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setPropertyNamingStrategy( +- new PascalCaseStrategy()); ++ new UpperCamelCaseStrategy()); + + private final String handledErrorCode; + +--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f.orig/aws-java-sdk-core/src/main/java/com/amazonaws/util/EC2MetadataUtils.java 2024-03-09 21:54:01.485016575 +0100 ++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-core/src/main/java/com/amazonaws/util/EC2MetadataUtils.java 2024-03-09 21:54:49.988390864 +0100 +@@ -69,7 +69,7 @@ + DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + + mapper +- .setPropertyNamingStrategy(PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE); ++ .setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE); + } + + private static final Log log = LogFactory.getLog(EC2MetadataUtils.class); diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index e475ef0..a3dfe45 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -1,7 +1,7 @@ # # spec file for package aws-sdk-java # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Group: Development/Libraries/Java URL: https://aws.amazon.com/sdk-for-java/ Source0: https://github.com/aws/aws-sdk-java/archive/%{githash}/%{name}-%{githash}.tar.gz Patch0: aws-sdk-java-ambiguous-Record.patch +Patch1: aws-sdk-java-jackson-databind.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: java-devel >= 1.8 From 5ae1c2c18a0cd6d0e77ffbb9b33b567745b6a154f11783175f83b202a56f384b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 10 Mar 2024 22:17:23 +0000 Subject: [PATCH 2/2] Fix build with jackson-databind 2.16.x OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=35 --- aws-sdk-java.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/aws-sdk-java.changes b/aws-sdk-java.changes index 1c9b624..662765f 100644 --- a/aws-sdk-java.changes +++ b/aws-sdk-java.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Mar 10 22:16:18 UTC 2024 - Fridrich Strba + +- Added patch: + * aws-sdk-java-jackson-databind.patch + + do not use previously deprecated classes that were removed + in jackson-databind 2.16.x + ------------------------------------------------------------------- Tue Feb 20 11:16:47 UTC 2024 - Dominique Leuenberger