Accepting request 964403 from Java:packages

Build with source and target levels 8

OBS-URL: https://build.opensuse.org/request/show/964403
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aws-sdk-java?expand=0&rev=3

aws-sdk-java-ambiguous-Record.patch

@@ -0,0 +1,130 @@
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/ListRecordsResultJsonUnmarshaller.java	2022-03-21 19:35:10.061186250 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/ListRecordsResultJsonUnmarshaller.java	2022-03-21 19:52:54.219667109 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.cognitosync.model.Record;
+ import com.amazonaws.services.cognitosync.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/RecordJsonMarshaller.java	2022-03-21 19:35:10.061186250 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/RecordJsonMarshaller.java	2022-03-21 19:50:20.562729618 +0100
+@@ -20,6 +20,7 @@
+ import java.util.List;
+ 
+ import com.amazonaws.AmazonClientException;
++import com.amazonaws.services.cognitosync.model.Record;
+ import com.amazonaws.services.cognitosync.model.*;
+ import com.amazonaws.transform.Marshaller;
+ import com.amazonaws.util.BinaryUtils;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:35:10.061186250 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:51:33.159172537 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.cognitosync.model.Record;
+ import com.amazonaws.services.cognitosync.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/UpdateRecordsResultJsonUnmarshaller.java	2022-03-21 19:35:10.061186250 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-cognitosync/src/main/java/com/amazonaws/services/cognitosync/model/transform/UpdateRecordsResultJsonUnmarshaller.java	2022-03-21 19:54:09.372125626 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.cognitosync.model.Record;
+ import com.amazonaws.services.cognitosync.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/GetRecordsResultJsonUnmarshaller.java	2022-03-21 19:35:10.329187881 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/GetRecordsResultJsonUnmarshaller.java	2022-03-21 19:48:59.754236598 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.dynamodbv2.model.Record;
+ import com.amazonaws.services.dynamodbv2.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/RecordJsonMarshaller.java	2022-03-21 19:35:10.329187881 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/RecordJsonMarshaller.java	2022-03-21 19:45:21.080904784 +0100
+@@ -20,6 +20,7 @@
+ import java.util.List;
+ 
+ import com.amazonaws.AmazonClientException;
++import com.amazonaws.services.dynamodbv2.model.Record;
+ import com.amazonaws.services.dynamodbv2.model.*;
+ import com.amazonaws.transform.Marshaller;
+ import com.amazonaws.util.BinaryUtils;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:35:10.329187881 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:36:09.749549498 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.dynamodbv2.model.Record;
+ import com.amazonaws.services.dynamodbv2.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/GetRecordsResultJsonUnmarshaller.java	2022-03-21 19:35:10.049186176 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/GetRecordsResultJsonUnmarshaller.java	2022-03-21 20:27:11.176216227 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.kinesis.model.Record;
+ import com.amazonaws.services.kinesis.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/RecordJsonMarshaller.java	2022-03-21 19:35:10.053186202 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/RecordJsonMarshaller.java	2022-03-21 19:55:44.348705090 +0100
+@@ -20,6 +20,7 @@
+ import java.util.List;
+ 
+ import com.amazonaws.AmazonClientException;
++import com.amazonaws.services.kinesis.model.Record;
+ import com.amazonaws.services.kinesis.model.*;
+ import com.amazonaws.transform.Marshaller;
+ import com.amazonaws.util.BinaryUtils;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:35:10.053186202 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesis/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:58:14.637622016 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.kinesis.model.Record;
+ import com.amazonaws.services.kinesis.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/PutRecordBatchRequestMarshaller.java	2022-03-21 19:35:10.053186202 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/PutRecordBatchRequestMarshaller.java	2022-03-21 20:27:41.132399224 +0100
+@@ -26,6 +26,7 @@
+ import com.amazonaws.Request;
+ import com.amazonaws.DefaultRequest;
+ import com.amazonaws.http.HttpMethodName;
++import com.amazonaws.services.kinesisfirehose.model.Record;
+ import com.amazonaws.services.kinesisfirehose.model.*;
+ import com.amazonaws.transform.Marshaller;
+ import com.amazonaws.util.BinaryUtils;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/RecordJsonMarshaller.java	2022-03-21 19:35:10.053186202 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/RecordJsonMarshaller.java	2022-03-21 20:26:44.896055688 +0100
+@@ -20,6 +20,7 @@
+ import java.util.List;
+ 
+ import com.amazonaws.AmazonClientException;
++import com.amazonaws.services.kinesisfirehose.model.Record;
+ import com.amazonaws.services.kinesisfirehose.model.*;
+ import com.amazonaws.transform.Marshaller;
+ import com.amazonaws.util.BinaryUtils;
+--- aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:35:10.053186202 +0100
++++ aws-sdk-java-9883b981ab5103cc6944fbf8f3b973994777350f/aws-java-sdk-kinesis/src/main/java/com/amazonaws/services/kinesisfirehose/model/transform/RecordJsonUnmarshaller.java	2022-03-21 19:57:15.677262296 +0100
+@@ -21,6 +21,7 @@
+ import java.math.*;
+ import java.nio.ByteBuffer;
+ 
++import com.amazonaws.services.kinesisfirehose.model.Record;
+ import com.amazonaws.services.kinesisfirehose.model.*;
+ import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+ import com.amazonaws.transform.*;

aws-sdk-java.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 23 23:10:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+- Added patch:
+  * aws-sdk-java-ambiguous-Record.patch
+    + fix name clashes with the new java.lang.Record
+
 -------------------------------------------------------------------
 Mon Dec  2 06:31:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

aws-sdk-java.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package aws-sdk-java
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,10 +23,12 @@ Release:        0
 Summary:        AWS SDK for Java
 License:        Apache-2.0 AND SUSE-Public-Domain
 Group:          Development/Libraries/Java
-URL:            http://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
+Patch0:         aws-sdk-java-ambiguous-Record.patch
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.fasterxml.jackson.core:jackson-databind)
 BuildRequires:  mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor)
@@ -36,6 +38,9 @@ BuildRequires:  mvn(joda-time:joda-time)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
 BuildArch:      noarch
+%if 0%{?suse_version} > 1500
+BuildRequires:  mvn(javax.xml.bind:jaxb-api)
+%endif
 
 %description
 The AWS SDK for Java enables Java developers to easily work with
@@ -149,8 +154,9 @@ This package holds the classes for uploading the
 client side metrics collected from AWS Java SDK to
 Amazon CloudWatch.
 
-#%% package code-generator
 
+
+#%% package code-generator
 %package codecommit
 Summary:        AWS Java SDK for AWS CodeCommit
 Group:          Development/Libraries/Java
@@ -169,8 +175,9 @@ The AWS Java SDK for AWS CodeDeploy module holds the
 client classes that are used for communicating with
 AWS CodeDeploy Service.
 
-#%% package codegen-maven-plugin
 
+
+#%% package codegen-maven-plugin
 %package codepipeline
 Summary:        AWS Java SDK for AWS CodePipeline
 Group:          Development/Libraries/Java
@@ -638,8 +645,9 @@ The AWS Java SDK for AWS Support module holds the
 client classes that are used for communicating with
 AWS Support Service.
 
-#%% package swf-libraries
 
+
+#%% package swf-libraries
 %package test-utils
 Summary:        AWS SDK for Java - Test Utils
 Group:          Development/Libraries/Java
@@ -675,6 +683,7 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{githash}
+%patch0 -p1
 
 # Remove deprecated httpclient annotations
 sed -i '/NotThreadSafe/d' \
@@ -791,6 +800,10 @@ sed -i '/GuardedBy/d' \
 
 %pom_remove_dep :aws-java-sdk-swf-libraries aws-java-sdk
 
+%if 0%{?suse_version} > 1500
+%pom_add_dep javax.xml.bind:jaxb-api aws-java-sdk-core
+%endif
+
 # Convert from dos to unix line ending
 dos2unix src/samples/AmazonEC2SpotInstances-Advanced/CreateSecurityGroupApp.java \
  src/samples/AmazonEC2SpotInstances-Advanced/GettingStartedApp.java \
@@ -805,9 +818,10 @@ dos2unix src/samples/AmazonEC2SpotInstances-Advanced/CreateSecurityGroupApp.java
  src/samples/AwsCloudFormation/CloudFormationSample.java \
  src/samples/AwsCloudFormation/CloudFormationSample.template
 
-# Generate javadoc with source level 1.6 to avoid complaints
+%pom_xpath_set "pom:project/pom:properties/pom:jre.version" "1.8"
+# Generate javadoc with the same source level to avoid complaints
 # about "_" being used as identifier with newer OpenJDK versions.
-%pom_xpath_inject pom:project/pom:properties "<source>1.6</source>"
+%pom_xpath_inject pom:project/pom:properties "<source>\${jre.version}</source>"
 
 %build
 # Tests require networking and unavailable test deps:
@@ -847,10 +861,12 @@ dos2unix src/samples/AmazonEC2SpotInstances-Advanced/CreateSecurityGroupApp.java
 %files cloudwatch -f .mfiles-aws-java-sdk-cloudwatch
 
 %files cloudwatchmetrics -f .mfiles-aws-java-sdk-cloudwatchmetrics
+
 #%% files code-generator -f .mfiles-aws-java-sdk-code-generator
 %files codecommit -f .mfiles-aws-java-sdk-codecommit
 
 %files codedeploy -f .mfiles-aws-java-sdk-codedeploy
+
 #%% files codegen-maven-plugin -f .mfiles-aws-java-sdk-codegen-maven-plugin
 %files codepipeline -f .mfiles-aws-java-sdk-codepipeline
 
@@ -966,6 +982,7 @@ dos2unix src/samples/AmazonEC2SpotInstances-Advanced/CreateSecurityGroupApp.java
 %files sts -f .mfiles-aws-java-sdk-sts
 
 %files support -f .mfiles-aws-java-sdk-support
+
 #%% files swf-libraries -f .mfiles-aws-java-sdk-swf-libraries
 #%% doc src/samples/AwsFlowFramework
 %files test-utils -f .mfiles-aws-java-sdk-test-utils