You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by nl...@apache.org on 2018/10/09 20:54:24 UTC
[incubator-heron] branch master updated: Nwang/update thirdparty
license (#3042)
This is an automated email from the ASF dual-hosted git repository.
nlu90 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 3866944 Nwang/update thirdparty license (#3042)
3866944 is described below
commit 38669441ae934fdd53d15d51acd64db2602ec06a
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Tue Oct 9 13:54:18 2018 -0700
Nwang/update thirdparty license (#3042)
* Update thrift party licenses in LICENSE
* clean up
---
LICENSE | 90 ++++++++++++++++++++---
docker/base/scripts/generate-zookeeper-config.sh | 14 ++--
heronpy/api/cloudpickle.py | 16 -----
release/maven/maven-pom-version.sh | 2 -
third_party/gtest/gtest.BUILD | 91 +-----------------------
tools/rules/build_defs.bzl | 25 ++++---
6 files changed, 101 insertions(+), 137 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8769d29..cb67dd0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -214,21 +214,89 @@ Third party Apache 2.0 licenses
========================================================================
The following components are provided under the Apache 2.0 License.
-See project link for details. The text of each license is also included
-at licenses/LICENSE-[project].txt.
-
- (ALv2 License) React (https://github.com/facebook/react/blob/0.10-stable/LICENSE)
- (ALv2 License) Bootstrap(v2.2.2)
- (ALv2 License) Bootstrap(v3.0.0)
- (ALv2 License) JQuery(https://jquery.org/license/)
+See project link for details.
+
+ Bootstrap(v2.0.3, https://github.com/twbs/bootstrap/blob/v2.0.3/LICENSE)
+ -> heron/shell/assets/bootstrap.css
+ Bootstrap(v2.2.2, https://github.com/twbs/bootstrap/blob/v2.2.2/LICENSE)
+ -> heron/tools/ui/resources/static/js/bootstrap.js
+ Bootstrap(v3.0.0, https://github.com/twbs/bootstrap/blob/v3.0.0/LICENSE)
+ -> heron/tools/ui/resources/static/css/bootstrap.css
+ JQuery(https://jquery.org/license/)
+ -> heron/shell/assets/jquery.js
+ -> heron/tools/ui/resources/static/js/jquery.min.js
+ JSXTransformer(v0.10.0)
+ -> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
+ React (v0.10.0, https://github.com/facebook/react/blob/0.10-stable/LICENSE)
+ -> heron/tools/ui/resources/static/js/react.0.10.0.js
+ bazel_jar_jar(https://github.com/johnynek/bazel_jar_jar/blob/master/LICENSE)
+ -> tools/rules/jarjar_rules.bzl
+ gerrit(https://gerrit.googlesource.com/gerrit/+/master/COPYING)
+ -> tools/rules/javadoc.bzl
+ heronpy(Copyright - Parsely, Inc.)
+ -> heronpy/api/bolt/base_bolt.py
+ -> heronpy/api/bolt/bolt.py
+ -> heronpy/api/bolt/base_component.py
+ -> heronpy/api/bolt/base_spout.py
+ -> heronpy/api/bolt/stream.py
+ -> heronpy/api/bolt/generator.py
+ -> heronpy/api/bolt/transformoperator.py
+ k8s-zookeeper-docker(https://github.com/muxinc/k8s-zookeeper-docker/blob/master/LICENSE)
+ -> docker/base/scripts/generate-zookeeper-config.sh
========================================================================
-MIT licenses
+Third party MIT licenses
========================================================================
The following components are provided under the MIT License. See project link for details.
-The text of each license is also included at licenses/LICENSE-[project].txt.
- (MIT License) Bootstrap(v3.1.1) (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- (MIT License) JQuery (https://jquery.org/license/)
+ Bootstrap(v3.1.1, https://github.com/twbs/bootstrap/blob/v3.1.1/LICENSE)
+ -> heron/tools/ui/resources/static/js/bootstrap.min.js
+ -> heron/tools/ui/resources/static/css/bootstrap.min.css
+ -> heron/tools/ui/resources/static/fonts/glyphicons-halflings-regular.{eot, svg, ttf, woff}
+ JSXTransformer(v0.10.0, https://github.com/cronn-de/jsxtransformer/blob/master/LICENSE)
+ -> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
+ Underscore.js(v1.6.0, https://github.com/jashkenas/underscore/blob/master/LICENSE)
+ -> heron/tools/ui/resources/static/js/underscore-min.1.6.0.js
+ -> heron/tools/ui/resources/static/js/underscore-min.map
+ d3-tip(v0.6.3, https://github.com/Caged/d3-tip/blob/master/LICENSE)
+ -> heron/tools/ui/resources/static/js/d3-tip.min.0.6.3.js
+ html5shiv(v3.6.2pre, https://github.com/aFarkas/html5shiv/blob/master/MIT%20and%20GPL2%20licenses.md)
+ -> heron/tools/ui/resources/static/js/html5-trunk.js
+ jQuery UI(v1.8.23, https://github.com/jquery/jquery-ui/blob/master/LICENSE.txt)
+ -> heron/tools/ui/resources/static/js/jquery-ui-1.8.23.custom.min.js
+ list.js(v1.1.1, https://github.com/javve/list.js/blob/master/LICENSE)
+ -> heron/tools/ui/resources/static/js/list.min.1.1.1.js
+ moment(v2.8.3, https://github.com/moment/moment/blob/develop/LICENSE)
+ -> heron/tools/ui/resources/static/js/moment.min.2.8.3.js
+ normalize.css(v2.1.0, v3.0.1, https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ -> heron/tools/ui/resources/static/css/bootstrap.css
+ -> heron/tools/ui/resources/static/css/bootstrap.min.css
+
+========================================================================
+Third party BSD 3-Clause licenses
+========================================================================
+
+The following components are provided under the BSD 3-Clause license.
+See project link for details.
+
+ JSXTransformer(v0.10.0)
+ -> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
+ autogen.sh
+ -> config/autogen.sh
+ cloudpickle(https://github.com/cloudpipe/cloudpickle/blob/master/LICENSE)
+ -> heronpy/api/cloudpickle.py
+ cpplint(https://github.com/cpplint/cpplint/blob/master/LICENSE)
+ -> third_party/python/cpplint/cpplint.py
+ d3(v3.4.11, https://github.com/d3/d3/blob/master/LICENSE)
+ -> heron/tools/ui/resources/static/js/d3.min.3.4.11.js
+
+========================================================================
+Third party Boost Software License, Version 1.0 licenses
+========================================================================
+
+The following components are provided under the Boost Software License, Version 1.0.
+See project link for details.
+ kashmir(https://github.com/Corvusoft/kashmir-dependency/blob/master/LICENSE_1_0.txt)
+ -> third_party/kashmir/*
diff --git a/docker/base/scripts/generate-zookeeper-config.sh b/docker/base/scripts/generate-zookeeper-config.sh
index 5f14212..02febd1 100644
--- a/docker/base/scripts/generate-zookeeper-config.sh
+++ b/docker/base/scripts/generate-zookeeper-config.sh
@@ -51,7 +51,7 @@ function validate_env() {
echo "ZK_REPLICAS is a mandatory environment variable"
exit 1
fi
-
+
if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
NAME=${BASH_REMATCH[1]}
ORD=${BASH_REMATCH[2]}
@@ -98,8 +98,8 @@ function create_config() {
echo "maxSessionTimeout=$ZK_MAX_SESSION_TIMEOUT" >> $ZK_CONFIG_FILE
echo "autopurge.snapRetainCount=$ZK_SNAP_RETAIN_COUNT" >> $ZK_CONFIG_FILE
echo "autopurge.purgeInteval=$ZK_PURGE_INTERVAL" >> $ZK_CONFIG_FILE
-
- if [ $ZK_REPLICAS -gt 1 ]; then
+
+ if [ $ZK_REPLICAS -gt 1 ]; then
print_servers >> $ZK_CONFIG_FILE
fi
echo "Wrote ZooKeeper configuration file to $ZK_CONFIG_FILE"
@@ -108,17 +108,17 @@ function create_config() {
function create_data_dirs() {
echo "Creating ZooKeeper data directories and setting permissions"
if [ ! -d $ZK_DATA_DIR ]; then
- mkdir -p $ZK_DATA_DIR
+ mkdir -p $ZK_DATA_DIR
chown -R $ZK_USER:$ZK_USER $ZK_DATA_DIR
fi
-
+
if [ ! -d $ZK_DATA_LOG_DIR ]; then
mkdir -p $ZK_DATA_LOG_DIR
chown -R $ZK_USER:$ZK_USER $ZK_DATA_LOG_DIR
fi
-
+
if [ ! -d $ZK_LOG_DIR ]; then
- mkdir -p $ZK_LOG_DIR
+ mkdir -p $ZK_LOG_DIR
chown -R $ZK_USER:$ZK_USER $ZK_LOG_DIR
fi
if [ ! -f $ID_FILE ]; then
diff --git a/heronpy/api/cloudpickle.py b/heronpy/api/cloudpickle.py
index dde0b4b..f49b7e1 100644
--- a/heronpy/api/cloudpickle.py
+++ b/heronpy/api/cloudpickle.py
@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF 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.
"""
This class is defined to override standard pickle functionality
The goals of it follow:
diff --git a/release/maven/maven-pom-version.sh b/release/maven/maven-pom-version.sh
index 5dec908..3816896 100755
--- a/release/maven/maven-pom-version.sh
+++ b/release/maven/maven-pom-version.sh
@@ -1,6 +1,4 @@
#!/bin/bash
-# Copyright 2015 The Bazel Authors. All rights reserved.
-#
# Licensed 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
diff --git a/third_party/gtest/gtest.BUILD b/third_party/gtest/gtest.BUILD
index 266f4fb..6a0933a 100644
--- a/third_party/gtest/gtest.BUILD
+++ b/third_party/gtest/gtest.BUILD
@@ -1,41 +1,7 @@
-# Copyright 2017 Google Inc.
-# All Rights Reserved.
-#
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: misterg@google.com (Gennadiy Civil)
-#
-# Bazel Build for Google C++ Testing Framework(Google Test)
+licenses(["notice"])
package(default_visibility = ["//visibility:public"])
-licenses(["notice"])
-
# Google Test including Google Mock
cc_library(
name = "gtest",
@@ -73,58 +39,3 @@ cc_library(
],
deps = ["//:gtest"],
)
-
-# The following rules build samples of how to use gTest.
-cc_library(
- name = "gtest_sample_lib",
- srcs = [
- "googletest/samples/sample1.cc",
- "googletest/samples/sample2.cc",
- "googletest/samples/sample4.cc",
- ],
- hdrs = [
- "googletest/samples/prime_tables.h",
- "googletest/samples/sample1.h",
- "googletest/samples/sample2.h",
- "googletest/samples/sample3-inl.h",
- "googletest/samples/sample4.h",
- ],
-)
-
-cc_test(
- name = "gtest_samples",
- size = "small",
- #All Samples except:
- #sample9 ( main )
- #sample10 (main and takes a command line option and needs to be separate)
- srcs = [
- "googletest/samples/sample1_unittest.cc",
- "googletest/samples/sample2_unittest.cc",
- "googletest/samples/sample3_unittest.cc",
- "googletest/samples/sample4_unittest.cc",
- "googletest/samples/sample5_unittest.cc",
- "googletest/samples/sample6_unittest.cc",
- "googletest/samples/sample7_unittest.cc",
- "googletest/samples/sample8_unittest.cc",
- ],
- deps = [
- "gtest_sample_lib",
- ":gtest_main",
- ],
-)
-
-cc_test(
- name = "sample9_unittest",
- size = "small",
- srcs = ["googletest/samples/sample9_unittest.cc"],
- deps = [":gtest"],
-)
-
-cc_test(
- name = "sample10_unittest",
- size = "small",
- srcs = ["googletest/samples/sample10_unittest.cc"],
- deps = [
- ":gtest",
- ],
-)
diff --git a/tools/rules/build_defs.bzl b/tools/rules/build_defs.bzl
index 8b239d7..e332b41 100644
--- a/tools/rules/build_defs.bzl
+++ b/tools/rules/build_defs.bzl
@@ -1,16 +1,19 @@
-# Copyright (C) 2017 streaml.io .
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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
#
-# Licensed 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
#
-# 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.
+# 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.
"""This file defines constants for the javadoc build"""