diff --git a/aws-sdk-java-ambiguous-Record.patch b/aws-sdk-java-ambiguous-Record.patch new file mode 100644 index 0000000..43c0f1a --- /dev/null +++ b/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.*; diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index 789aad1..ea971ee 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -25,8 +25,10 @@ License: Apache-2.0 AND SUSE-Public-Domain 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 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) @@ -152,6 +154,7 @@ This package holds the classes for uploading the client side metrics collected from AWS Java SDK to Amazon CloudWatch. + #%% package code-generator %package codecommit @@ -172,6 +175,7 @@ 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 codepipeline @@ -641,6 +645,7 @@ 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 test-utils @@ -678,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' \ @@ -812,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 "1.6" +%pom_xpath_inject pom:project/pom:properties "\${jre.version}" %build # Tests require networking and unavailable test deps: