Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2681
Change subject: Merge commit 'e2a536e986f3966d8dd7598e9f0d8c281e41352e' from
release-0.9.4-pre-rc
......................................................................
Merge commit 'e2a536e986f3966d8dd7598e9f0d8c281e41352e' from
release-0.9.4-pre-rc
Change-Id: I130fe8651cd3787b588044b35e8f3473350ecb3b
---
M asterixdb/asterix-server/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
R
asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
3 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/81/2681/1
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index b7b27e7..ee0b669 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -169,8 +169,8 @@
<url>https://raw.githubusercontent.com/mojohaus/appassembler/appassembler-2.0.0/LICENSE.txt</url>
</override>
<override>
- <gav>io.netty:netty-all:4.1.6.Final</gav>
-
<noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.16.Final/NOTICE.txt</noticeUrl>
+ <gav>io.netty:netty-all:4.1.25.Final</gav>
+
<noticeUrl>https://raw.githubusercontent.com/netty/netty/netty-4.1.25.Final/NOTICE.txt</noticeUrl>
</override>
</overrides>
<licenses>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 23204d4..6708f82 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -160,14 +160,9 @@
<artifactId>netty-all</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (13632a Merge "Merge commit
'b1767b1577b3a794e7d2740c28d0fae955cd0ef)
<license.ignoreMissingEmbeddedLicense>4.1.25.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.25.Final</license.ignoreMissingEmbeddedNotice>
-=======
-
<license.ignoreMissingEmbeddedLicense>4.1.6.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.6.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.6.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (e2a536 [NO ISSUE] Improve readability of cluster capacities)
+
<license.ignoreNoticeOverride>4.1.25.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.16.Final_NOTICE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
similarity index 95%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.16.Final_NOTICE.txt
rename to
asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
index 92dfd5b..f973663 100644
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.16.Final_NOTICE.txt
+++
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
@@ -42,7 +42,7 @@
* HOMEPAGE:
* http://iharder.sourceforge.net/current/java/base64/
-This product contains a modified portion of 'Webbit', an event based
+This product contains a modified portion of 'Webbit', an event based
WebSocket and HTTP server, which can be obtained at:
* LICENSE:
@@ -61,6 +61,8 @@
This product contains a modified portion of 'Apache Harmony', an open source
Java SE, which can be obtained at:
+ * NOTICE:
+ * license/NOTICE.harmony.txt
* LICENSE:
* license/LICENSE.harmony.txt (Apache License 2.0)
* HOMEPAGE:
@@ -212,3 +214,10 @@
* HOMEPAGE:
* https://commons.apache.org/proper/commons-lang/
+
+This product contains the Maven wrapper scripts from 'Maven Wrapper', that
provides an easy way to ensure a user has everything necessary to run the Maven
build.
+
+ * LICENSE:
+ * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/takari/maven-wrapper
--
To view, visit https://asterix-gerrit.ics.uci.edu/2681
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I130fe8651cd3787b588044b35e8f3473350ecb3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
