Skip to content

Commit

Permalink
AWS SDK for Java 1.11.185
Browse files Browse the repository at this point in the history
  • Loading branch information
AWS committed Aug 29, 2017
1 parent 9e97608 commit 54eef19
Show file tree
Hide file tree
Showing 144 changed files with 3,105 additions and 349 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# __1.11.185__ __2017-08-29__
## __AWS Config__
- ### Features
- Increased the internal size limit of resourceId

## __Amazon EC2__
- ### Features
- Provides capability to add secondary CIDR blocks to a VPC.

# __1.11.184__ __2017-08-25__
## __AWS Cloud Formation__
- ### Features
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies.
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.184</version>
<version>1.11.185</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-acm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-acm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-api-gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-api-gateway</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-applicationautoscaling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-applicationautoscaling</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-appstream/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-appstream</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-athena/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-athena</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-autoscaling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-autoscaling</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-batch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-budgets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-budgets</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions aws-java-sdk-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
Expand All @@ -24,7 +24,7 @@
<artifactId>aws-java-sdk</artifactId>
<groupId>com.amazonaws</groupId>
<optional>false</optional>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-clouddirectory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-clouddirectory</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudformation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudformation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudfront/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudfront</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudhsm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudhsm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudhsmv2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudhsmv2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudsearch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudtrail/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudtrail</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudwatch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudwatch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudwatchmetrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-code-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-code-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codebuild/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codebuild</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codecommit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codecommit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codedeploy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codedeploy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codegen-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codegen-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codepipeline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codepipeline</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-codestar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-codestar</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cognitoidentity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cognitoidentity</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cognitoidp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cognitoidp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cognitosync/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cognitosync</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-config</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.185-SNAPSHOT</version>
<version>1.11.185</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*/
package com.amazonaws;

import static com.amazonaws.SDKGlobalConfiguration.PROFILING_SYSTEM_PROPERTY;

import com.amazonaws.annotation.SdkInternalApi;
import com.amazonaws.annotation.SdkProtectedApi;
import com.amazonaws.auth.EndpointPrefixAwareSigner;
Expand Down Expand Up @@ -41,15 +43,11 @@
import com.amazonaws.util.Classes;
import com.amazonaws.util.RuntimeHttpUtils;
import com.amazonaws.util.StringUtils;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.net.URI;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

import static com.amazonaws.SDKGlobalConfiguration.PROFILING_SYSTEM_PROPERTY;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
* Abstract base class for Amazon Web Service Java clients.
Expand Down Expand Up @@ -239,6 +237,62 @@ private URI toURI(String endpoint) throws IllegalArgumentException {
return RuntimeHttpUtils.toUri(endpoint, clientConfiguration);
}

/**
* Allows specifying the endpoint along with signing information (service name and signing region). This method will
* overwrite any information set previously by any set/with/configure Region/Endpoint methods.
* <p>
* Overrides the default endpoint for this client
* ("http://dynamodb.us-east-1.amazonaws.com/") and explicitly provides an
* AWS region ID and AWS service name to use when the client calculates a
* signature for requests. In almost all cases, this region ID and service
* name are automatically determined from the endpoint, and callers should
* use the simpler one-argument form of setEndpoint instead of this method.
* <p>
* Callers can pass in just the endpoint (ex:
* "dynamodb.us-east-1.amazonaws.com/") or a full URL, including the
* protocol (ex: "http://dynamodb.us-east-1.amazonaws.com/"). If the
* protocol is not specified here, the default protocol from this client's
* {@link ClientConfiguration} will be used, which by default is HTTPS.
* <p>
* For more information on using AWS regions with the AWS SDK for Java, and
* a complete list of all available endpoints for all AWS services, see: <a
* href=
* "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3912"
* > http://developer.amazonwebservices.com/connect/entry.jspa?externalID=
* 3912</a>
*
* @param endpoint
* The endpoint (ex: "dynamodb.us-east-1.amazonaws.com/") or a
* full URL, including the protocol (ex:
* "http://dynamodb.us-east-1.amazonaws.com/") of the region
* specific AWS endpoint this client will communicate with.
* @param serviceName
* This parameter is ignored.
* @param regionId
* The ID of the region in which this service resides AND the
* overriding region for signing purposes.
*
* @throws IllegalArgumentException
* If any problems are detected with the specified endpoint.
* @deprecated Please use the client builders instead. The
* {@link AwsClientBuilder#withEndpointConfiguration(AwsClientBuilder.EndpointConfiguration)} method on the builder allows
* setting both endpoint and signing region. See
* <a href="http://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/creating-clients.html">Creating Service Clients</a>
* for more information.
*/
@Deprecated
public void setEndpoint(String endpoint, String serviceName, String regionId) {
URI uri = toURI(endpoint);
Signer signer = computeSignerByServiceRegion(serviceName, regionId,
regionId, true);
synchronized (this) {
setServiceNameIntern(serviceName);
this.signerProvider = createSignerProvider(signer);
this.endpoint = uri;
this.signerRegionOverride = regionId;
}
}

/**
* Returns the signer based on the given URI and the current AWS client
* configuration. Currently only the SQS client can have different region on
Expand Down
Loading

0 comments on commit 54eef19

Please sign in to comment.