Repository: incubator-impala Updated Branches: refs/heads/branch-2.7.0 fb646d1b0 -> 53439d3d8
IMPALA-4110, IMPALA-3853: npm.js uses Artistic License 2. The comments on https://issues.apache.org/jira/browse/LEGAL-64 seem to indicate that Artistic License might not be allowed in ASF projects. Bootstrap distributes it, and Bootstrap itself is MIT-licensed, but that doesn't mean ASF projects can distribute npm.js. Change-Id: I4bcbeeb6e8552894803315967b95f365227d7505 Reviewed-on: http://gerrit.cloudera.org:8080/4438 Reviewed-by: Jim Apple <jbap...@cloudera.com> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/53439d3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/53439d3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/53439d3d Branch: refs/heads/branch-2.7.0 Commit: 53439d3d8cdca2dd1ca2cdf2c36c6a7ef101f7e3 Parents: fb646d1 Author: Jim Apple <jbap...@cloudera.com> Authored: Thu Sep 15 14:56:55 2016 -0700 Committer: Jim Apple <jbap...@cloudera.com> Committed: Sat Sep 17 09:32:17 2016 -0700 ---------------------------------------------------------------------- LICENSE.txt | 11 ++++++++--- bin/rat_exclude_files.txt | 10 ++++++++-- tests/comparison/leopard/static/js/npm.js | 13 ------------- .../leopard/templates/custom_run.template | 18 ++++++++++++++++++ tests/comparison/leopard/templates/index.template | 18 ++++++++++++++++++ .../comparison/leopard/templates/report.template | 18 ++++++++++++++++++ www/bootstrap/js/npm.js | 13 ------------- 7 files changed, 70 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 5bfaff0..98ac0d8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -428,9 +428,12 @@ Parts of be/src/util/coding-util.cc: Boost Software License V1.0 -------------------------------------------------------------------------------- -www/bootstrap: MIT license -tests/comparison/leopard/static/css/bootstrap.*: MIT license -tests/comparison/leopard/static/js/bootstrap.*: MIT license +www/bootstrap/css/bootstrap*: MIT license +www/bootstrap/js/bootstrap*: MIT license +www/bootstrap/fonts/glyphicons-halflings*: MIT license +tests/comparison/leopard/static/css/bootstrap*: MIT license +tests/comparison/leopard/static/js/bootstrap*: MIT license +tests/comparison/leopard/static/fonts/glyphicons-halflings*: MIT license The MIT License (MIT) @@ -456,6 +459,8 @@ tests/comparison/leopard/static/js/bootstrap.*: MIT license -------------------------------------------------------------------------------- www/highlight: 3-clause BSD +tests/comparison/leopard/static/css/hljs.css: 3-clause BSD +tests/comparison/leopard/static/js/highlight.pack.js: 3-clause BSD Copyright (c) 2006, Ivan Sagalaev All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/bin/rat_exclude_files.txt ---------------------------------------------------------------------- diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt index d6a58f6..2a07b68 100644 --- a/bin/rat_exclude_files.txt +++ b/bin/rat_exclude_files.txt @@ -25,14 +25,20 @@ be/src/gutil/* www/highlight/* www/DataTables*/* www/datatables.* -www/bootstrap/* +www/bootstrap/css/bootstrap* +www/bootstrap/fonts/glyphicons-halflings* +www/bootstrap/js/bootstrap* tests/comparison/leopard/static/css/bootstrap* +tests/comparison/leopard/static/fonts/glyphicons-halflings* tests/comparison/leopard/static/js/bootstrap* shell/ext-py/prettytable-0.7.1/* shell/ext-py/sqlparse-0.1.14/* shell/ext-py/sasl-0.1.1/* www/d3.v3.min.js www/jquery/jquery-1.12.4.min.js +tests/comparison/leopard/static/css/hljs.css +tests/comparison/leopard/static/js/highlight.pack.js + # http://www.apache.org/legal/src-headers.html: "Short informational text files; for # example README, INSTALL files. The expectation is that these files make it obvious which @@ -85,7 +91,7 @@ tests/shell/test_close_queries.sql tests/shell/test_file_comments.sql tests/shell/test_file_no_comments.sql tests/shell/test_var_substitution.sql - +tests/comparison/leopard/static/favicon.ico # Generated by Apache-licensed software: be/src/transport/config.h http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/tests/comparison/leopard/static/js/npm.js ---------------------------------------------------------------------- diff --git a/tests/comparison/leopard/static/js/npm.js b/tests/comparison/leopard/static/js/npm.js deleted file mode 100644 index bf6aa80..0000000 --- a/tests/comparison/leopard/static/js/npm.js +++ /dev/null @@ -1,13 +0,0 @@ -// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. -require('../../js/transition.js') -require('../../js/alert.js') -require('../../js/button.js') -require('../../js/carousel.js') -require('../../js/collapse.js') -require('../../js/dropdown.js') -require('../../js/modal.js') -require('../../js/tooltip.js') -require('../../js/popover.js') -require('../../js/scrollspy.js') -require('../../js/tab.js') -require('../../js/affix.js') \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/tests/comparison/leopard/templates/custom_run.template ---------------------------------------------------------------------- diff --git a/tests/comparison/leopard/templates/custom_run.template b/tests/comparison/leopard/templates/custom_run.template index 8c2afe7..36a530b 100644 --- a/tests/comparison/leopard/templates/custom_run.template +++ b/tests/comparison/leopard/templates/custom_run.template @@ -1,4 +1,22 @@ <!DOCTYPE html> +<!-- +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. +--> <html lang="en"> <head> <meta charset="utf-8"> http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/tests/comparison/leopard/templates/index.template ---------------------------------------------------------------------- diff --git a/tests/comparison/leopard/templates/index.template b/tests/comparison/leopard/templates/index.template index 387e62a..9cb1c17 100644 --- a/tests/comparison/leopard/templates/index.template +++ b/tests/comparison/leopard/templates/index.template @@ -1,4 +1,22 @@ <!DOCTYPE html> +<!-- +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. +--> <html lang="en"> <head> <meta charset="utf-8"> http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/tests/comparison/leopard/templates/report.template ---------------------------------------------------------------------- diff --git a/tests/comparison/leopard/templates/report.template b/tests/comparison/leopard/templates/report.template index ea74db1..b967f1c 100644 --- a/tests/comparison/leopard/templates/report.template +++ b/tests/comparison/leopard/templates/report.template @@ -1,4 +1,22 @@ <!DOCTYPE html> +<!-- +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. +--> <html lang="en"> <head> <meta charset="utf-8"> http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/53439d3d/www/bootstrap/js/npm.js ---------------------------------------------------------------------- diff --git a/www/bootstrap/js/npm.js b/www/bootstrap/js/npm.js deleted file mode 100644 index bf6aa80..0000000 --- a/www/bootstrap/js/npm.js +++ /dev/null @@ -1,13 +0,0 @@ -// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. -require('../../js/transition.js') -require('../../js/alert.js') -require('../../js/button.js') -require('../../js/carousel.js') -require('../../js/collapse.js') -require('../../js/dropdown.js') -require('../../js/modal.js') -require('../../js/tooltip.js') -require('../../js/popover.js') -require('../../js/scrollspy.js') -require('../../js/tab.js') -require('../../js/affix.js') \ No newline at end of file
