This is an automated email from the ASF dual-hosted git repository.

nwang 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 a383bc8  Clean up license for healthHandler and jarjar help.txt (#3377)
a383bc8 is described below

commit a383bc894e052eea7a1473dc5577471155572056
Author: Ning Wang <[email protected]>
AuthorDate: Thu Oct 24 17:29:56 2019 -0700

    Clean up license for healthHandler and jarjar help.txt (#3377)
---
 LICENSE                                |   3 +-
 LICENSE => licenses/LICENSE-jarjar.txt | 123 +--------------------------------
 2 files changed, 2 insertions(+), 124 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0498e42..3c18e55 100644
--- a/LICENSE
+++ b/LICENSE
@@ -248,10 +248,9 @@ See project link for details.
       -> scripts/packages/tests_template_bin.sh
       -> scripts/packages/bin_common.sh
       -> third_party/java/bazel/extra_actions_base.proto
-    Google
+    jarjar(https://github.com/google/jarjar/blob/master/LICENSE)
       -> 
third_party/java/jarjar/src/main/resources/com/tonicsystems/jarjar/help.txt
 
-
 ========================================================================
 Third party MIT licenses
 ========================================================================
diff --git a/LICENSE b/licenses/LICENSE-jarjar.txt
similarity index 64%
copy from LICENSE
copy to licenses/LICENSE-jarjar.txt
index 0498e42..d645695 100644
--- a/LICENSE
+++ b/licenses/LICENSE-jarjar.txt
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,125 +200,3 @@
    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.
-
-
-============================================================================
-   APACHE HERON SUBCOMPONENTS:
-
-   The Apache Heron project contains subcomponents with separate copyright
-   notices and license terms. Your use of the source code for the these
-   subcomponents is subject to the terms and conditions of the following
-   licenses.
-
-========================================================================
-Third party Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache 2.0 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
-    
k8s-zookeeper-docker(https://github.com/muxinc/k8s-zookeeper-docker/blob/master/LICENSE)
-      -> docker/base/scripts/generate-zookeeper-config.sh
-    
bazel_rules_pex(v0.3.0,https://github.com/benley/bazel_rules_pex/blob/master/LICENSE.txt)
-      -> tools/rules/pex/pex_rules.bzl
-      -> tools/rules/pex/wrapper/pex_wrapper.py
-    bazel_authors(https://github.com/bazelbuild/bazel/blob/master/LICENSE)
-      -> scripts/setup-eclipse.sh
-      -> scripts/detect_os_type.sh
-      -> scripts/get_all_heron_paths.sh
-      -> scripts/packages/template_bin.sh
-      -> scripts/packages/self_extract_binary.bzl
-      -> scripts/packages/package_info_generator.sh
-      -> scripts/packages/tests_template_bin.sh
-      -> scripts/packages/bin_common.sh
-      -> third_party/java/bazel/extra_actions_base.proto
-    Google
-      -> 
third_party/java/jarjar/src/main/resources/com/tonicsystems/jarjar/help.txt
-
-
-========================================================================
-Third party MIT licenses
-========================================================================
-
-The following components are provided under the MIT License. See project link 
for details.
-
-    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
-    Docusaurus(v1.13.0, 
https://github.com/facebook/docusaurus/blob/master/LICENSE)
-      -> website2/website/core/Footer.js
-      -> website2/website/siteConfig.js
-      -> website2/website/pages/en/users.js
-      -> website2/website/pages/en/index.js
-      -> website2/website/pages/en/help.js
-      -> website2/website/pages/en/versions.js
-    Sizzle(https://github.com/jquery/sizzle/blob/master/LICENSE.txt)
-      -> heron/shell/assets/jquery.js
-    Modernizr(http://www.modernizr.com)
-      -> heron/tools/ui/resources/static/js/bootstrap.js
-
-========================================================================
-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/*
-
-

Reply via email to