Skip to content

Commit e3e33ac

Browse files
millemsmillems
authored
Merge pull request #363 from aws/staging/51009236-e57a-42ca-9575-b44500658471
2 parents 6fb765f + 6ed0319 commit e3e33ac

File tree

232 files changed

+4878
-894
lines changed

Some content is hidden

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

232 files changed

+4878
-894
lines changed

‎.changes/2.3.1.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"date": "2019-01-11",
3+
"version": "2.3.1",
4+
"entries": [
5+
{
6+
"category": "AWS SDK for Java v2",
7+
"type": "feature",
8+
"description": "Updated to the latest service models."
9+
},
10+
{
11+
"category": "AWS RDS DataService",
12+
"type": "feature",
13+
"description": "Documentation updates for RDS Data API."
14+
},
15+
{
16+
"category": "Amazon Elastic MapReduce",
17+
"type": "feature",
18+
"description": "Documentation updates for Amazon EMR"
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.3.1__ __2019-01-11__
2+
## __AWS RDS DataService__
3+
- ### Features
4+
- Documentation updates for RDS Data API.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated to the latest service models.
9+
10+
## __Amazon Elastic MapReduce__
11+
- ### Features
12+
- Documentation updates for Amazon EMR
13+
114
# __2.3.0__ __2019-01-09__
215
## __AWS SDK for Java v2__
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.3.0</version>
47+
<version>2.3.1</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.3.0</version>
59+
<version>2.3.1</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.amazon.awssdk</groupId>
6363
<artifactId>s3</artifactId>
64-
<version>2.3.0</version>
64+
<version>2.3.1</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.3.0</version>
78+
<version>2.3.1</version>
7979
<type>pom</type>
8080
<scope>import</scope>
8181
</dependency>

‎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.3.0</version>
7+
<version>2.3.1</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>
@@ -617,6 +617,11 @@
617617
<artifactId>apigatewayv2</artifactId>
618618
<version>${awsjavasdk.version}</version>
619619
</dependency>
620+
<dependency>
621+
<groupId>software.amazon.awssdk</groupId>
622+
<artifactId>docdb</artifactId>
623+
<version>${awsjavasdk.version}</version>
624+
</dependency>
620625
</dependencies>
621626
<build>
622627
<finalName>${project.artifactId}-${project.version}</finalName>

‎bom/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.3.0</version>
9+
<version>2.3.1</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎buildspecs/noop.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 0.2
2+
3+
phases:
4+
build:
5+
commands:
6+
- echo "No-op."

‎buildspecs/release-javadoc.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
commands:
6+
- pip install awscli --upgrade --user
7+
8+
pre_build:
9+
commands:
10+
- DOC_PATH='s3://aws-java-sdk-javadoc/java/api'
11+
12+
build:
13+
commands:
14+
- mvn javadoc:aggregate -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:module-path-tests'
15+
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
16+
-
17+
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/
18+
- aws s3 sync $DOC_PATH/$RELEASE_VERSION/ $DOC_PATH/latest/ --acl=public-read --delete
19+
- jar cf aws-java-sdk-v2-docs.jar -C target/site/apidocs .
20+
- aws s3 cp aws-java-sdk-v2-docs.jar $DOC_PATH/ --acl="public-read"

‎buildspecs/release-to-github.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 0.2
2+
3+
phases:
4+
pre_build:
5+
commands:
6+
- git config --global user.name "AWS"
7+
- git config --global user.email "<>"
8+
- 'PUBLIC_REPOSITORY_URL="https://[email protected]/aws/aws-sdk-java-v2.git"'
9+
10+
build:
11+
commands:
12+
- git checkout release
13+
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
14+
-
15+
- git remote add --fetch public $PUBLIC_REPOSITORY_URL
16+
17+
- git tag -a $RELEASE_VERSION -m "AWS SDK for Java v2 ($RELEASE_VERSION)"
18+
-
19+
- git push public HEAD:release
20+
- git push public $RELEASE_VERSION

‎buildspecs/release-to-maven.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
commands:
6+
- pip install awscli --upgrade --user
7+
8+
pre_build:
9+
commands:
10+
- TMP='tmp_settings'
11+
12+
build:
13+
commands:
14+
- mkdir -p $TMP
15+
- aws s3 cp s3://aws-java-sdk-credentials/settings.xml $TMP/settings.xml
16+
-
17+
- mvn clean deploy -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -s $TMP/settings.xml -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests
18+
- mvn org.sonatype.plugins:nexus-staging-maven-plugin:release -Ppublishing -s $TMP/settings.xml

‎buildspecs/update-master-from-release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
version: 0.2
2+
3+
phases:
4+
pre_build:
5+
commands:
6+
- git config --global user.name "AWS"
7+
- git config --global user.email "<>"
8+
- 'PUBLIC_REPOSITORY_URL="https://[email protected]/aws/aws-sdk-java-v2.git"'
9+
10+
build:
11+
commands:
12+
- mkdir release
13+
- cd release
14+
-
15+
- git clone -o public -b release $PUBLIC_REPOSITORY_URL
16+
-
17+
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
18+
- echo "Release version: $RELEASE_VERSION"
19+
-
20+
- MAJOR=$(echo $RELEASE_VERSION | cut -d'.' -f1)
21+
- MINOR=$(echo $RELEASE_VERSION | cut -d'.' -f2)
22+
- POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
23+
- NEW_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
24+
- echo "New shapshot version: $NEW_VERSION_SNAPSHOT"
25+
-
26+
- git checkout master
27+
- git merge origin/release --no-edit
28+
-
29+
- mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
30+
- sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
31+
-
32+
- git commit -am "Update to next snapshot version: $NEXT_VERSION_SNAPSHOT"

‎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.3.0</version>
24+
<version>2.3.1</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.3.0</version>
10+
<version>2.3.1</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.3.0</version>
9+
<version>2.3.1</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.3.0</version>
25+
<version>2.3.1</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.3.0</version>
24+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
10+
<version>2.3.1</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.3.0</version>
10+
<version>2.3.1</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.3.0</version>
24+
<version>2.3.1</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.3.0</version>
25+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
8+
<version>2.3.1</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.3.0</version>
25+
<version>2.3.1</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.3.0</version>
24+
<version>2.3.1</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.3.0</version>
25+
<version>2.3.1</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.3.0</version>
24+
<version>2.3.1</version>
2525
</parent>
2626

2727
<artifactId>apache-client</artifactId>

0 commit comments

Comments
 (0)