Skip to content

Commit 84ba31e

Browse files
committed
removing transcribestreaming and iotwireless from japicmp excluded module lists and fix the test
1 parent 44a66bc commit 84ba31e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

buildspecs/update-master-from-release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ phases:
2727
- POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
2828
- NEW_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
2929
- echo "New shapshot version - $NEW_VERSION_SNAPSHOT"
30-
- PREVIOUS_RELEASE_VERSION="$MAJOR.$MINOR.$((POINT - 1))"
3130
-
3231
- git checkout master
3332
- git merge public/release --no-edit
3433
-
3534
- mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
3635
- sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
37-
- sed -i -E "s/(<awsjavasdk.previous.version>).+(<awsjavasdk.previous.version>)/\1$PREVIOUS_RELEASE_VERSION\2/" pom.xml
36+
- sed -i -E "s/(<awsjavasdk.previous.version>).+(<\/awsjavasdk.previous.version>)/\1$RELEASE_VERSION\2/" pom.xml
3837
-
3938
- 'git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"'
4039
-

pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</scm>
8585
<properties>
8686
<awsjavasdk.version>${project.version}</awsjavasdk.version>
87-
<awsjavasdk.previous.version>2.15.51</awsjavasdk.previous.version>
87+
<awsjavasdk.previous.version>2.15.57</awsjavasdk.previous.version>
8888
<jackson.version>2.10.5</jackson.version>
8989
<jackson.databind.version>2.10.5.1</jackson.databind.version>
9090
<jacksonjr.version>2.11.2</jacksonjr.version>
@@ -525,13 +525,11 @@
525525
<excludeModule>aws-sdk-java</excludeModule>
526526
<excludModeule>archetype-lambda</excludModeule>
527527
<excludeModule>sdk-benchmarks</excludeModule>
528-
<excludeModule>iotwireless</excludeModule>
529528
<excludeModule>bundle</excludeModule>
530-
<excludeModule>transcribestreaming</excludeModule>
531529
<!-- ignore crt because it's in preview TODO: remove this when CRT is GA -->
532530
<excludModeule>aws-crt-client</excludModeule>
533531
</excludeModules>
534-
<ignoreMissingNewVersion>true</ignoreMissingNewVersion>
532+
<ignoreMissingOldVersion>true</ignoreMissingOldVersion>
535533
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
536534
<breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
537535
<overrideCompatibilityChangeParameters>

services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SignersIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ private String getInputContent() {
197197
+ " \"" + HASH_KEY_NAME + "\":{ \n"
198198
+ " \"S\":\"" + HASH_KEY_VALUE + "\"\n"
199199
+ " }\n"
200-
+ " }\n"
200+
+ " },\n"
201+
+ " \"ConsistentRead\": true"
201202
+ "}".trim();
202203
}
203204

@@ -221,6 +222,7 @@ private void getItemAndAssertValues(DynamoDbClient client) {
221222
Map<String, AttributeValue> item =
222223
client.getItem(GetItemRequest.builder()
223224
.tableName(TABLE_NAME)
225+
.consistentRead(true)
224226
.key(Collections.singletonMap(HASH_KEY_NAME, AttributeValue.builder()
225227
.s(HASH_KEY_VALUE)
226228
.build()))

0 commit comments

Comments
 (0)