>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18129 )
Change subject: [NO ISSUE][*DB][EXT] Update AWS SDK 2.17.218 -> 2.23.3 ...................................................................... [NO ISSUE][*DB][EXT] Update AWS SDK 2.17.218 -> 2.23.3 Change-Id: I6e46f68fc7c2267fec3b022779fc5028fb27f12d Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18129 Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml A asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt 4 files changed, 28 insertions(+), 8 deletions(-) Approvals: Hussain Towaileb: Looks good to me, approved Jenkins: Verified diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java index 8e38eed..517a393 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java @@ -1192,10 +1192,10 @@ includeExcludeMatcher.getMatchersList(), filesOnly); // Mark the flag as done if done, otherwise, get the marker of the previous response for the next request - if (!listObjectsResponse.isTruncated()) { - break; - } else { + if (listObjectsResponse.isTruncated() != null && listObjectsResponse.isTruncated()) { newMarker = listObjectsResponse.nextContinuationToken(); + } else { + break; } } diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index f086dc9..dcc97e5 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -87,7 +87,7 @@ <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> - <awsjavasdk.version>2.17.218</awsjavasdk.version> + <awsjavasdk.version>2.23.3</awsjavasdk.version> <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 9563937..2a7c46a 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -480,8 +480,8 @@ <groupId>software.amazon.awssdk</groupId> <artifactId>third-party-jackson-core</artifactId> <properties> - <license.alternateNoticeFile>2.17.218:META-INF/NOTICE.txt</license.alternateNoticeFile> - <license.alternateLicenseFile>2.17.218:META-INF/LICENSE.txt</license.alternateLicenseFile> + <license.alternateNoticeFile>2.23.3:META-INF/NOTICE.txt</license.alternateNoticeFile> + <license.alternateLicenseFile>2.23.3:META-INF/LICENSE.txt</license.alternateLicenseFile> </properties> </project> </supplement> @@ -609,8 +609,9 @@ <groupId>org.reactivestreams</groupId> <artifactId>reactive-streams</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.0.3</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.0.3</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.0.3,1.0.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.3,1.0.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.0.3,1.0.4</license.ignoreLicenseOverride> <license.ignoreNoticeOverride>1.0.3</license.ignoreNoticeOverride> </properties> </project> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt new file mode 100644 index 0000000..d15157a --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt @@ -0,0 +1,7 @@ +MIT No Attribution + +Copyright 2014 Reactive Streams + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18129 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-667a908755 Gerrit-Change-Id: I6e46f68fc7c2267fec3b022779fc5028fb27f12d Gerrit-Change-Number: 18129 Gerrit-PatchSet: 8 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-MessageType: merged
