Skip to content

Commit b2e4c32

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1058 from aws/staging/986ad0cf-c73b-45f3-8562-6d3e54eec77a
Pull request: release <- staging/986ad0cf-c73b-45f3-8562-6d3e54eec77a
2 parents 8fdc78f + 8276dcc commit b2e4c32

File tree

291 files changed

+431
-302
lines changed

Some content is hidden

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

291 files changed

+431
-302
lines changed

‎.changes/2.15.36.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "2.15.36",
3+
"date": "2020-11-30",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Fixed a resource leak that could occur when closing the default credentials provider (or a client using the default credentials provider), when `closeable` credentials like STS or SSO were in use. Fixes [#2149](https://github.com/aws/aws-sdk-java-v2/issues/2149)."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Updated service endpoint metadata."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Elastic Compute Cloud",
20+
"contributor": "",
21+
"description": "This release introduces Amazon EC2 Mac1 instances, a new Amazon EC2 instance family built on Apple Mac mini computers, powered by AWS Nitro System, and support running macOS workloads on Amazon EC2"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Add LICENSE.txt and NOTICE.txt to META-INF directory of generated JARs"
28+
}
29+
]
30+
}

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# __2.15.36__ __2020-11-30__
2+
## __AWS SDK for Java v2__
3+
- ### Features
4+
- Add LICENSE.txt and NOTICE.txt to META-INF directory of generated JARs
5+
- Updated service endpoint metadata.
6+
7+
- ### Bugfixes
8+
- Fixed a resource leak that could occur when closing the default credentials provider (or a client using the default credentials provider), when `closeable` credentials like STS or SSO were in use. Fixes [#2149](https://github.com/aws/aws-sdk-java-v2/issues/2149).
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- This release introduces Amazon EC2 Mac1 instances, a new Amazon EC2 instance family built on Apple Mac mini computers, powered by AWS Nitro System, and support running macOS workloads on Amazon EC2
13+
114
# __2.15.35__ __2020-11-24__
215
## __AWS Batch__
316
- ### Features

‎README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.15.35</version>
52+
<version>2.15.36</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.15.35</version>
86+
<version>2.15.36</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.15.35</version>
91+
<version>2.15.36</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.15.35</version>
103+
<version>2.15.36</version>
104104
</dependency>
105105
```
106106

@@ -132,6 +132,12 @@ You can find sample code for v2 in the following places:
132132
* [aws-doc-sdk-examples] repo.
133133
* Integration tests in this repo. They are located in the `it` directory under each service module, eg: [s3-integration-tests]
134134

135+
## Maintenance and Support for SDK Major Versions
136+
For information about maintenance and support for SDK major versions and their underlying dependencies, see the following in the AWS SDKs and Tools Shared Configuration and Credentials Reference Guide:
137+
138+
* [AWS SDKs and Tools Maintenance Policy][maintenance-policy]
139+
* [AWS SDKs and Tools Version Support Matrix][version-matrix]
140+
135141
## Giving Feedback
136142
We need your help in making this SDK great. Please participate in the community and contribute to this effort by submitting issues, participating in discussion forums and submitting pull requests through the following channels:
137143

@@ -161,3 +167,5 @@ We need your help in making this SDK great. Please participate in the community
161167
[bom]: http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22software.amazon.awssdk%22%20AND%20a%3A%22bom%22
162168
[aws-doc-sdk-examples]: https://github.com/awsdocs/aws-doc-sdk-examples/tree/master/javav2
163169
[s3-integration-tests]: https://github.com/aws/aws-sdk-java-v2/tree/master/services/s3/src/it/java/software/amazon/awssdk/services/s3
170+
[maintenance-policy]: https://docs.aws.amazon.com/credref/latest/refdocs/maint-policy.html
171+
[version-matrix]: https://docs.aws.amazon.com/credref/latest/refdocs/version-support-matrix.html

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.15.35</version>
20+
<version>2.15.36</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.15.35</version>
20+
<version>2.15.36</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</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.15.35</version>
24+
<version>2.15.36</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
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.15.35</version>
25+
<version>2.15.36</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/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.15.35</version>
24+
<version>2.15.36</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎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.15.35</version>
25+
<version>2.15.36</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.15.35</version>
24+
<version>2.15.36</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
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/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.15.35</version>
25+
<version>2.15.36</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.Test;
2121
import org.mockito.Mockito;
2222
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
23+
import software.amazon.awssdk.utils.SdkAutoCloseable;
2324

2425
public class LazyAwsCredentialsProviderTest {
2526
@SuppressWarnings("unchecked")
@@ -48,4 +49,30 @@ public void resolveCredentialsInvokesSupplierExactlyOnce() {
4849
Mockito.verify(credentialsConstructor, Mockito.times(1)).get();
4950
Mockito.verify(credentials, Mockito.times(2)).resolveCredentials();
5051
}
52+
53+
@Test
54+
public void delegatesClosesInitializerAndValue() {
55+
CloseableSupplier initializer = Mockito.mock(CloseableSupplier.class);
56+
CloseableCredentialsProvider value = Mockito.mock(CloseableCredentialsProvider.class);
57+
58+
Mockito.when(initializer.get()).thenReturn(value);
59+
60+
LazyAwsCredentialsProvider.create(initializer).close();
61+
62+
Mockito.verify(initializer).close();
63+
Mockito.verify(value).close();
64+
}
65+
66+
@Test
67+
public void delegatesClosesInitializerEvenIfGetFails() {
68+
CloseableSupplier initializer = Mockito.mock(CloseableSupplier.class);
69+
Mockito.when(initializer.get()).thenThrow(new RuntimeException());
70+
71+
LazyAwsCredentialsProvider.create(initializer).close();
72+
73+
Mockito.verify(initializer).close();
74+
}
75+
76+
private interface CloseableSupplier extends Supplier<AwsCredentialsProvider>, SdkAutoCloseable {}
77+
private interface CloseableCredentialsProvider extends SdkAutoCloseable, AwsCredentialsProvider {}
5178
}

‎core/aws-core/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.15.35</version>
25+
<version>2.15.36</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/metrics-spi/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.15.35</version>
8+
<version>2.15.36</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎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.15.35</version>
24+
<version>2.15.36</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.15.35</version>
25+
<version>2.15.36</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
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.15.35</version>
23+
<version>2.15.36</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.15.35</version>
25+
<version>2.15.36</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

0 commit comments

Comments
 (0)