You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2024/02/01 03:06:12 UTC
(asterixdb) 05/11: [NO ISSUE][*DB][EXT] Update AWS SDK 2.17.218 -> 2.23.3
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f40f00b6034990b1c21491cf614bab3f1641efae
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Jan 19 20:11:37 2024 -0500
[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 <hu...@gmail.com>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
.../java/org/apache/asterix/external/util/ExternalDataUtils.java | 6 +++---
asterixdb/pom.xml | 2 +-
asterixdb/src/main/appended-resources/supplemental-models.xml | 9 +++++----
....com_reactive-streams_reactive-streams-jvm_v1.0.4_LICENSE.txt | 7 +++++++
4 files changed, 16 insertions(+), 8 deletions(-)
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 8e38eed270..517a39315e 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 @@ public class ExternalDataUtils {
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 f086dc98cf..dcc97e5d44 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 956393781e..2a7c46aa9c 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 0000000000..d15157a65a
--- /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