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 178ad76eae757e44d926936522fe605a74d11a34 Author: Michael Blow <[email protected]> AuthorDate: Fri Jun 24 17:38:08 2022 -0400 [NO ISSUE][EXT] Update AWS SDK 2.17.116 -> 2.17.218 Change-Id: I80df1f1b27c72e6c113841f93c12614a0417e4e1 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/16687 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Tested-by: Michael Blow <[email protected]> --- asterixdb/NOTICE | 2 +- .../resources/runtimets/testsuite_external_dataset.xml | 2 +- asterixdb/pom.xml | 2 +- .../src/main/appended-resources/supplemental-models.xml | 16 ++++++++-------- hyracks-fullstack/NOTICE | 2 +- hyracks-fullstack/pom.xml | 5 +++++ 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/asterixdb/NOTICE b/asterixdb/NOTICE index 4aabe2709e..17c97bb248 100644 --- a/asterixdb/NOTICE +++ b/asterixdb/NOTICE @@ -1,5 +1,5 @@ Apache AsterixDB -Copyright 2015-2021 The Apache Software Foundation +Copyright 2015-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml index 5df2549469..43408c9eb7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml @@ -101,7 +101,7 @@ <test-case FilePath="external-dataset"> <compilation-unit name="aws/s3/bucket-does-not-exist"> <output-dir compare="Text">aws/s3/bucket-does-not-exist</output-dir> - <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null, Extended Request ID: null)</expected-error> + <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null)</expected-error> </compilation-unit> </test-case> <test-case FilePath="external-dataset" check-warnings="true"> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 8c78dfc57d..2bec4b7013 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -83,7 +83,7 @@ <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.17.1</log4j.version> - <awsjavasdk.version>2.17.116</awsjavasdk.version> + <awsjavasdk.version>2.17.218</awsjavasdk.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index cd322c8d6c..b16967dad7 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -172,9 +172,9 @@ <artifactId>netty-transport-classes-epoll</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.72.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.72.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.712.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.78.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.78.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.78.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -184,9 +184,9 @@ <artifactId>netty-transport-native-unix-common</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.72.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.72.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.712.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.78.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.78.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.78.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -414,8 +414,8 @@ <groupId>software.amazon.awssdk</groupId> <artifactId>third-party-jackson-core</artifactId> <properties> - <license.alternateNoticeFile>2.17.116:META-INF/NOTICE.txt</license.alternateNoticeFile> - <license.alternateLicenseFile>2.17.116:META-INF/LICENSE.txt</license.alternateLicenseFile> + <license.alternateNoticeFile>2.17.218:META-INF/NOTICE.txt</license.alternateNoticeFile> + <license.alternateLicenseFile>2.17.218:META-INF/LICENSE.txt</license.alternateLicenseFile> </properties> </project> </supplement> diff --git a/hyracks-fullstack/NOTICE b/hyracks-fullstack/NOTICE index 57c584396c..2e33eed8fb 100644 --- a/hyracks-fullstack/NOTICE +++ b/hyracks-fullstack/NOTICE @@ -1,5 +1,5 @@ Apache Hyracks and Algebricks -Copyright 2015-2021 The Apache Software Foundation +Copyright 2015-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 504d8cfaa1..2016cde975 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -113,6 +113,11 @@ <artifactId>netty-handler</artifactId> <version>4.1.78.Final</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-epoll</artifactId> + <version>4.1.78.Final</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
