>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17652 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat'
Change-Id: Ibc4d62ded50996c714419d90dadb833c5866dec0
---
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
3 files changed, 60 insertions(+), 74 deletions(-)
Approvals:
Jenkins: Verified; Verified
Michael Blow: Looks good to me, approved
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 2300c92..6a0f8d0 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -160,9 +160,9 @@
<artifactId>netty-transport</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -172,9 +172,9 @@
<artifactId>netty-transport-classes-epoll</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -184,9 +184,9 @@
<artifactId>netty-transport-native-unix-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -196,9 +196,9 @@
<artifactId>netty-codec</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -208,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.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -220,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.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -232,9 +232,9 @@
<artifactId>netty-codec-socks</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -244,9 +244,9 @@
<artifactId>netty-handler</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -256,9 +256,9 @@
<artifactId>netty-handler-proxy</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -268,9 +268,9 @@
<artifactId>netty-buffer</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -280,9 +280,9 @@
<artifactId>netty-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -292,9 +292,9 @@
<artifactId>netty-codec-http</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -304,9 +304,9 @@
<artifactId>netty-resolver</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -316,9 +316,9 @@
<artifactId>netty-resolver-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -328,9 +328,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.87.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 7fddb6f..76f7b10 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,7 +76,7 @@
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.14.1</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
- <netty.version>4.1.87.Final</netty.version>
+ <netty.version>4.1.94.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -88,66 +88,41 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
-<<<<<<< HEAD (35c42a [NO ISSUE][*DB]: Update Azure blob library)
<version>${netty.version}</version>
</dependency>
<dependency>
@@ -164,9 +139,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>junit</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17652
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ibc4d62ded50996c714419d90dadb833c5866dec0
Gerrit-Change-Number: 17652
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
