Skip to content

Commit ed8bed0

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #470 from aws/staging/2e098fc9-a854-4335-aac7-3b802f2cd34c
Pull request: release <- staging/2e098fc9-a854-4335-aac7-3b802f2cd34c
2 parents 0cab88f + 2c2b18f commit ed8bed0

File tree

217 files changed

+558
-225
lines changed

Some content is hidden

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

217 files changed

+558
-225
lines changed

‎.changes/2.5.23.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"date": "2019-04-03",
3+
"version": "2.5.23",
4+
"entries": [
5+
{
6+
"category": "Amazon Comprehend",
7+
"type": "feature",
8+
"description": "With this release AWS Comprehend adds tagging support for document-classifiers and entity-recognizers."
9+
},
10+
{
11+
"category": "AWS Batch",
12+
"type": "feature",
13+
"description": "Support for GPU resource requirement in RegisterJobDefinition and SubmitJob"
14+
},
15+
{
16+
"category": "Netty NIO HTTP Client",
17+
"type": "bugfix",
18+
"description": "Fix a bug where SNI was not enabled in Netty NIO Async Client for TLS and caused the requests to fail of handshake_failure in some services. See [#1171](https://github.com/aws/aws-sdk-java-v2/issues/1171)"
19+
}
20+
]
21+
}

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# __2.5.23__ __2019-04-03__
2+
## __AWS Batch__
3+
- ### Features
4+
- Support for GPU resource requirement in RegisterJobDefinition and SubmitJob
5+
6+
## __Amazon Comprehend__
7+
- ### Features
8+
- With this release AWS Comprehend adds tagging support for document-classifiers and entity-recognizers.
9+
10+
## __Netty NIO HTTP Client__
11+
- ### Bugfixes
12+
- Fix a bug where SNI was not enabled in Netty NIO Async Client for TLS and caused the requests to fail of handshake_failure in some services. See [#1171](https://github.com/aws/aws-sdk-java-v2/issues/1171)
13+
114
# __2.5.22__ __2019-04-02__
215
## __AWS Certificate Manager__
316
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You can import the whole SDK into your project (includes all services) as follow
4444
<dependency>
4545
<groupId>software.amazon.awssdk</groupId>
4646
<artifactId>aws-sdk-java</artifactId>
47-
<version>2.5.22</version>
47+
<version>2.5.23</version>
4848
</dependency>
4949
```
5050

@@ -56,12 +56,12 @@ Alternatively you can add dependencies for the specific services you use only:
5656
<dependency>
5757
<groupId>software.amazon.awssdk</groupId>
5858
<artifactId>ec2</artifactId>
59-
<version>2.5.22</version>
59+
<version>2.5.23</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.amazon.awssdk</groupId>
6363
<artifactId>s3</artifactId>
64-
<version>2.5.22</version>
64+
<version>2.5.23</version>
6565
</dependency>
6666
```
6767

@@ -75,7 +75,7 @@ To automatically manage module versions (currently all modules have the same ver
7575
<dependency>
7676
<groupId>software.amazon.awssdk</groupId>
7777
<artifactId>bom</artifactId>
78-
<version>2.5.22</version>
78+
<version>2.5.23</version>
7979
<type>pom</type>
8080
<scope>import</scope>
8181
</dependency>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 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.5.22</version>
7+
<version>2.5.23</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</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.5.22</version>
8+
<version>2.5.23</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 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.5.22</version>
7+
<version>2.5.23</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<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.5.22</version>
24+
<version>2.5.23</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.5.22</version>
10+
<version>2.5.23</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.5.22</version>
9+
<version>2.5.23</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<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.5.22</version>
25+
<version>2.5.23</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.5.22</version>
24+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
10+
<version>2.5.23</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.5.22</version>
10+
<version>2.5.23</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎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.5.22</version>
24+
<version>2.5.23</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.5.22</version>
25+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
8+
<version>2.5.23</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.5.22</version>
25+
<version>2.5.23</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/sdk-core/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>core</artifactId>
24-
<version>2.5.22</version>
24+
<version>2.5.23</version>
2525
</parent>
2626
<artifactId>sdk-core</artifactId>
2727
<name>AWS Java SDK :: SDK Core</name>

‎http-client-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>aws-sdk-java-pom</artifactId>
2424
<groupId>software.amazon.awssdk</groupId>
25-
<version>2.5.22</version>
25+
<version>2.5.23</version>
2626
</parent>
2727
<artifactId>http-client-spi</artifactId>
2828
<name>AWS Java SDK :: HTTP Client Interface</name>

‎http-clients/apache-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>http-clients</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.22</version>
24+
<version>2.5.23</version>
2525
</parent>
2626

2727
<artifactId>apache-client</artifactId>

‎http-clients/netty-nio-client/pom.xml

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

‎http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ protected ChannelPool newPool(URI key) {
193193

194194
AtomicReference<ChannelPool> channelPoolRef = new AtomicReference<>();
195195
ChannelPipelineInitializer handler =
196-
new ChannelPipelineInitializer(protocol, sslContext, maxStreams, channelPoolRef, configuration);
196+
new ChannelPipelineInitializer(protocol, sslContext, maxStreams, channelPoolRef, configuration, key);
197197
channelPoolRef.set(createChannelPool(bootstrap, handler));
198198
return channelPoolRef.get();
199199
}

‎http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@
3030
import io.netty.handler.logging.LogLevel;
3131
import io.netty.handler.logging.LoggingHandler;
3232
import io.netty.handler.ssl.SslContext;
33+
import io.netty.handler.ssl.SslHandler;
34+
import java.net.URI;
3335
import java.util.concurrent.CompletableFuture;
3436
import java.util.concurrent.atomic.AtomicReference;
37+
import javax.net.ssl.SSLEngine;
38+
import javax.net.ssl.SSLParameters;
3539
import software.amazon.awssdk.annotations.SdkInternalApi;
3640
import software.amazon.awssdk.http.Protocol;
3741
import software.amazon.awssdk.http.nio.netty.internal.http2.Http2SettingsFrameHandler;
@@ -46,25 +50,34 @@ public final class ChannelPipelineInitializer extends AbstractChannelPoolHandler
4650
private final long clientMaxStreams;
4751
private final AtomicReference<ChannelPool> channelPoolRef;
4852
private final NettyConfiguration configuration;
53+
private final URI poolKey;
4954

5055
public ChannelPipelineInitializer(Protocol protocol,
5156
SslContext sslCtx,
5257
long clientMaxStreams,
5358
AtomicReference<ChannelPool> channelPoolRef,
54-
NettyConfiguration configuration) {
59+
NettyConfiguration configuration,
60+
URI poolKey) {
5561
this.protocol = protocol;
5662
this.sslCtx = sslCtx;
5763
this.clientMaxStreams = clientMaxStreams;
5864
this.channelPoolRef = channelPoolRef;
5965
this.configuration = configuration;
66+
this.poolKey = poolKey;
6067
}
6168

6269
@Override
6370
public void channelCreated(Channel ch) {
6471
ch.attr(PROTOCOL_FUTURE).set(new CompletableFuture<>());
6572
ChannelPipeline pipeline = ch.pipeline();
6673
if (sslCtx != null) {
67-
pipeline.addLast(sslCtx.newHandler(ch.alloc()));
74+
75+
// Need to provide host and port to enable SNI
76+
// https://github.com/netty/netty/issues/3801#issuecomment-104274440
77+
SslHandler sslHandler = sslCtx.newHandler(ch.alloc(), poolKey.getHost(), poolKey.getPort());
78+
configureSslEngine(sslHandler.engine());
79+
80+
pipeline.addLast(sslHandler);
6881
pipeline.addLast(SslCloseCompletionEventHandler.getInstance());
6982
}
7083

@@ -87,6 +100,20 @@ public void channelCreated(Channel ch) {
87100
pipeline.addLast(new LoggingHandler(LogLevel.DEBUG));
88101
}
89102

103+
/**
104+
* Enable HostName verification.
105+
*
106+
* See https://netty.io/4.0/api/io/netty/handler/ssl/SslContext.html#newHandler-io.netty.buffer.ByteBufAllocator-java.lang
107+
* .String-int-
108+
*
109+
* @param sslEngine the sslEngine to configure
110+
*/
111+
private void configureSslEngine(SSLEngine sslEngine) {
112+
SSLParameters sslParameters = sslEngine.getSSLParameters();
113+
sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
114+
sslEngine.setSSLParameters(sslParameters);
115+
}
116+
90117
private void configureHttp2(Channel ch, ChannelPipeline pipeline) {
91118
ForkedHttp2MultiplexCodecBuilder codecBuilder = ForkedHttp2MultiplexCodecBuilder
92119
.forClient(new NoOpChannelInitializer())

‎http-clients/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.5.22</version>
24+
<version>2.5.23</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎http-clients/url-connection-client/pom.xml

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

0 commit comments

Comments
 (0)