Merge pull request #451 from aws/staging/beaa628a-4488-49a9-a54a-f0fb…

…145eb45b Pull request: release <- staging/beaa628a-4488-49a9-a54a-f0fb145eb45b
aws · Mar 18, 2019 · c9a2e4f · c9a2e4f
2 parents 6522d90 + 0693cce
commit c9a2e4f
Show file tree

Hide file tree

Showing 259 changed files with 4,924 additions and 784 deletions.
diff --git a/.changes/2.5.11.json b/.changes/2.5.11.json
@@ -0,0 +1,26 @@
+{
+    "date": "2019-03-18",
+    "version": "2.5.11",
+    "entries": [
+        {
+            "category": "AWS Database Migration Service",
+            "type": "feature",
+            "description": "S3 Endpoint Settings added support for 1) Migrating to Amazon S3 as a target in Parquet format 2) Encrypting S3 objects after migration with custom KMS Server-Side encryption. Redshift Endpoint Settings added support for encrypting intermediate S3 objects during migration with custom KMS Server-Side encryption."
+        },
+        {
+            "category": "Amazon Chime",
+            "type": "feature",
+            "description": "This release adds support for the Amazon Chime Business Calling and Voice Connector features."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "bugfix",
+            "description": "Fix HeaderUnmarshaller to compare header ignoring cases."
+        },
+        {
+            "category": "Amazon Elastic Compute Cloud",
+            "type": "feature",
+            "description": "DescribeFpgaImages API now returns a new DataRetentionSupport attribute to indicate if the AFI meets the requirements to support DRAM data retention. DataRetentionSupport is a read-only attribute."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# __2.5.11__ __2019-03-18__
+## __AWS Database Migration Service__
+  - ### Features
+    - S3 Endpoint Settings added support for 1) Migrating to Amazon S3 as a target in Parquet format 2) Encrypting S3 objects after migration with custom KMS Server-Side encryption. Redshift Endpoint Settings added support for encrypting intermediate S3 objects during migration with custom KMS Server-Side encryption.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fix HeaderUnmarshaller to compare header ignoring cases.
+
+## __Amazon Chime__
+  - ### Features
+    - This release adds support for the Amazon Chime Business Calling and Voice Connector features.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - DescribeFpgaImages API now returns a new DataRetentionSupport attribute to indicate if the AFI meets the requirements to support DRAM data retention. DataRetentionSupport is a read-only attribute.
+
 # __2.5.10__ __2019-03-14__
 ## __AWS Certificate Manager__
   - ### Features

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ You can import the whole SDK into your project (includes all services) as follow
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.5.10</version>
+  <version>2.5.11</version>
 </dependency>
 ```
 
@@ -56,12 +56,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.5.10</version>
+  <version>2.5.11</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.5.10</version>
+  <version>2.5.11</version>
 </dependency>
 ```
 
@@ -75,7 +75,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.5.10</version>
+      <version>2.5.11</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

diff --git a/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
@@ -97,13 +97,13 @@
     </Match>
 
     <Match>
-        <Class name="software.amazon.awssdk.benchmark.dynamodb.V1DynamoDbAttributeValue$TestItemUnmarshalling" />
+        <Class name="software.amazon.awssdk.benchmark.marshaller.dynamodb.V1DynamoDbAttributeValue$TestItemUnmarshalling" />
         <Method name="utf8" />
         <Bug pattern="EI_EXPOSE_REP" />
     </Match>
 
     <Match>
-        <Class name="software.amazon.awssdk.benchmark.dynamodb.V2DynamoDbAttributeValue$TestItemUnmarshalling" />
+        <Class name="software.amazon.awssdk.benchmark.marshaller.dynamodb.V2DynamoDbAttributeValue$TestItemUnmarshalling" />
         <Method name="utf8" />
         <Bug pattern="EI_EXPOSE_REP" />
     </Match>

diff --git a/buildspecs/benchmarks.yml b/buildspecs/benchmarks.yml
@@ -0,0 +1,9 @@
+version: 0.2
+
+phases:
+  build:
+    commands:
+      - mvn install -P quick -pl :sdk-benchmarks --am
+      - mvn install -pl :bom-internal
+      - cd test/sdk-benchmarks
+      - mvn exec:exec
diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml
@@ -11,7 +11,7 @@ phases:
 
   build:
     commands:
-    - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:module-path-tests'
+    - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests'
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -
     - aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/auth/pom.xml b/core/auth/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
 
     <artifactId>auth</artifactId>

diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
 
     <artifactId>core</artifactId>

diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
 
     <artifactId>profiles</artifactId>

diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ain/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java b/...ain/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java
@@ -15,11 +15,13 @@
 
 package software.amazon.awssdk.protocols.xml.internal.unmarshall;
 
+import static software.amazon.awssdk.utils.StringUtils.replacePrefixIgnoreCase;
+import static software.amazon.awssdk.utils.StringUtils.startsWithIgnoreCase;
+
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.protocols.core.StringToValueConverter;
@@ -39,9 +41,9 @@ public final class HeaderUnmarshaller {
     public static final XmlUnmarshaller<Map<String, ?>> MAP = ((context, content, field) -> {
         Map<String, String> result = new HashMap<>();
         context.response().headers().entrySet().stream()
-               .filter(e -> e.getKey().startsWith(field.locationName()))
-               .forEach(e -> result.put(e.getKey().replace(field.locationName(), ""),
-                                        e.getValue().stream().collect(Collectors.joining(","))));
+               .filter(e -> startsWithIgnoreCase(e.getKey(), field.locationName()))
+               .forEach(e -> result.put(replacePrefixIgnoreCase(e.getKey(), field.locationName(), ""),
+                                        String.join(",", e.getValue())));
         return result;
     });
 

diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/regions/pom.xml b/core/regions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
 
     <artifactId>regions</artifactId>

diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>