From 44fcc1d5ac48a2cc761d40b33bba872e1ef44eb1d3a29e23c73298da0c126f65 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 29 Jan 2020 11:42:57 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=6 --- aws-sdk-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index 11f64b9..b2dbec8 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -1,7 +1,7 @@ # # spec file for package aws-sdk-java # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,9 @@ BuildRequires: mvn(javax.mail:javax.mail-api) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.httpcomponents:httpclient) +%ifarch s390x +BuildRequires: java-devel >= 11 +%endif BuildArch: noarch %description From 9ef31eb135317a67506aff58c6d8dd171a7c6be55370a2416f82e4a23dea3c08 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 17 Feb 2020 09:18:25 +0000 Subject: [PATCH 2/5] Syncing with factory OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=7 --- aws-sdk-java.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index b2dbec8..6c4e182 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -1,7 +1,7 @@ # # spec file for package aws-sdk-java # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,9 +35,6 @@ BuildRequires: mvn(javax.mail:javax.mail-api) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.httpcomponents:httpclient) -%ifarch s390x -BuildRequires: java-devel >= 11 -%endif BuildArch: noarch %description From b5e84353107027a8fea85d8a291af4457256145d6d9b535eeeff4b8e0fac3b66 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Mar 2022 19:09:31 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=8 --- aws-sdk-java.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index 6c4e182..789aad1 100644 --- a/aws-sdk-java.spec +++ b/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,7 +23,7 @@ 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 BuildRequires: dos2unix BuildRequires: fdupes @@ -36,6 +36,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 @@ -791,6 +794,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 \ @@ -847,10 +854,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 +975,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 From 75b10b2b25c28abda9ede4673c1c073e295f412fc1f1bcac66c5099a3961df0d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Mar 2022 06:09:54 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=9 --- aws-sdk-java-ambiguous-Record.patch | 130 ++++++++++++++++++++++++++++ aws-sdk-java.spec | 11 ++- 2 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 aws-sdk-java-ambiguous-Record.patch 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: From 333fc79d2c7eb40eaad8cee29bd39e9a16bede95d9d164a085efa8c4ab3234a6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 23 Mar 2022 23:10:58 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aws-sdk-java?expand=0&rev=10 --- aws-sdk-java.changes | 8 ++++++++ aws-sdk-java.spec | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/aws-sdk-java.changes b/aws-sdk-java.changes index 572cf65..14c91fc 100644 --- a/aws-sdk-java.changes +++ b/aws-sdk-java.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 23 23:10:15 UTC 2022 - Fridrich Strba + +- 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 diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index ea971ee..386595a 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -155,8 +155,8 @@ 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 @@ -176,8 +176,8 @@ 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 @@ -646,8 +646,8 @@ 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