SHA256
1
0
forked from pool/aws-sdk-java

Accepting request 1156790 from Java:packages

Fix build with jackson-databind 2.16.x

OBS-URL: https://build.opensuse.org/request/show/1156790
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aws-sdk-java?expand=0&rev=11
This commit is contained in:
Ana Guerrero 2024-03-11 14:34:15 +00:00 committed by Git OBS Bridge
commit 4390dcad20
3 changed files with 41 additions and 1 deletions

View File

@ -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);

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Mar 10 22:16:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <dimstar@opensuse.org> Tue Feb 20 11:16:47 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package aws-sdk-java # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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/ URL: https://aws.amazon.com/sdk-for-java/
Source0: https://github.com/aws/aws-sdk-java/archive/%{githash}/%{name}-%{githash}.tar.gz Source0: https://github.com/aws/aws-sdk-java/archive/%{githash}/%{name}-%{githash}.tar.gz
Patch0: aws-sdk-java-ambiguous-Record.patch Patch0: aws-sdk-java-ambiguous-Record.patch
Patch1: aws-sdk-java-jackson-databind.patch
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8