Return-Path: X-Original-To: apmail-metron-commits-archive@minotaur.apache.org Delivered-To: apmail-metron-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E0AA118E60 for ; Tue, 22 Mar 2016 16:23:24 +0000 (UTC) Received: (qmail 46914 invoked by uid 500); 22 Mar 2016 16:23:24 -0000 Delivered-To: apmail-metron-commits-archive@metron.apache.org Received: (qmail 46891 invoked by uid 500); 22 Mar 2016 16:23:24 -0000 Mailing-List: contact commits-help@metron.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.incubator.apache.org Delivered-To: mailing list commits@metron.incubator.apache.org Received: (qmail 46769 invoked by uid 99); 22 Mar 2016 16:23:24 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2016 16:23:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id EFF7D180462 for ; Tue, 22 Mar 2016 16:23:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id T53QpUdgUT2M for ; Tue, 22 Mar 2016 16:23:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 9FD845F245 for ; Tue, 22 Mar 2016 16:23:22 +0000 (UTC) Received: (qmail 46296 invoked by uid 99); 22 Mar 2016 16:23:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2016 16:23:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 13717DFFF0; Tue, 22 Mar 2016 16:23:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cestella@apache.org To: commits@metron.incubator.apache.org Message-Id: <450abe82d3954dd6a0ab2ed4fda553a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-metron git commit: METRON-84 Update license/notices with appropriate 3rd party bundled notices closes apache/incubator-metron#57 Date: Tue, 22 Mar 2016 16:23:22 +0000 (UTC) Repository: incubator-metron Updated Branches: refs/heads/master e5dbec576 -> 379c9522a METRON-84 Update license/notices with appropriate 3rd party bundled notices closes apache/incubator-metron#57 Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/379c9522 Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/379c9522 Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/379c9522 Branch: refs/heads/master Commit: 379c9522ac284ade801412d22730e8ed69872cd9 Parents: e5dbec5 Author: cestella Authored: Tue Mar 22 12:23:16 2016 -0400 Committer: cstella Committed: Tue Mar 22 12:23:16 2016 -0400 ---------------------------------------------------------------------- LICENSE | 20 +++++++++++++ metron-ui/lib/public/vendor/LICENSE.json | 6 ++-- notices_dumper.py | 42 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/379c9522/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 5c304d1..9b674e3 100644 --- a/LICENSE +++ b/LICENSE @@ -199,3 +199,23 @@ Apache License 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 product bundles filesaver 2013-01-23, which is available under a "MIT" license. +This product bundles angular-dragdrop 1.0.4, which is available under a "MIT" license. +This product bundles modernizr 2.6.1, which is available under a "MIT" license. +This product bundles bindonce 0.2.1, which is available under a "MIT" license. +This product bundles moment 2.1.0, which is available under a "MIT" license. +This product bundles jquery-ui 1.10.3, which is available under a "MIT" license. +This product bundles angular 1.1.5, which is available under a "MIT" license. +This product bundles jquery 1.8.0, which is available under a "MIT" license. +This product bundles elasticjs 1.1.1, which is available under a "MIT" license. +This product bundles angular-strap 0.7.5, which is available under a "MIT" license. +This product bundles lodash 2.4.1, which is available under a "MIT" license. +This product bundles require 2.1.8, which is available under a "MIT" license. +This product bundles flot 0.8.1, which is available under a "MIT" license. +This product bundles leaflet 0.6, which is available under a "2-Clause BSD" license. +This product bundles jvectormap 1.2.2, which is available under a "MIT" license. +This product bundles timepicker 0.2.6, which is available under a "MIT" license. +This product bundles blob 2013-06-20, which is available under a "MIT" license. +This product bundles numeral 1.5.2, which is available under a "MIT" license. +This product bundles chromath 0.0.5, which is available under a "MIT" license. http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/379c9522/metron-ui/lib/public/vendor/LICENSE.json ---------------------------------------------------------------------- diff --git a/metron-ui/lib/public/vendor/LICENSE.json b/metron-ui/lib/public/vendor/LICENSE.json index 2adbae2..2c3318f 100755 --- a/metron-ui/lib/public/vendor/LICENSE.json +++ b/metron-ui/lib/public/vendor/LICENSE.json @@ -77,14 +77,14 @@ }, "lodash": { "version":"2.4.1", - "license":"https://github.com/lodash/lodash/blob/2.4.1/LICENSE.txt" + "license":"MIT" }, "leaflet": { "version":"0.6", - "license":"https://github.com/Leaflet/Leaflet/blob/v0.6/LICENSE" + "license":"2-Clause BSD" }, "jvectormap": { "version":"1.2.2", "license":"MIT" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/379c9522/notices_dumper.py ---------------------------------------------------------------------- diff --git a/notices_dumper.py b/notices_dumper.py new file mode 100644 index 0000000..00ad80b --- /dev/null +++ b/notices_dumper.py @@ -0,0 +1,42 @@ + +# 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. + +import json +import sys + +def merge_dicts(*dict_args): + result = {} + for dictionary in dict_args: + result.update(dictionary) + return result + +def get_statement(component, version, license): + #This product bundles SuperWidget 1.2.3, which is available under a + #"3-clause BSD" license. + s = "This product bundles " + component + " " + version \ + + ", which is available under a \"" + license + "\" license." + return s + +licenses = {} +for i in xrange(1, len(sys.argv)): + with open(sys.argv[i]) as f: + license_summary = f.read() + licenses = merge_dicts(licenses, json.loads(license_summary)) +for component, value in licenses.iteritems(): + if not(value['license'].startswith("Apache")): + print get_statement(component, value['version'], value['license']) +