Skip to content

Commit 99b68ad

Browse files
dagnirdagnir
committed
Merge remote-tracking branch 'origin/release'
2 parents 36fbe01 + c84e6bb commit 99b68ad

File tree

211 files changed

+882
-4441
lines changed

Some content is hidden

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

211 files changed

+882
-4441
lines changed

‎.changes/2.1.0.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"date": "2018-11-19",
3+
"version": "2.1.0",
4+
"entries": [
5+
{
6+
"category": "Netty NIO Async HTTP Client",
7+
"type": "bugfix",
8+
"description": "Not invoke fireExceptionCaught if the channel is not active. see [#452](https://github.com/aws/aws-sdk-java-v2/issues/452)"
9+
},
10+
{
11+
"category": "AWS SDK for Java v2",
12+
"type": "bugfix",
13+
"description": "Temporarily removed OSGi support because the Netty HTTP client does not yet support it. See [#726](https://github.com/aws/aws-sdk-java-v2/issues/726)"
14+
},
15+
{
16+
"category": "core",
17+
"type": "feature",
18+
"description": "Netty 4.1.31.Final"
19+
}
20+
]
21+
}

‎.changes/next-release/bugfix-AWSSDKforJavav2-22e76ea.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changes/next-release/bugfix-NettyNIOAsyncHTTPClient-3e595bb.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changes/next-release/feature-core-9feb71e.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# __2.1.0__ __2018-11-19__
2+
## __AWS SDK for Java v2__
3+
- ### Bugfixes
4+
- Temporarily removed OSGi support because the Netty HTTP client does not yet support it. See [#726](https://github.com/aws/aws-sdk-java-v2/issues/726)
5+
6+
## __Netty NIO Async HTTP Client__
7+
- ### Bugfixes
8+
- Not invoke fireExceptionCaught if the channel is not active. see [#452](https://github.com/aws/aws-sdk-java-v2/issues/452)
9+
10+
## __core__
11+
- ### Features
12+
- Netty 4.1.31.Final
13+
114
# __2.0.0-preview-13__ __2018-11-13__
215
## __AWS SDK for Java v2__
316
- ### Features

‎README.md

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# AWS SDK for Java 2.0 Developer Preview
1+
# AWS SDK for Java 2.0
22
[![Build Status](https://travis-ci.org/aws/aws-sdk-java-v2.svg?branch=master)](https://travis-ci.org/aws/aws-sdk-java-v2) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTFJSRXBBN1hkU1ZEQzZ4M1hoaWlFUExuNER3WjNpVllSQ09Qam1YdFlTSDNTd3RpZzNia3F0VkJRUTBwZlQwR1BEelpSV2dWVnp4YTBCOFZKRzRUR004PSIsIml2UGFyYW1ldGVyU3BlYyI6ImdHdEp1UHhKckpDRmhmQU4iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
33
[![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
44

5-
The **AWS SDK for Java 2.0 Developer Preview** is a rewrite of 1.0 with some great new features. As with version 1.0,
6-
it enables you to easily work with [Amazon Web Services][aws] but also includes features like non-blocking IO and pluggable
7-
HTTP implementation to further customize your applications. You can get started in minutes using ***Maven*** or any build system that supports MavenCentral as an artifact source.
5+
The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0,
6+
it enables you to easily work with [Amazon Web Services][aws] but also includes features like
7+
non-blocking IO and pluggable HTTP implementation to further customize your applications. You can
8+
get started in minutes using ***Maven*** or any build system that supports MavenCentral as an
9+
artifact source.
810

911
* [SDK Homepage][sdk-website]
1012
* [1.11 to 2.0 Changelog](docs/LaunchChangelog.md)
@@ -14,10 +16,6 @@ HTTP implementation to further customize your applications. You can get started
1416
* [SDK Blog][blog]
1517
* [Giving Feedback](#giving-feedback)
1618

17-
## Production Readiness
18-
- [kinesis][kinesis], [dynamodb][dynamodb], [cloudwatch][cloudwatch] are released under `2.0.x` and are production-ready.
19-
- The rest of the modules are still in preview and are **NOT** recommended for production use yet.
20-
2119
## Getting Started
2220

2321
#### Sign up for AWS ####
@@ -44,7 +42,7 @@ You can import the whole SDK into your project (includes all services) as follow
4442
<dependency>
4543
<groupId>software.amazon.awssdk</groupId>
4644
<artifactId>aws-sdk-java</artifactId>
47-
<version>2.0.0-preview-13</version>
45+
<version>2.1.0</version>
4846
</dependency>
4947
```
5048

@@ -56,12 +54,12 @@ Alternatively you can add dependencies for the specific services you use only:
5654
<dependency>
5755
<groupId>software.amazon.awssdk</groupId>
5856
<artifactId>ec2</artifactId>
59-
<version>2.0.0-preview-13</version>
57+
<version>2.1.0</version>
6058
</dependency>
6159
<dependency>
6260
<groupId>software.amazon.awssdk</groupId>
6361
<artifactId>s3</artifactId>
64-
<version>2.0.0-preview-13</version>
62+
<version>2.1.0</version>
6563
</dependency>
6664
```
6765

@@ -75,7 +73,7 @@ To automatically manage module versions (currently all modules have the same ver
7573
<dependency>
7674
<groupId>software.amazon.awssdk</groupId>
7775
<artifactId>bom</artifactId>
78-
<version>2.0.0-preview-13</version>
76+
<version>2.1.0</version>
7977
<type>pom</type>
8078
<scope>import</scope>
8179
</dependency>
@@ -104,7 +102,7 @@ Then individual models may omit the `version` from their dependency statement:
104102

105103
See the [Set up the AWS SDK for Java][docs-setup] section of the developer guide for more usage information.
106104

107-
## New Features for Developer Preview
105+
## New Features for 2.0
108106

109107
* Provides a way to plug in your own HTTP implementation.
110108

@@ -146,6 +144,3 @@ We need your help in making this SDK great. Please participate in the community
146144
[support-center]: https://console.aws.amazon.com/support/
147145
[console]: https://console.aws.amazon.com
148146
[bom]: http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22software.amazon.awssdk%22%20AND%20a%3A%22bom%22
149-
[kinesis]: https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22kinesis%22
150-
[dynamodb]: https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22dynamodb%22
151-
[cloudwatch]: https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22cloudwatch%22

‎aws-sdk-java/pom.xml

Lines changed: 6 additions & 6 deletions
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.0.0-preview-14-SNAPSHOT</version>
24+
<version>2.1.0</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727
<artifactId>aws-sdk-java</artifactId>
@@ -60,6 +60,11 @@
6060
<groupId>software.amazon.awssdk</groupId>
6161
<version>${awsjavasdk.version}</version>
6262
</dependency>
63+
<dependency>
64+
<artifactId>transcribestreaming</artifactId>
65+
<groupId>software.amazon.awssdk</groupId>
66+
<version>${awsjavasdk.version}</version>
67+
</dependency>
6368
<dependency>
6469
<artifactId>sms</artifactId>
6570
<groupId>software.amazon.awssdk</groupId>
@@ -245,11 +250,6 @@
245250
<groupId>software.amazon.awssdk</groupId>
246251
<version>${awsjavasdk.version}</version>
247252
</dependency>
248-
<dependency>
249-
<artifactId>codedeploy</artifactId>
250-
<groupId>software.amazon.awssdk</groupId>
251-
<version>${awsjavasdk.version}</version>
252-
</dependency>
253253
<dependency>
254254
<artifactId>codepipeline</artifactId>
255255
<groupId>software.amazon.awssdk</groupId>

‎bom/pom.xml

Lines changed: 6 additions & 6 deletions
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.0.0-preview-14-SNAPSHOT</version>
24+
<version>2.1.0</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -58,6 +58,11 @@
5858
<groupId>software.amazon.awssdk</groupId>
5959
<version>${awsjavasdk.version}</version>
6060
</dependency>
61+
<dependency>
62+
<artifactId>transcribestreaming</artifactId>
63+
<groupId>software.amazon.awssdk</groupId>
64+
<version>${awsjavasdk.version}</version>
65+
</dependency>
6166
<dependency>
6267
<artifactId>servicecatalog</artifactId>
6368
<groupId>software.amazon.awssdk</groupId>
@@ -278,11 +283,6 @@
278283
<groupId>software.amazon.awssdk</groupId>
279284
<version>${awsjavasdk.version}</version>
280285
</dependency>
281-
<dependency>
282-
<artifactId>codedeploy</artifactId>
283-
<groupId>software.amazon.awssdk</groupId>
284-
<version>${awsjavasdk.version}</version>
285-
</dependency>
286286
<dependency>
287287
<artifactId>codepipeline</artifactId>
288288
<groupId>software.amazon.awssdk</groupId>

‎buildspecs/integ-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ version: 0.2
33
phases:
44
build:
55
commands:
6-
- mvn clean verify -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2
76
- JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
87
- echo $JAVA_VERSION
98
- |

‎buildspecs/update-snapshot-version.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ phases:
99
build:
1010
commands:
1111
- git checkout master
12-
- CURRENT_SNAPSHOT=$(cat pom.xml | grep "<version>" | head -1 | cut -d\> -f 2 | cut -d\< -f 1)
13-
- echo $CURRENT_SNAPSHOT
14-
- VERSION=`echo "$CURRENT_SNAPSHOT" | cut -d "-" -f1`
15-
- echo $VERSION
16-
- BUILD=`echo "$CURRENT_SNAPSHOT" | cut -d "-" -f3`
17-
- NEXT_BUILD=$(( BUILD + 1))
18-
- RELEASE_VERSION=$VERSION-preview-$BUILD
19-
- NEXT_SNAPSHOT=$VERSION-preview-${NEXT_BUILD}-SNAPSHOT
20-
- echo Next snapshot version - $NEXT_SNAPSHOT
21-
- chmod +x scripts/finalize-release-changes
22-
- scripts/finalize-release-changes --release-version $RELEASE_VERSION --release-date $(date +%Y-%m-%d) --generate-changelog
23-
- mvn versions:set -DnewVersion=$NEXT_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
12+
- git merge origin/release --no-ff --no-edit
13+
- CURRENT_VERSION=$(cat pom.xml | grep "<version>" | head -1 | cut -d\> -f 2 | cut -d\< -f 1)
14+
- echo "Current version is $CURRENT_VERSION"
15+
- RELEASE_VERSION=`echo "$CURRENT_VERSION" | cut -d "-" -f1`
16+
- MAJOR=$(echo $RELEASE_VERSION | cut -d'.' -f1)
17+
- MINOR=$(echo $RELEASE_VERSION | cut -d'.' -f2)
18+
- POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
19+
- NEXT_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
20+
- echo Next snapshot version - $NEXT_VERSION_SNAPSHOT
21+
- mvn versions:set -DnewVersion=$NEXT_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
2422
- sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
25-
- git commit -am "Update to next snapshot version $NEXT_SNAPSHOT"
23+
- git commit -am "Update to next snapshot version $NEXT_VERSION_SNAPSHOT"
2624
- git status
2725
- git push https://[email protected]/aws/aws-sdk-java-v2.git master

‎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.0.0-preview-14-SNAPSHOT</version>
24+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
10+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
9+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
25+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
24+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
10+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
10+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
24+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
25+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</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.0.0-preview-14-SNAPSHOT</version>
8+
<version>2.1.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)