>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17272 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Merge branch 'gerrit/mad-hatter'
Change-Id: I040680f9652d56d4691923d1e2c9e6f0371994b5
---
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
3 files changed, 27 insertions(+), 18 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 5b61f26..8458724 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -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.73.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.84.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.73.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -280,10 +280,9 @@
<artifactId>netty-resolver</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (bbd01f Merge branch 'mad-hatter' into 'cheshire-cat')
-
<license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
+
<license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense>
+
<license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
+
<license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -293,10 +292,6 @@
<artifactId>netty-resolver-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-
<license.ignoreMissingEmbeddedLicense>4.1.78.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.78.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.78.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
@@ -312,7 +307,6 @@
<license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (ed1792 Merge branch 'gerrit/stabilization-5949a1cb71')
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index c49597f..1ca6b2a 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -121,17 +121,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
- <version>4.1.78.Final</version>
+ <version>4.1.84.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
- <version>4.1.78.Final</version>
+ <version>4.1.84.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.78.Final</version>
+ <version>4.1.84.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17272
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: I040680f9652d56d4691923d1e2c9e6f0371994b5
Gerrit-Change-Number: 17272
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
