Merge pull request #1136 from aws/staging/cd627411-16db-438d-b2f7-691…

…62fed70f4 Pull request: release <- staging/cd627411-16db-438d-b2f7-69162fed70f4
aws · Jan 5, 2021 · c6f0c69 · c6f0c69
2 parents 7c2952f + e07b946
commit c6f0c69
Show file tree

Hide file tree

Showing 313 changed files with 630 additions and 336 deletions.
diff --git a/.changes/2.15.59.json b/.changes/2.15.59.json
@@ -0,0 +1,24 @@
+{
+    "version": "2.15.59",
+    "date": "2021-01-05",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "contributor": "",
+            "description": "- ### Features - Add new GetCostcategories API - Support filter for GetDimensions, GetTags and GetCostcategories api - Support sortBy metrics for GetDimensions, GetTags and GetCostcategories api"
+        },
+        {
+            "type": "feature",
+            "category": "Application Auto Scaling",
+            "contributor": "",
+            "description": "Documentation updates for Application Auto Scaling"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "`S3Utilities#getUrl` now supports versionId. See [#2224](https://github.com/aws/aws-sdk-java-v2/issues/2224)"
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# __2.15.59__ __2021-01-05__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - - ### Features - Add new GetCostcategories API - Support filter for GetDimensions, GetTags and GetCostcategories api - Support sortBy metrics for GetDimensions, GetTags and GetCostcategories api
+
+## __Amazon S3__
+  - ### Features
+    - `S3Utilities#getUrl` now supports versionId. See [#2224](https://github.com/aws/aws-sdk-java-v2/issues/2224)
+
+## __Application Auto Scaling__
+  - ### Features
+    - Documentation updates for Application Auto Scaling
+
 # __2.15.58__ __2021-01-04__
 ## __AWS SDK for Java v2__
   - ### Bugfixes

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

diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

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

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

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

diff --git a/buildspecs/update-master-from-release.yml b/buildspecs/update-master-from-release.yml
@@ -27,14 +27,13 @@ phases:
     - POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
     - NEW_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
     - echo "New shapshot version - $NEW_VERSION_SNAPSHOT"
-    - PREVIOUS_RELEASE_VERSION="$MAJOR.$MINOR.$((POINT - 1))"
     -
     - git checkout master
     - git merge public/release --no-edit
     -
     - mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
     - sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
-    - sed -i -E "s/(<awsjavasdk.previous.version>).+(<awsjavasdk.previous.version>)/\1$PREVIOUS_RELEASE_VERSION\2/" pom.xml
+    - sed -i -E "s/(<awsjavasdk.previous.version>).+(<\/awsjavasdk.previous.version>)/\1$RELEASE_VERSION\2/" pom.xml
     -
     - 'git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"'
     -

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.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

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

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.15.58</version>
+        <version>2.15.59</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.15.58</version>
+        <version>2.15.59</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.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

diff --git a/core/arns/pom.xml b/core/arns/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.15.58</version>
+        <version>2.15.59</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.15.58</version>
+        <version>2.15.59</version>
     </parent>
 
     <artifactId>profiles</artifactId>

diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</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.15.58</version>
+        <version>2.15.59</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.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>

diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
 
     <artifactId>apache-client</artifactId>

diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/http-clients/pom.xml b/http-clients/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>metric-publishers</artifactId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
 
     <artifactId>cloudwatch-metric-publisher</artifactId>

diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.15.58</version>
+        <version>2.15.59</version>
     </parent>
 
     <artifactId>metric-publishers</artifactId>