Skip to content

Commit 5ae40bb

Browse files
committed
Version 1.6.11 of the AWS Java SDK
This release updates the Auto Scaling and Amazon CloudSearch clients to support the latest service features.
1 parent 0960124 commit 5ae40bb

File tree

6,375 files changed

+9247
-7399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,375 files changed

+9247
-7399
lines changed

META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: AWS SDK for Java
44
Bundle-SymbolicName: com.amazonaws.sdk;singleton:=true
5-
Bundle-Version: 1.6.10
5+
Bundle-Version: 1.6.11
66
Bundle-Vendor: Amazon Technologies, Inc
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
88
Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>aws-java-sdk</artifactId>
77
<packaging>jar</packaging>
88
<name>AWS SDK for Java</name>
9-
<version>1.6.10</version>
9+
<version>1.6.11</version>
1010
<description>The Amazon Web Services SDK for Java provides Java APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS Java SDK allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Amazon Relational Database Service, Amazon AutoScaling, etc).</description>
1111
<url>https://aws.amazon.com/sdkforjava</url>
1212

@@ -64,7 +64,11 @@
6464
<type>jar</type>
6565
<scope>compile</scope>
6666
</dependency>
67-
67+
<dependency>
68+
<groupId>joda-time</groupId>
69+
<artifactId>joda-time</artifactId>
70+
<version>[2.2,)</version>
71+
</dependency>
6872

6973
<!-- JavaMail is only needed if you want to use the JavaMail provider
7074
for Amazon Simple Email Service -->

src/main/java/com/amazonaws/AmazonClientException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/AmazonServiceException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/AmazonWebServiceClient.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.
@@ -528,9 +528,11 @@ public String getServiceName() {
528528
}
529529

530530
/**
531-
* Internal method for implementing {@link #getServiceName()}.
531+
* Internal method for implementing {@link #getServiceName()}. Method is
532+
* protected by intent so peculiar subclass that don't follow the class
533+
* naming convention can choose to return whatever service name as needed.
532534
*/
533-
private String getServiceNameIntern() {
535+
protected String getServiceNameIntern() {
534536
if (serviceName == null) {
535537
synchronized(this) {
536538
if (serviceName == null) {

src/main/java/com/amazonaws/AmazonWebServiceRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/AmazonWebServiceResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/ClientConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/DefaultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

src/main/java/com/amazonaws/HttpMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)