You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/06/01 19:20:02 UTC
[3/3] asterixdb git commit: Merge commit
'e2a536e986f3966d8dd7598e9f0d8c281e41352e' from release-0.9.4-pre-rc
Merge commit 'e2a536e986f3966d8dd7598e9f0d8c281e41352e' from release-0.9.4-pre-rc
Change-Id: I130fe8651cd3787b588044b35e8f3473350ecb3b
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/6012a893
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/6012a893
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/6012a893
Branch: refs/heads/master
Commit: 6012a8932e1983d010bd89609c8f604c74f339cc
Parents: 13632a7 e2a536e
Author: Michael Blow <mb...@apache.org>
Authored: Fri Jun 1 12:14:31 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Fri Jun 1 12:14:31 2018 -0400
----------------------------------------------------------------------
asterixdb/asterix-server/pom.xml | 4 +
.../appended-resources/supplemental-models.xml | 1 +
...om_netty_netty_netty-4.1.25.Final_NOTICE.txt | 223 +++++++++++++++++++
.../api/job/resource/ClusterCapacity.java | 4 +-
.../hyracks/maven/license/ArtifactSpec.java | 69 ++++++
.../hyracks/maven/license/GenerateFileMojo.java | 41 ++--
.../hyracks/maven/license/LicenseMojo.java | 30 ++-
.../hyracks/maven/license/LicenseSpec.java | 46 +---
.../hyracks/maven/license/NoticeSpec.java | 49 ++++
.../apache/hyracks/maven/license/Override.java | 7 +
.../hyracks/maven/license/ProjectFlag.java | 2 +
11 files changed, 404 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6012a893/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --cc asterixdb/asterix-server/pom.xml
index 7507118,dc2df67..ee0b669
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@@ -168,6 -168,10 +168,10 @@@
<gav>org.codehaus.mojo.appassembler:appassembler-model:2.0.0</gav>
<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>
<license>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6012a893/asterixdb/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index 56176ec,c4bdd06..6708f82
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -160,8 -160,9 +160,9 @@@
<artifactId>netty-all</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <license.ignoreMissingEmbeddedLicense>4.1.6.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.6.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.6.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.25.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.25.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.25.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6012a893/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
----------------------------------------------------------------------
diff --cc asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
index 0000000,0000000..f973663
new file mode 100644
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.25.Final_NOTICE.txt
@@@ -1,0 -1,0 +1,223 @@@
++
++ The Netty Project
++ =================
++
++Please visit the Netty web site for more information:
++
++ * http://netty.io/
++
++Copyright 2014 The Netty Project
++
++The Netty Project 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.
++
++Also, please refer to each LICENSE.<component>.txt file, which is located in
++the 'license' directory of the distribution file, for the license terms of the
++components that this product depends on.
++
++-------------------------------------------------------------------------------
++This product contains the extensions to Java Collections Framework which has
++been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
++
++ * LICENSE:
++ * license/LICENSE.jsr166y.txt (Public Domain)
++ * HOMEPAGE:
++ * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
++ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
++
++This product contains a modified version of Robert Harder's Public Domain
++Base64 Encoder and Decoder, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.base64.txt (Public Domain)
++ * HOMEPAGE:
++ * http://iharder.sourceforge.net/current/java/base64/
++
++This product contains a modified portion of 'Webbit', an event based
++WebSocket and HTTP server, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.webbit.txt (BSD License)
++ * HOMEPAGE:
++ * https://github.com/joewalnes/webbit
++
++This product contains a modified portion of 'SLF4J', a simple logging
++facade for Java, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.slf4j.txt (MIT License)
++ * HOMEPAGE:
++ * http://www.slf4j.org/
++
++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:
++ * http://archive.apache.org/dist/harmony/
++
++This product contains a modified portion of 'jbzip2', a Java bzip2 compression
++and decompression library written by Matthew J. Francis. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.jbzip2.txt (MIT License)
++ * HOMEPAGE:
++ * https://code.google.com/p/jbzip2/
++
++This product contains a modified portion of 'libdivsufsort', a C API library to construct
++the suffix array and the Burrows-Wheeler transformed string for any input string of
++a constant-size alphabet written by Yuta Mori. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.libdivsufsort.txt (MIT License)
++ * HOMEPAGE:
++ * https://github.com/y-256/libdivsufsort
++
++This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
++ which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.jctools.txt (ASL2 License)
++ * HOMEPAGE:
++ * https://github.com/JCTools/JCTools
++
++This product optionally depends on 'JZlib', a re-implementation of zlib in
++pure Java, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.jzlib.txt (BSD style License)
++ * HOMEPAGE:
++ * http://www.jcraft.com/jzlib/
++
++This product optionally depends on 'Compress-LZF', a Java library for encoding and
++decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.compress-lzf.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * https://github.com/ning/compress
++
++This product optionally depends on 'lz4', a LZ4 Java compression
++and decompression library written by Adrien Grand. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.lz4.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * https://github.com/jpountz/lz4-java
++
++This product optionally depends on 'lzma-java', a LZMA Java compression
++and decompression library, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.lzma-java.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * https://github.com/jponge/lzma-java
++
++This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
++and decompression library written by William Kinney. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.jfastlz.txt (MIT License)
++ * HOMEPAGE:
++ * https://code.google.com/p/jfastlz/
++
++This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
++interchange format, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.protobuf.txt (New BSD License)
++ * HOMEPAGE:
++ * https://github.com/google/protobuf
++
++This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
++a temporary self-signed X.509 certificate when the JVM does not provide the
++equivalent functionality. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.bouncycastle.txt (MIT License)
++ * HOMEPAGE:
++ * http://www.bouncycastle.org/
++
++This product optionally depends on 'Snappy', a compression library produced
++by Google Inc, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.snappy.txt (New BSD License)
++ * HOMEPAGE:
++ * https://github.com/google/snappy
++
++This product optionally depends on 'JBoss Marshalling', an alternative Java
++serialization API, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
++ * HOMEPAGE:
++ * http://www.jboss.org/jbossmarshalling
++
++This product optionally depends on 'Caliper', Google's micro-
++benchmarking framework, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.caliper.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * https://github.com/google/caliper
++
++This product optionally depends on 'Apache Commons Logging', a logging
++framework, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.commons-logging.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * http://commons.apache.org/logging/
++
++This product optionally depends on 'Apache Log4J', a logging framework, which
++can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.log4j.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * http://logging.apache.org/log4j/
++
++This product optionally depends on 'Aalto XML', an ultra-high performance
++non-blocking XML processor, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.aalto-xml.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * http://wiki.fasterxml.com/AaltoHome
++
++This product contains a modified version of 'HPACK', a Java implementation of
++the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.hpack.txt (Apache License 2.0)
++ * HOMEPAGE:
++ * https://github.com/twitter/hpack
++
++This product contains a modified portion of 'Apache Commons Lang', a Java library
++provides utilities for the java.lang API, which can be obtained at:
++
++ * LICENSE:
++ * license/LICENSE.commons-lang.txt (Apache License 2.0)
++ * 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