You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2022/01/23 15:39:59 UTC
Change in asterixdb[stabilization-5e11053887]: Merge branch 'gerrit/stabilization-02ea049d7a'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14943 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58
---
D asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/pom.xml
7 files changed, 124 insertions(+), 334 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/43/14943/1
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
deleted file mode 100644
index 0a3c015..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
-=======
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied. See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp">
- <test-group name="external-dataset">
- <test-case FilePath="external-dataset/aws/s3/">
- <compilation-unit name="custom-buffer-size">
- <output-dir compare="Text">custom-buffer-size</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/json">
- <output-dir compare="Text">aws/s3/json/json</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/gz">
- <output-dir compare="Text">aws/s3/json/gz</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/mixed">
- <output-dir compare="Text">aws/s3/json/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/csv">
- <output-dir compare="Text">aws/s3/csv/csv</output-dir>
- </compilation-unit>
- </test-case><test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/gz">
- <output-dir compare="Text">aws/s3/csv/gz</output-dir>
- </compilation-unit>
- </test-case><test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/mixed">
- <output-dir compare="Text">aws/s3/csv/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/tsv">
- <output-dir compare="Text">aws/s3/tsv/tsv</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/gz">
- <output-dir compare="Text">aws/s3/tsv/gz</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/mixed">
- <output-dir compare="Text">aws/s3/tsv/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/empty-string-definition">
- <output-dir compare="Text">aws/s3/empty-string-definition</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/over-1000-objects">
- <output-dir compare="Text">aws/s3/over-1000-objects</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/malformed-json">
- <output-dir compare="Text">aws/s3/malformed-json</output-dir>
- <expected-error>Parsing error at malformed-data/duplicate-fields.json line 1 field field: Duplicate field 'field'</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-json.json line 1 field field: Unexpected character ('}' (code 125)): was expecting double-quote to start field name</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-json-2.json line 4 field array_f: Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-jsonl-1.json line 3 field field2: Unrecognized token 'truee': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-jsonl-2.json line 11 field array_f: Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/definition-does-not-exist">
- <output-dir compare="Text">aws/s3/definition-does-not-exist</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/invalid-endpoint">
- <output-dir compare="Text">aws/s3/invalid-endpoint</output-dir>
- <expected-error>External source error. Invalid service endpoint ^invalid-endpoint^</expected-error>
- </compilation-unit>
- </test-case>
- <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>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/definition-points-to-nothing">
- <output-dir compare="Text">aws/s3/no-files-returned/definition-points-to-nothing</output-dir>
- <source-location>false</source-location>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/exclude-all-files">
- <output-dir compare="Text">aws/s3/no-files-returned/exclude-all-files</output-dir>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/include-no-files">
- <output-dir compare="Text">aws/s3/no-files-returned/include-no-files</output-dir>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/non-s3-region">
- <output-dir compare="Text">aws/s3/non-s3-region</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
- <test-group name="include-exclude">
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-1">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-1</output-dir>
- <expected-error>Invalid format for property "exclude1"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-2">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-2</output-dir>
- <expected-error>Invalid format for property "exclude#"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-3">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-3</output-dir>
- <expected-error>Invalid format for property "exclude#hello"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/both">
- <output-dir compare="Text">aws/s3/include-exclude/both</output-dir>
- <expected-error>The parameters "include" and "exclude" cannot be provided at the same time</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-all">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-all</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-1">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-1</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-2">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-2</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-3">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-3</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-4">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-4</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-5">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-5</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-6">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-all">
- <output-dir compare="Text">aws/s3/include-exclude/include-all</output-dir>
- <expected-error>Malformed input stream</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-1">
- <output-dir compare="Text">aws/s3/include-exclude/include-1</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-2">
- <output-dir compare="Text">aws/s3/include-exclude/include-2</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-3">
- <output-dir compare="Text">aws/s3/include-exclude/include-3</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-4">
- <output-dir compare="Text">aws/s3/include-exclude/include-4</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-5">
- <output-dir compare="Text">aws/s3/include-exclude/include-5</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-6">
- <output-dir compare="Text">aws/s3/include-exclude/include-6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-7">
- <output-dir compare="Text">aws/s3/include-exclude/include-7</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-8">
- <output-dir compare="Text">aws/s3/include-exclude/include-8</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-9">
- <output-dir compare="Text">aws/s3/include-exclude/include-9</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-10">
- <output-dir compare="Text">aws/s3/include-exclude/include-10</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-11">
- <output-dir compare="Text">aws/s3/include-exclude/include-11</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-12">
- <output-dir compare="Text">aws/s3/include-exclude/include-12</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/anonymous_no_auth">
- <output-dir compare="Text">anonymous_no_auth</output-dir>
- <expected-error>ASX3119: Parameter 'secretAccessKey' is required if 'accessKeyId' is provided</expected-error>
- <expected-error>ASX3119: Parameter 'accessKeyId' is required if 'secretAccessKey' is provided</expected-error>
- </compilation-unit>
- </test-case>
- </test-group>
-</test-suite>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index b354e65..ead8e89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -117,7 +117,7 @@
<compilation-unit name="common/bucket-does-not-exist">
<placeholder name="adapter" value="S3" />
<output-dir compare="Text">common/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)</expected-error>
+ <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>
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index a7772c8..ca0f509 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,15 +86,10 @@
<hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <log4j.version>2.14.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
- <azurejavasdk.version>12.12.0</azurejavasdk.version>
- <parquet.version>1.8.2</parquet.version>
-=======
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.116</awsjavasdk.version>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ <azurejavasdk.version>12.12.0</azurejavasdk.version>
+ <parquet.version>1.8.2</parquet.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 e7dfd38..d6c8e73 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -184,21 +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>
- </properties>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>io.netty</groupId>
- <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.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.72.Final,4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -220,9 +208,9 @@
<artifactId>netty-codec-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -232,9 +220,9 @@
<artifactId>netty-codec-http2</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -304,9 +292,9 @@
<artifactId>netty-resolver-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -436,30 +424,113 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.8.4/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.1.7.1</license.ignoreLicenseOverride>
-=======
<!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.8.4</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
+
+ <!-- AWS SDK begin -->
+ <!-- software.amazon.awssdk is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
+ <!-- license override not needed, ALv2 is specified in its pom.xml -->
+ <!-- see https://github.com/aws/aws-sdk-java-v2/blob/master/LICENSE.txt -->
<supplement>
<project>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-classes</artifactId>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sdk-core</artifactId>
<properties>
- <!-- netty-tcnative-classes is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <!-- see https://github.com/netty/netty-tcnative/blob/netty-tcnative-parent-2.0.46.Final/LICENSE.txt -->
- <license.ignoreMissingEmbeddedLicense>2.0.46.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.46.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.0.46.Final</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>2.0.46.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-core</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>regions</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>arns</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>netty-nio-client</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-xml-protocol</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -530,7 +601,6 @@
</project>
</supplement>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<supplement>
<project>
<groupId>org.msgpack</groupId>
@@ -760,7 +830,4 @@
</properties>
</project>
</supplement>
-=======
-
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
</supplementalDataModels>
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index e0c9a80..2899cf7 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -135,13 +135,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-=======
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 1b7af0b..c2f553a 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -116,17 +116,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -172,13 +172,12 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-=======
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14943
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5e11053887
Gerrit-Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58
Gerrit-Change-Number: 14943
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-5e11053887]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14943 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58
---
D asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/pom.xml
7 files changed, 124 insertions(+), 334 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/43/14943/1
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
deleted file mode 100644
index 0a3c015..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
-=======
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied. See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp">
- <test-group name="external-dataset">
- <test-case FilePath="external-dataset/aws/s3/">
- <compilation-unit name="custom-buffer-size">
- <output-dir compare="Text">custom-buffer-size</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/json">
- <output-dir compare="Text">aws/s3/json/json</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/gz">
- <output-dir compare="Text">aws/s3/json/gz</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/json/mixed">
- <output-dir compare="Text">aws/s3/json/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/csv">
- <output-dir compare="Text">aws/s3/csv/csv</output-dir>
- </compilation-unit>
- </test-case><test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/gz">
- <output-dir compare="Text">aws/s3/csv/gz</output-dir>
- </compilation-unit>
- </test-case><test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/csv/mixed">
- <output-dir compare="Text">aws/s3/csv/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/tsv">
- <output-dir compare="Text">aws/s3/tsv/tsv</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/gz">
- <output-dir compare="Text">aws/s3/tsv/gz</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/tsv/mixed">
- <output-dir compare="Text">aws/s3/tsv/mixed</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/empty-string-definition">
- <output-dir compare="Text">aws/s3/empty-string-definition</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/over-1000-objects">
- <output-dir compare="Text">aws/s3/over-1000-objects</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/malformed-json">
- <output-dir compare="Text">aws/s3/malformed-json</output-dir>
- <expected-error>Parsing error at malformed-data/duplicate-fields.json line 1 field field: Duplicate field 'field'</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-json.json line 1 field field: Unexpected character ('}' (code 125)): was expecting double-quote to start field name</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-json-2.json line 4 field array_f: Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-jsonl-1.json line 3 field field2: Unrecognized token 'truee': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- <expected-error>Parsing error at malformed-data/malformed-jsonl-2.json line 11 field array_f: Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/definition-does-not-exist">
- <output-dir compare="Text">aws/s3/definition-does-not-exist</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/invalid-endpoint">
- <output-dir compare="Text">aws/s3/invalid-endpoint</output-dir>
- <expected-error>External source error. Invalid service endpoint ^invalid-endpoint^</expected-error>
- </compilation-unit>
- </test-case>
- <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>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/definition-points-to-nothing">
- <output-dir compare="Text">aws/s3/no-files-returned/definition-points-to-nothing</output-dir>
- <source-location>false</source-location>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/exclude-all-files">
- <output-dir compare="Text">aws/s3/no-files-returned/exclude-all-files</output-dir>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset" check-warnings="true">
- <compilation-unit name="aws/s3/no-files-returned/include-no-files">
- <output-dir compare="Text">aws/s3/no-files-returned/include-no-files</output-dir>
- <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/non-s3-region">
- <output-dir compare="Text">aws/s3/non-s3-region</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
- <test-group name="include-exclude">
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-1">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-1</output-dir>
- <expected-error>Invalid format for property "exclude1"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-2">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-2</output-dir>
- <expected-error>Invalid format for property "exclude#"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/bad-name-3">
- <output-dir compare="Text">aws/s3/include-exclude/bad-name-3</output-dir>
- <expected-error>Invalid format for property "exclude#hello"</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/both">
- <output-dir compare="Text">aws/s3/include-exclude/both</output-dir>
- <expected-error>The parameters "include" and "exclude" cannot be provided at the same time</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-all">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-all</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-1">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-1</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-2">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-2</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-3">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-3</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-4">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-4</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-5">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-5</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/exclude-6">
- <output-dir compare="Text">aws/s3/include-exclude/exclude-6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-all">
- <output-dir compare="Text">aws/s3/include-exclude/include-all</output-dir>
- <expected-error>Malformed input stream</expected-error>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-1">
- <output-dir compare="Text">aws/s3/include-exclude/include-1</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-2">
- <output-dir compare="Text">aws/s3/include-exclude/include-2</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-3">
- <output-dir compare="Text">aws/s3/include-exclude/include-3</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-4">
- <output-dir compare="Text">aws/s3/include-exclude/include-4</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-5">
- <output-dir compare="Text">aws/s3/include-exclude/include-5</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-6">
- <output-dir compare="Text">aws/s3/include-exclude/include-6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-7">
- <output-dir compare="Text">aws/s3/include-exclude/include-7</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-8">
- <output-dir compare="Text">aws/s3/include-exclude/include-8</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-9">
- <output-dir compare="Text">aws/s3/include-exclude/include-9</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-10">
- <output-dir compare="Text">aws/s3/include-exclude/include-10</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-11">
- <output-dir compare="Text">aws/s3/include-exclude/include-11</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/include-exclude/include-12">
- <output-dir compare="Text">aws/s3/include-exclude/include-12</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-dataset">
- <compilation-unit name="aws/s3/anonymous_no_auth">
- <output-dir compare="Text">anonymous_no_auth</output-dir>
- <expected-error>ASX3119: Parameter 'secretAccessKey' is required if 'accessKeyId' is provided</expected-error>
- <expected-error>ASX3119: Parameter 'accessKeyId' is required if 'secretAccessKey' is provided</expected-error>
- </compilation-unit>
- </test-case>
- </test-group>
-</test-suite>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index b354e65..ead8e89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -117,7 +117,7 @@
<compilation-unit name="common/bucket-does-not-exist">
<placeholder name="adapter" value="S3" />
<output-dir compare="Text">common/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)</expected-error>
+ <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>
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index a7772c8..ca0f509 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,15 +86,10 @@
<hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <log4j.version>2.14.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
- <azurejavasdk.version>12.12.0</azurejavasdk.version>
- <parquet.version>1.8.2</parquet.version>
-=======
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.116</awsjavasdk.version>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ <azurejavasdk.version>12.12.0</azurejavasdk.version>
+ <parquet.version>1.8.2</parquet.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 e7dfd38..d6c8e73 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -184,21 +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>
- </properties>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>io.netty</groupId>
- <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.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.72.Final,4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -220,9 +208,9 @@
<artifactId>netty-codec-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -232,9 +220,9 @@
<artifactId>netty-codec-http2</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -304,9 +292,9 @@
<artifactId>netty-resolver-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -436,30 +424,113 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.8.4/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.1.7.1</license.ignoreLicenseOverride>
-=======
<!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.8.4</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
+
+ <!-- AWS SDK begin -->
+ <!-- software.amazon.awssdk is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
+ <!-- license override not needed, ALv2 is specified in its pom.xml -->
+ <!-- see https://github.com/aws/aws-sdk-java-v2/blob/master/LICENSE.txt -->
<supplement>
<project>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-classes</artifactId>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sdk-core</artifactId>
<properties>
- <!-- netty-tcnative-classes is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <!-- see https://github.com/netty/netty-tcnative/blob/netty-tcnative-parent-2.0.46.Final/LICENSE.txt -->
- <license.ignoreMissingEmbeddedLicense>2.0.46.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.46.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.0.46.Final</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>2.0.46.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-core</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>regions</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>arns</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>netty-nio-client</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-xml-protocol</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>2.10.83</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.10.83</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>2.10.83</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -530,7 +601,6 @@
</project>
</supplement>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
<supplement>
<project>
<groupId>org.msgpack</groupId>
@@ -760,7 +830,4 @@
</properties>
</project>
</supplement>
-=======
-
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
</supplementalDataModels>
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index e0c9a80..2899cf7 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -135,13 +135,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-=======
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 1b7af0b..c2f553a 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -116,17 +116,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.69.Final</version>
+ <version>4.1.73.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -172,13 +172,12 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
-<<<<<<< HEAD (14d9cf Merge branch 'gerrit/stabilization-02ea049d7a')
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-=======
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
->>>>>>> BRANCH (fa0ddb [NO ISSUE][MISC] Update dependencies)
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14943
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5e11053887
Gerrit-Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58
Gerrit-Change-Number: 14943
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange