Skip to content

Commit c3a45ff

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #635 from aws/staging/9877417b-68ca-4263-96cb-f351c9a535b3
Pull request: release <- staging/9877417b-68ca-4263-96cb-f351c9a535b3
2 parents 0abc59a + 4cacc80 commit c3a45ff

File tree

257 files changed

+2494
-260
lines changed

Some content is hidden

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

257 files changed

+2494
-260
lines changed

‎.changes/2.9.16.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.9.16",
3+
"date": "2019-10-08",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Organizations",
8+
"description": "Documentation updates for organizations"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS SDK for Java v2",
13+
"description": "EC2MetadataUtils: add marketplaceProductCodes inside InstanceInfo's POJO"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon EventBridge",
18+
"description": "Documentation updates for Amazon EventBridge."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS DataSync",
23+
"description": "Add Sync options to enable/disable TaskQueueing"
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon S3 Control",
28+
"description": "Adds support for the Amazon S3 Control service to the SDK."
29+
},
30+
{
31+
"type": "feature",
32+
"category": "Amazon Kinesis Firehose",
33+
"description": "With this release, you can use Amazon Kinesis Firehose delivery streams to deliver streaming data to Amazon Elasticsearch Service version 7.x clusters. For technical documentation, look for CreateDeliveryStream operation in Amazon Kinesis Firehose API reference."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
# __2.9.16__ __2019-10-08__
2+
## __AWS DataSync__
3+
- ### Features
4+
- Add Sync options to enable/disable TaskQueueing
5+
6+
## __AWS Organizations__
7+
- ### Features
8+
- Documentation updates for organizations
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- EC2MetadataUtils: add marketplaceProductCodes inside InstanceInfo's POJO
13+
14+
## __Amazon EventBridge__
15+
- ### Features
16+
- Documentation updates for Amazon EventBridge.
17+
18+
## __Amazon Kinesis Firehose__
19+
- ### Features
20+
- With this release, you can use Amazon Kinesis Firehose delivery streams to deliver streaming data to Amazon Elasticsearch Service version 7.x clusters. For technical documentation, look for CreateDeliveryStream operation in Amazon Kinesis Firehose API reference.
21+
22+
## __Amazon S3 Control__
23+
- ### Features
24+
- Adds support for the Amazon S3 Control service to the SDK.
25+
126
# __2.9.15__ __2019-10-07__
227
## __AWS Direct Connect__
328
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
5050
<artifactId>bom</artifactId>
51-
<version>2.9.15</version>
51+
<version>2.9.16</version>
5252
<type>pom</type>
5353
<scope>import</scope>
5454
</dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
8282
<dependency>
8383
<groupId>software.amazon.awssdk</groupId>
8484
<artifactId>ec2</artifactId>
85-
<version>2.9.15</version>
85+
<version>2.9.16</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.9.15</version>
90+
<version>2.9.16</version>
9191
</dependency>
9292
```
9393

@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
9999
<dependency>
100100
<groupId>software.amazon.awssdk</groupId>
101101
<artifactId>aws-sdk-java</artifactId>
102-
<version>2.9.15</version>
102+
<version>2.9.16</version>
103103
</dependency>
104104
```
105105

‎aws-sdk-java/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.9.15</version>
7+
<version>2.9.16</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>
@@ -710,6 +710,11 @@ Amazon AutoScaling, etc).</description>
710710
<artifactId>s3</artifactId>
711711
<version>${awsjavasdk.version}</version>
712712
</dependency>
713+
<dependency>
714+
<groupId>software.amazon.awssdk</groupId>
715+
<artifactId>s3control</artifactId>
716+
<version>${awsjavasdk.version}</version>
717+
</dependency>
713718
<dependency>
714719
<groupId>software.amazon.awssdk</groupId>
715720
<artifactId>sagemaker</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.9.15</version>
7+
<version>2.9.16</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>
@@ -820,6 +820,11 @@
820820
<artifactId>s3</artifactId>
821821
<version>${awsjavasdk.version}</version>
822822
</dependency>
823+
<dependency>
824+
<groupId>software.amazon.awssdk</groupId>
825+
<artifactId>s3control</artifactId>
826+
<version>${awsjavasdk.version}</version>
827+
</dependency>
823828
<dependency>
824829
<groupId>software.amazon.awssdk</groupId>
825830
<artifactId>sagemaker</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.9.15</version>
24+
<version>2.9.16</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.9.15</version>
10+
<version>2.9.16</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.9.15</version>
9+
<version>2.9.16</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import software.amazon.awssdk.codegen.lite.PoetClass;
4141
import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
4242
import software.amazon.awssdk.utils.Validate;
43+
import software.amazon.awssdk.utils.http.SdkHttpUtils;
4344

4445
public class RegionGenerator implements PoetClass {
4546

@@ -153,7 +154,9 @@ private MethodSpec regionOfGlobal() {
153154
.addParameter(boolean.class, "isGlobalRegion")
154155
.returns(className())
155156
.addStatement("$T.paramNotBlank($L, $S)", Validate.class, "value", "region")
156-
.addStatement("return $L.put($L, $L)", "RegionCache", "value", "isGlobalRegion")
157+
.addStatement("$T $L = $T.urlEncode($L)",
158+
String.class, "urlEncodedValue", SdkHttpUtils.class, "value")
159+
.addStatement("return $L.put($L, $L)", "RegionCache", "urlEncodedValue", "isGlobalRegion")
157160
.build();
158161

159162
}

‎codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import software.amazon.awssdk.annotations.Generated;
88
import software.amazon.awssdk.annotations.SdkPublicApi;
99
import software.amazon.awssdk.utils.Validate;
10+
import software.amazon.awssdk.utils.http.SdkHttpUtils;
1011

1112
/**
1213
* An Amazon Web Services region that hosts a set of Amazon services.
@@ -99,7 +100,8 @@ public static Region of(String value) {
99100

100101
private static Region of(String value, boolean isGlobalRegion) {
101102
Validate.paramNotBlank(value, "region");
102-
return RegionCache.put(value, isGlobalRegion);
103+
String urlEncodedValue = SdkHttpUtils.urlEncode(value);
104+
return RegionCache.put(urlEncodedValue, isGlobalRegion);
103105
}
104106

105107
public static List<Region> regions() {

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.9.15</version>
25+
<version>2.9.16</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.9.15</version>
24+
<version>2.9.16</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.9.15</version>
10+
<version>2.9.16</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.9.15</version>
10+
<version>2.9.16</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.mockito.runners.MockitoJUnitRunner;
4343
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
4444
import software.amazon.awssdk.auth.signer.Aws4Signer;
45+
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
4546
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
4647
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
4748
import software.amazon.awssdk.core.client.config.SdkClientOption;

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.9.15</version>
24+
<version>2.9.16</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.9.15</version>
25+
<version>2.9.16</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-ion-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-xml-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/protocol-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.9.15</version>
8+
<version>2.9.16</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/regions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.9.15</version>
25+
<version>2.9.16</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ public void testInstanceInfo() {
109109
Assert.assertEquals("us-east-1b", info.getAvailabilityZone());
110110
Assert.assertEquals("10.201.215.38", info.getPrivateIp());
111111
Assert.assertEquals("bar", info.getDevpayProductCodes()[0]);
112+
Assert.assertEquals("qaz", info.getMarketplaceProductCodes()[0]);
112113
}
113114
}

0 commit comments

Comments
 (0)