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/24 15:19:33 UTC
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-5e11053887'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Merge branch 'gerrit/stabilization-5e11053887'
Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
6 files changed, 24 insertions(+), 173 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/14963/1
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 59f2404..bacc23b 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
@@ -214,11 +214,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>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<expected-error>External source error. software.amazon.awssdk.services.s3.model.NoSuchBucketException: The specified bucket does not exist (Service: S3, Status Code: 404</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>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 786355f..b4878dc 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -238,26 +238,11 @@
</override>
<override>
<gavs>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <gav>com.azure:azure-core:1.17.0</gav>
- <gav>com.azure:azure-core:1.22.0</gav>
- <gav>com.azure:azure-core-http-netty:1.10.0</gav>
- <gav>com.azure:azure-core-http-netty:1.11.2</gav>
- <gav>com.azure:azure-identity:1.4.1</gav>
- <gav>com.azure:azure-storage-blob:12.12.0</gav>
- <gav>com.azure:azure-storage-blob:12.14.2</gav>
- <gav>com.azure:azure-storage-common:12.12.0</gav>
- <gav>com.azure:azure-storage-common:12.14.1</gav>
- <gav>com.azure:azure-storage-internal-avro:12.0.5</gav>
- <gav>com.azure:azure-storage-internal-avro:12.1.2</gav>
- <gav>com.azure:azure-storage-file-datalake:12.7.2</gav>
-=======
<gav>com.azure:azure-core:1.24.1</gav>
<gav>com.azure:azure-core-http-netty:1.11.6</gav>
<gav>com.azure:azure-storage-blob:12.14.3</gav>
<gav>com.azure:azure-storage-common:12.14.2</gav>
<gav>com.azure:azure-storage-internal-avro:12.1.3</gav>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</gavs>
<!-- azure-storage-blob-batch_12.11.3 release is at 89a32290750a18d1b99c27c16b1b11d42f16c622 -->
<noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/NOTICE.txt</noticeUrl>
@@ -552,7 +537,13 @@
<aliasUrls>Public Domain</aliasUrls>
</license>
<license>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
+ <url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
+ <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
+ <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
+ <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
+ <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
+ </license>
+ <license>
<displayName>The 2-Clause BSD License</displayName>
<url>https://opensource.org/licenses/BSD-2-Clause</url>
<contentFile>raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt</contentFile>
@@ -567,13 +558,6 @@
<aliasUrls>
<aliasUrl>https://golang.org/LICENSE</aliasUrl>
</aliasUrls>
-=======
- <url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
- <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
- <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
- <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
- <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</license>
</licenses>
<templateProperties>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index fc0e6aa..529b6a5 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -87,18 +87,13 @@
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <awsjavasdk.version>2.17.79</awsjavasdk.version>
+ <awsjavasdk.version>2.17.116</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <awsjavasdk.version>2.17.116</awsjavasdk.version>
- <parquet.version>1.8.2</parquet.version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -1668,11 +1663,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <version>${azureblobjavasdk.version}</version>
-=======
<version>12.14.3</version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -1743,11 +1734,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <version>12.14.1</version>
-=======
<version>12.14.2</version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 491ab56..61ac8b5 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -549,17 +549,6 @@
</project>
</supplement>
- <supplement>
- <project>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>third-party-jackson-core</artifactId>
- <properties>
- <license.onMultipleEmbeddedLicense>2.17.79:concat</license.onMultipleEmbeddedLicense>
- <license.onMultipleEmbeddedNotice>2.17.79:concat</license.onMultipleEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
<!-- software.amazon.eventstream 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 -->
@@ -587,7 +576,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -599,7 +587,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -611,7 +598,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -623,7 +609,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -635,7 +620,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -664,13 +648,8 @@
<groupId>com.typesafe.netty</groupId>
<artifactId>netty-reactive-streams</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>2.0.4,2.0.5</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.4,2.0.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -680,13 +659,8 @@
<groupId>com.typesafe.netty</groupId>
<artifactId>netty-reactive-streams-http</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>2.0.4,2.0.5</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.4,2.0.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -698,16 +672,9 @@
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.0.2,1.0.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.2,1.0.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.0.2,1.0.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.0.2,1.0.3</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>1.0.3</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.0.3</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>1.0.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -752,11 +719,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0,12.14.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0,12.14.2</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>12.14.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.14.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.14.3</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.14.3</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -771,13 +737,6 @@
<license.ignoreMissingEmbeddedLicense>12.7.2</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.7.2</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.7.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.7.2</license.ignoreNoticeOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>12.14.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.14.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.14.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.14.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -787,17 +746,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0,12.14.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0,12.14.1</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>12.14.2</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.14.2</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.14.2</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>12.14.2</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -807,17 +759,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-internal-avro</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.0.5,12.1.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.0.5,12.1.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.0.5,12.1.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.0.5,12.1.2</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>12.1.3</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.1.3</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.1.3</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>12.1.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -827,17 +772,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.17.0,1.22.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.17.0,1.22.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.17.0,1.22.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.17.0,1.22.0</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>1.24.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.24.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.24.1</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>1.24.1</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -847,11 +785,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.10.0,1.11.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.0,1.11.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.10.0,1.11.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.10.0,1.11.2</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.11.6</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.11.6</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.11.6</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.11.6</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -864,7 +801,6 @@
<license.ignoreMissingEmbeddedLicense>1.4.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.4.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.4.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.4.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -891,12 +827,6 @@
<license.ignoreMissingEmbeddedLicense>1.1.0</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.0</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.1.0</license.ignoreLicenseOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>1.11.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.11.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.11.6</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.11.6</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -947,8 +877,8 @@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>3.4.13</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.4.13</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -959,8 +889,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -971,8 +901,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -983,8 +913,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1589,11 +1519,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedNotice>2.12.3,2.12.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedNotice>2.13.1</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1627,14 +1553,9 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.0.1</license.ignoreLicenseOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>3.4.13</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.4.13</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1645,12 +1566,7 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedNotice>5.5.0</license.ignoreMissingEmbeddedNotice>
-=======
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1661,36 +1577,7 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedNotice>5.6.0</license.ignoreMissingEmbeddedNotice>
-=======
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
- <!-- io.projectreactor.netty:reactor-netty-http uses ALv2 license and has no notice -->
- <supplement>
- <project>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
- <!-- io.projectreactor.netty:reactor-netty-http-brave uses ALv2 license and has no notice -->
- <supplement>
- <project>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http-brave</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
index 78d9cde..d61dde1 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
@@ -61,12 +61,9 @@
break;
case ALTERNATE_LICENSE_FILE:
case ALTERNATE_NOTICE_FILE:
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
case ON_MULTIPLE_EMBEDDED_NOTICE:
case ON_MULTIPLE_EMBEDDED_LICENSE:
-=======
boolean found = false;
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
for (String spec : StringUtils.split(value, ",")) {
String[] specSplit = StringUtils.split(spec, ":");
if (specSplit.length != 2) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
Gerrit-Change-Number: 14963
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
Gerrit-Change-Number: 14963
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Ali Alsuliman <al...@gmail.com>
Gerrit-Reviewer: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Murtadha Al Hubail <mh...@uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Comment-Date: Mon, 24 Jan 2022 21:44:53 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-5e11053887'
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/+/14963 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Merge branch 'gerrit/stabilization-5e11053887'
Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
6 files changed, 24 insertions(+), 173 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/14963/1
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 59f2404..bacc23b 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
@@ -214,11 +214,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>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<expected-error>External source error. software.amazon.awssdk.services.s3.model.NoSuchBucketException: The specified bucket does not exist (Service: S3, Status Code: 404</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>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset" check-warnings="true">
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 786355f..b4878dc 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -238,26 +238,11 @@
</override>
<override>
<gavs>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <gav>com.azure:azure-core:1.17.0</gav>
- <gav>com.azure:azure-core:1.22.0</gav>
- <gav>com.azure:azure-core-http-netty:1.10.0</gav>
- <gav>com.azure:azure-core-http-netty:1.11.2</gav>
- <gav>com.azure:azure-identity:1.4.1</gav>
- <gav>com.azure:azure-storage-blob:12.12.0</gav>
- <gav>com.azure:azure-storage-blob:12.14.2</gav>
- <gav>com.azure:azure-storage-common:12.12.0</gav>
- <gav>com.azure:azure-storage-common:12.14.1</gav>
- <gav>com.azure:azure-storage-internal-avro:12.0.5</gav>
- <gav>com.azure:azure-storage-internal-avro:12.1.2</gav>
- <gav>com.azure:azure-storage-file-datalake:12.7.2</gav>
-=======
<gav>com.azure:azure-core:1.24.1</gav>
<gav>com.azure:azure-core-http-netty:1.11.6</gav>
<gav>com.azure:azure-storage-blob:12.14.3</gav>
<gav>com.azure:azure-storage-common:12.14.2</gav>
<gav>com.azure:azure-storage-internal-avro:12.1.3</gav>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</gavs>
<!-- azure-storage-blob-batch_12.11.3 release is at 89a32290750a18d1b99c27c16b1b11d42f16c622 -->
<noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/NOTICE.txt</noticeUrl>
@@ -552,7 +537,13 @@
<aliasUrls>Public Domain</aliasUrls>
</license>
<license>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
+ <url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
+ <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
+ <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
+ <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
+ <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
+ </license>
+ <license>
<displayName>The 2-Clause BSD License</displayName>
<url>https://opensource.org/licenses/BSD-2-Clause</url>
<contentFile>raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt</contentFile>
@@ -567,13 +558,6 @@
<aliasUrls>
<aliasUrl>https://golang.org/LICENSE</aliasUrl>
</aliasUrls>
-=======
- <url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url>
- <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
- <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
- <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
- <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</license>
</licenses>
<templateProperties>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index fc0e6aa..529b6a5 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -87,18 +87,13 @@
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <awsjavasdk.version>2.17.79</awsjavasdk.version>
+ <awsjavasdk.version>2.17.116</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <awsjavasdk.version>2.17.116</awsjavasdk.version>
- <parquet.version>1.8.2</parquet.version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -1668,11 +1663,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <version>${azureblobjavasdk.version}</version>
-=======
<version>12.14.3</version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -1743,11 +1734,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <version>12.14.1</version>
-=======
<version>12.14.2</version>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 491ab56..61ac8b5 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -549,17 +549,6 @@
</project>
</supplement>
- <supplement>
- <project>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>third-party-jackson-core</artifactId>
- <properties>
- <license.onMultipleEmbeddedLicense>2.17.79:concat</license.onMultipleEmbeddedLicense>
- <license.onMultipleEmbeddedNotice>2.17.79:concat</license.onMultipleEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
<!-- software.amazon.eventstream 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 -->
@@ -587,7 +576,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -599,7 +587,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -611,7 +598,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -623,7 +609,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -635,7 +620,6 @@
<properties>
<license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -664,13 +648,8 @@
<groupId>com.typesafe.netty</groupId>
<artifactId>netty-reactive-streams</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>2.0.4,2.0.5</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.4,2.0.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -680,13 +659,8 @@
<groupId>com.typesafe.netty</groupId>
<artifactId>netty-reactive-streams-http</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>2.0.4,2.0.5</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.0.4,2.0.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedLicense>2.0.5</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>2.0.5</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -698,16 +672,9 @@
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.0.2,1.0.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.2,1.0.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.0.2,1.0.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.0.2,1.0.3</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>1.0.3</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.0.3</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>1.0.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -752,11 +719,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0,12.14.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0,12.14.2</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>12.14.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>12.14.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>12.14.3</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.14.3</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -771,13 +737,6 @@
<license.ignoreMissingEmbeddedLicense>12.7.2</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.7.2</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.7.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.7.2</license.ignoreNoticeOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>12.14.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.14.3</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.14.3</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.14.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -787,17 +746,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.12.0,12.14.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.12.0,12.14.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.12.0,12.14.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.12.0,12.14.1</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>12.14.2</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.14.2</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.14.2</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>12.14.2</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -807,17 +759,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-storage-internal-avro</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>12.0.5,12.1.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>12.0.5,12.1.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>12.0.5,12.1.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>12.0.5,12.1.2</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>12.1.3</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.1.3</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.1.3</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>12.1.3</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -827,17 +772,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.17.0,1.22.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.17.0,1.22.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.17.0,1.22.0</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.17.0,1.22.0</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>1.24.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.24.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.24.1</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>1.24.1</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -847,11 +785,10 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedLicense>1.10.0,1.11.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.0,1.11.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.10.0,1.11.2</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.10.0,1.11.2</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.11.6</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.11.6</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.11.6</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.11.6</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -864,7 +801,6 @@
<license.ignoreMissingEmbeddedLicense>1.4.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.4.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.4.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.4.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -891,12 +827,6 @@
<license.ignoreMissingEmbeddedLicense>1.1.0</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.0</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.1.0</license.ignoreLicenseOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>1.11.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.11.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.11.6</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.11.6</license.ignoreNoticeOverride>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -947,8 +877,8 @@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.3.3.RELEASE,3.4.6,3.4.10</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>3.4.13</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.4.13</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -959,8 +889,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -971,8 +901,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -983,8 +913,8 @@
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7,1.0.11</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7,1.0.11</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1589,11 +1519,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
- <license.ignoreMissingEmbeddedNotice>2.12.3,2.12.5</license.ignoreMissingEmbeddedNotice>
-=======
<license.ignoreMissingEmbeddedNotice>2.13.1</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1627,14 +1553,9 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.0.1</license.ignoreLicenseOverride>
-=======
- <license.ignoreMissingEmbeddedLicense>3.4.13</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.4.13</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1645,12 +1566,7 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedNotice>5.5.0</license.ignoreMissingEmbeddedNotice>
-=======
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
@@ -1661,36 +1577,7 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<properties>
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
<license.ignoreMissingEmbeddedNotice>5.6.0</license.ignoreMissingEmbeddedNotice>
-=======
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
- <!-- io.projectreactor.netty:reactor-netty-http uses ALv2 license and has no notice -->
- <supplement>
- <project>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.0.14</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.14</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
-
- <!-- io.projectreactor.netty:reactor-netty-http-brave uses ALv2 license and has no notice -->
- <supplement>
- <project>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http-brave</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.0.7</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.0.7</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
index 78d9cde..d61dde1 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
@@ -61,12 +61,9 @@
break;
case ALTERNATE_LICENSE_FILE:
case ALTERNATE_NOTICE_FILE:
-<<<<<<< HEAD (719a3a [ASTERIXDB-2950][COMP] Improve error message on type mismatc)
case ON_MULTIPLE_EMBEDDED_NOTICE:
case ON_MULTIPLE_EMBEDDED_LICENSE:
-=======
boolean found = false;
->>>>>>> BRANCH (69d550 [NO ISSUE]: update azure dependencies)
for (String spec : StringUtils.split(value, ",")) {
String[] specSplit = StringUtils.split(spec, ":");
if (specSplit.length != 2) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
Gerrit-Change-Number: 14963
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
Gerrit-Change-Number: 14963
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Ali Alsuliman <al...@gmail.com>
Gerrit-Reviewer: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Murtadha Al Hubail <mh...@uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Comment-Date: Mon, 24 Jan 2022 22:21:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[neo]: Merge branch 'gerrit/stabilization-5e11053887'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963 )
Change subject: Merge branch 'gerrit/stabilization-5e11053887'
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12906/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14963
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27
Gerrit-Change-Number: 14963
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Hussain Towaileb <hu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Comment-Date: Mon, 24 Jan 2022 16:21:28 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment