Skip to content

Commit c3821a0

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #501 from aws/staging/d9495d20-dd62-4075-ae64-bd44ce79910a
Pull request: release <- staging/d9495d20-dd62-4075-ae64-bd44ce79910a
2 parents 4021b7d + 14d6029 commit c3821a0

File tree

228 files changed

+993
-530
lines changed

Some content is hidden

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

228 files changed

+993
-530
lines changed

‎.changes/2.5.44.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"date": "2019-05-15",
3+
"version": "2.5.44",
4+
"entries": [
5+
{
6+
"category": "Amazon Elastic Compute Cloud",
7+
"type": "feature",
8+
"description": "Adding tagging support for VPC Endpoints and VPC Endpoint Services."
9+
},
10+
{
11+
"category": "AWS Elemental MediaPackage",
12+
"type": "feature",
13+
"description": "Adds optional configuration for DASH SegmentTemplateFormat to refer to segments by Number with Duration, rather than Number or Time with SegmentTimeline."
14+
},
15+
{
16+
"category": "AWS CodePipeline",
17+
"type": "feature",
18+
"description": "This feature includes new APIs to add, edit, remove and view tags for pipeline, custom action type and webhook resources. You can also add tags while creating these resources."
19+
},
20+
{
21+
"category": "Amazon Transcribe Service",
22+
"type": "feature",
23+
"description": "Amazon Transcribe - support transcriptions from audio sources in Indian English (en-IN) and Hindi (hi-IN)."
24+
},
25+
{
26+
"category": "AWS SDK for Java v2",
27+
"type": "bugfix",
28+
"description": "Fix a bug in `EventStreamAsyncResponseTransformer` where the reference to the current stream `Subscriber` is not reset in `prepare`, causing an `IllegalStateException` to be thrown when attemping to subscribe to the event stream upon a retry."
29+
},
30+
{
31+
"category": "Amazon Relational Database Service",
32+
"type": "feature",
33+
"description": "In the RDS API and CLI documentation, corrections to the descriptions for Boolean parameters to avoid references to TRUE and FALSE. The RDS CLI does not allow TRUE and FALSE values values for Boolean parameters."
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.5.44__ __2019-05-15__
2+
## __AWS CodePipeline__
3+
- ### Features
4+
- This feature includes new APIs to add, edit, remove and view tags for pipeline, custom action type and webhook resources. You can also add tags while creating these resources.
5+
6+
## __AWS Elemental MediaPackage__
7+
- ### Features
8+
- Adds optional configuration for DASH SegmentTemplateFormat to refer to segments by Number with Duration, rather than Number or Time with SegmentTimeline.
9+
10+
## __AWS SDK for Java v2__
11+
- ### Bugfixes
12+
- Fix a bug in `EventStreamAsyncResponseTransformer` where the reference to the current stream `Subscriber` is not reset in `prepare`, causing an `IllegalStateException` to be thrown when attemping to subscribe to the event stream upon a retry.
13+
14+
## __Amazon Elastic Compute Cloud__
15+
- ### Features
16+
- Adding tagging support for VPC Endpoints and VPC Endpoint Services.
17+
18+
## __Amazon Relational Database Service__
19+
- ### Features
20+
- In the RDS API and CLI documentation, corrections to the descriptions for Boolean parameters to avoid references to TRUE and FALSE. The RDS CLI does not allow TRUE and FALSE values values for Boolean parameters.
21+
22+
## __Amazon Transcribe Service__
23+
- ### Features
24+
- Amazon Transcribe - support transcriptions from audio sources in Indian English (en-IN) and Hindi (hi-IN).
25+
126
# __2.5.43__ __2019-05-14__
227
## __AWS Storage Gateway__
328
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can import the whole SDK into your project (includes all services) as follow
4646
<dependency>
4747
<groupId>software.amazon.awssdk</groupId>
4848
<artifactId>aws-sdk-java</artifactId>
49-
<version>2.5.43</version>
49+
<version>2.5.44</version>
5050
</dependency>
5151
```
5252

@@ -58,12 +58,12 @@ Alternatively you can add dependencies for the specific services you use only:
5858
<dependency>
5959
<groupId>software.amazon.awssdk</groupId>
6060
<artifactId>ec2</artifactId>
61-
<version>2.5.43</version>
61+
<version>2.5.44</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>software.amazon.awssdk</groupId>
6565
<artifactId>s3</artifactId>
66-
<version>2.5.43</version>
66+
<version>2.5.44</version>
6767
</dependency>
6868
```
6969

@@ -77,7 +77,7 @@ To automatically manage module versions (currently all modules have the same ver
7777
<dependency>
7878
<groupId>software.amazon.awssdk</groupId>
7979
<artifactId>bom</artifactId>
80-
<version>2.5.43</version>
80+
<version>2.5.44</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</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.43</version>
7+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
7+
<version>2.5.44</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>

‎buildspecs/benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 0.2
33
phases:
44
build:
55
commands:
6-
- mvn install -P quick -pl :sdk-benchmarks --am
7-
- mvn install -pl :bom-internal
6+
- mvn install -P quick -pl :sdk-benchmarks --am -Dmaven.wagon.http.pool=false
7+
- mvn install -pl :bom-internal -Dmaven.wagon.http.pool=false
88
- cd test/sdk-benchmarks
99
- mvn exec:exec

‎buildspecs/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ version: 0.2
33
phases:
44
build:
55
commands:
6-
- mvn clean install -D maven.wagon.httpconnectionManager.maxPerRoute=2
6+
- mvn clean install -T1C -Dmaven.wagon.http.pool=false
77
- JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
88
- echo $JAVA_VERSION
99
- |
1010
if [ "$JAVA_VERSION" -ge "9" ]; then
1111
cd test/module-path-tests
12-
mvn package
12+
mvn package -Dmaven.wagon.http.pool=false
1313
mvn exec:exec -P mock-tests
1414
fi

‎buildspecs/integ-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 0.2
33
phases:
44
build:
55
commands:
6-
- mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2 -T1C
6+
- mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -T1C -Dmaven.wagon.http.pool=false
77
- JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
88
- echo $JAVA_VERSION
99
- |

‎buildspecs/on-demand-integ-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ version: 0.2
33
phases:
44
build:
55
commands:
6-
- mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2 --fail-at-end
6+
- mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 --fail-at-end -Dmaven.wagon.http.pool=false
77
- JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
88
- echo $JAVA_VERSION
99
- |
1010
if [ "$JAVA_VERSION" -ge "9" ]; then
1111
cd test/module-path-tests
12-
mvn package
12+
mvn package -Dmaven.wagon.http.pool=false
1313
mvn exec:exec -P integ-tests
1414
fi

‎buildspecs/release-javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ phases:
1111

1212
build:
1313
commands:
14-
- mvn install -P quick -D maven.wagon.httpconnectionManager.maxPerRoute=2 -T1C
15-
- mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
14+
- mvn install -P quick -T1C -Dmaven.wagon.http.pool=false
15+
- mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting' -Dmaven.wagon.http.pool=false
1616
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
1717
-
1818
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/

‎buildspecs/release-to-maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ phases:
2020
if ! curl -f --head $SONATYPE_URL; then
2121
mkdir -p $CREDENTIALS
2222
aws s3 cp s3://aws-java-sdk-release-credentials/ $CREDENTIALS/ --recursive
23-
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
23+
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.http.pool=false
2424
else
2525
echo "This version was already released."
2626
fi

‎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.43</version>
24+
<version>2.5.44</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.43</version>
10+
<version>2.5.44</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.43</version>
9+
<version>2.5.44</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.43</version>
25+
<version>2.5.44</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.43</version>
24+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
10+
<version>2.5.44</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.43</version>
10+
<version>2.5.44</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ private EventStreamAsyncResponseTransformer(
185185
@Override
186186
public CompletableFuture<Void> prepare() {
187187
transformFuture = new CompletableFuture<>();
188+
subscriberRef.set(null);
188189
isDone = false;
189190
return transformFuture;
190191
}

‎core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformerTest.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.concurrent.CompletionException;
2727
import java.util.concurrent.CountDownLatch;
2828
import java.util.concurrent.Executors;
29+
import java.util.concurrent.atomic.AtomicBoolean;
2930
import java.util.concurrent.atomic.AtomicInteger;
3031
import java.util.concurrent.atomic.AtomicLong;
3132
import java.util.function.Consumer;
@@ -182,6 +183,42 @@ public void prepareReturnsNewFuture() {
182183
assertThat(transformer.prepare()).isNotEqualTo(cf1);
183184
}
184185

186+
@Test(timeout = 2000)
187+
public void prepareResetsSubscriberRef() throws InterruptedException {
188+
CountDownLatch latch = new CountDownLatch(2);
189+
AtomicBoolean exceptionThrown = new AtomicBoolean(false);
190+
191+
AsyncResponseTransformer<SdkResponse, Void> transformer =
192+
EventStreamAsyncResponseTransformer.builder()
193+
.eventStreamResponseHandler(
194+
onEventStream(p -> {
195+
try {
196+
p.subscribe(e -> {});
197+
} catch (Throwable t) {
198+
exceptionThrown.set(true);
199+
} finally {
200+
latch.countDown();
201+
}
202+
}))
203+
.eventResponseHandler((r, e) -> null)
204+
.executor(Executors.newFixedThreadPool(2))
205+
.future(new CompletableFuture<>())
206+
.build();
207+
208+
Flowable<ByteBuffer> bytePublisher = Flowable.empty();
209+
210+
CompletableFuture<Void> transformFuture = transformer.prepare();
211+
transformer.onStream(SdkPublisher.adapt(bytePublisher));
212+
transformFuture.join();
213+
214+
transformFuture = transformer.prepare();
215+
transformer.onStream(SdkPublisher.adapt(bytePublisher));
216+
transformFuture.join();
217+
218+
latch.await();
219+
assertThat(exceptionThrown).isFalse();
220+
}
221+
185222
@Test
186223
public void erroneousExtraExceptionOccurredDoesNotSurfaceException() {
187224
AtomicLong numExceptions = new AtomicLong(0);

‎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.43</version>
24+
<version>2.5.44</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.43</version>
25+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</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.43</version>
8+
<version>2.5.44</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)