From 6c2ab96046cb48c5de870d342684454d4fac0dc3 Mon Sep 17 00:00:00 2001 From: gil Date: Jun 24 2016 13:04:11 +0000 Subject: remove deprecated httpclient annotations --- diff --git a/aws-sdk-java.spec b/aws-sdk-java.spec index 5dd7afa..d3a530a 100644 --- a/aws-sdk-java.spec +++ b/aws-sdk-java.spec @@ -1,7 +1,7 @@ %global githash 9883b981ab5103cc6944fbf8f3b973994777350f Name: aws-sdk-java Version: 1.11.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: AWS SDK for Java # Some source files are without license headers # reported @ https://github.com/aws/aws-sdk-java/issues/719 @@ -609,6 +609,99 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{githash} +# Remove deprecated httpclient annotations +sed -i '/NotThreadSafe/d' \ + aws-java-sdk-core/src/main/java/com/amazonaws/AmazonWebServiceRequest.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/ApacheHttpClientConfig.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/ClientConfiguration.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/DefaultRequest.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/RequestClientOptions.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/http/ExecutionContext.java \ + aws-java-sdk-core/src/test/java/com/amazonaws/http/response/HttpResponseProxy.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/event/ProgressInputStream.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/internal/ReleasableInputStream.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/internal/ResettableInputStream.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/metrics/ServiceLatencyProvider.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/AWSRequestMetrics.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/AWSRequestMetricsFullSupport.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/LengthCheckInputStream.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/TimingInfo.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/TimingInfoFullSupport.java + +sed -i '/ThreadSafe/d' \ + aws-java-sdk-autoscaling/src/main/java/com/amazonaws/services/autoscaling/AmazonAutoScalingAsyncClient.java \ + aws-java-sdk-autoscaling/src/main/java/com/amazonaws/services/autoscaling/AmazonAutoScalingClient.java \ + aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsyncClient.java \ + aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitClient.java \ + aws-java-sdk-codedeploy/src/main/java/com/amazonaws/services/codedeploy/AmazonCodeDeployAsyncClient.java \ + aws-java-sdk-codedeploy/src/main/java/com/amazonaws/services/codedeploy/AmazonCodeDeployClient.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/http/AmazonHttpClient.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/http/conn/ssl/SdkTLSSocketFactory.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/http/impl/client/HttpRequestNoRetryHandler.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/event/request/Progress.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/event/request/ProgressSupport.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/http/impl/client/SdkHttpRequestRetryHandler.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/LengthCheckInputStream.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/TimingInfoUnmodifiable.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBAsyncClient.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBClient.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBStreamsAsyncClient.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/AmazonDynamoDBStreamsClient.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/DynamoDB.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/Index.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/Table.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/BatchGetItemApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/BatchWriteItemApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/DeleteItemApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/GetItemApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/ListTablesApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/PutItemApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/QueryApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/ScanApi.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/document/api/UpdateItemApi.java \ + aws-java-sdk-elasticloadbalancing/src/main/java/com/amazonaws/services/elasticloadbalancing/AmazonElasticLoadBalancingAsyncClient.java \ + aws-java-sdk-elasticloadbalancing/src/main/java/com/amazonaws/services/elasticloadbalancing/AmazonElasticLoadBalancingClient.java \ + aws-java-sdk-elasticsearch/src/main/java/com/amazonaws/services/elasticsearch/AWSElasticsearchAsyncClient.java \ + aws-java-sdk-elasticsearch/src/main/java/com/amazonaws/services/elasticsearch/AWSElasticsearchClient.java \ + aws-java-sdk-elastictranscoder/src/main/java/com/amazonaws/services/elastictranscoder/AmazonElasticTranscoderAsyncClient.java \ + aws-java-sdk-elastictranscoder/src/main/java/com/amazonaws/services/elastictranscoder/AmazonElasticTranscoderClient.java \ + aws-java-sdk-gamelift/src/main/java/com/amazonaws/services/gamelift/AmazonGameLiftAsyncClient.java \ + aws-java-sdk-gamelift/src/main/java/com/amazonaws/services/gamelift/AmazonGameLiftClient.java \ + aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/internal/FileLocks.java \ + aws-java-sdk-ssm/src/main/java/com/amazonaws/services/simplesystemsmanagement/AWSSimpleSystemsManagementAsyncClient.java \ + aws-java-sdk-ssm/src/main/java/com/amazonaws/services/simplesystemsmanagement/AWSSimpleSystemsManagementClient.java \ + aws-java-sdk-storagegateway/src/main/java/com/amazonaws/services/storagegateway/AWSStorageGatewayAsyncClient.java \ + aws-java-sdk-storagegateway/src/main/java/com/amazonaws/services/storagegateway/AWSStorageGatewayClient.java + +sed -i '/Immutable/d' \ + aws-java-sdk-cloudfront/src/main/java/com/amazonaws/auth/PEMObject.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/event/ProgressEvent.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/internal/Profile.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/retry/RetryPolicy.java \ + aws-java-sdk-core/src/main/java/com/amazonaws/retry/internal/AuthRetryParameters.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/ArrayIndexElement.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/B.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/BOOL.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/BS.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/GetItemExpressionSpec.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/L.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/M.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/N.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/NamedElement.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/NS.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/NULL.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/Path.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/PathOperand.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/Precedence.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/RemoveAction.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/S.java \ + aws-java-sdk-dynamodb/src/main/java/com/amazonaws/services/dynamodbv2/xspec/SS.java \ + aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/internal/S3V4AuthErrorRetryStrategy.java \ + aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/model/InstructionFileId.java \ + aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/model/S3ObjectId.java + + %pom_remove_plugin -r com.github.siom79.japicmp:japicmp-maven-plugin # Disable building of super-JAR @@ -755,6 +848,9 @@ done %license LICENSE.txt NOTICE.txt %changelog +* Fri Jun 24 2016 gil cattaneo 1.11.3-2 +- remove deprecated httpclient annotations + * Mon May 23 2016 gil cattaneo 1.11.3-1 - update to 1.11.3