From commits-return-9548-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Mar 9 14:10:04 2019 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-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 4DB371955E for ; Sat, 9 Mar 2019 14:10:04 +0000 (UTC) Received: (qmail 80384 invoked by uid 500); 9 Mar 2019 14:10:04 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 80352 invoked by uid 500); 9 Mar 2019 14:10:04 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 80343 invoked by uid 99); 9 Mar 2019 14:10:04 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Mar 2019 14:10:04 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 888A43A2C54 for ; Sat, 9 Mar 2019 14:10:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1855116 - in /jmeter/trunk/licenses/src: holderjs.txt jquery-2.1.3.txt jquery-3.3.1.txt mocha-1.17.1.txt morrisjs-0.5.0.txt raphael-2.1.4.txt Date: Sat, 09 Mar 2019 14:10:03 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190309141003.888A43A2C54@svn01-us-west.apache.org> Author: pmouawad Date: Sat Mar 9 14:10:03 2019 New Revision: 1855116 URL: http://svn.apache.org/viewvc?rev=1855116&view=rev Log: Bug 61879 - Remove useless files in HTML report template Drop licenses for dropped js libs / Updates license for jquery Bugzilla Id: 61879 Added: jmeter/trunk/licenses/src/jquery-3.3.1.txt - copied, changed from r1853321, jmeter/trunk/licenses/src/jquery-2.1.3.txt Removed: jmeter/trunk/licenses/src/holderjs.txt jmeter/trunk/licenses/src/jquery-2.1.3.txt jmeter/trunk/licenses/src/mocha-1.17.1.txt jmeter/trunk/licenses/src/morrisjs-0.5.0.txt jmeter/trunk/licenses/src/raphael-2.1.4.txt Copied: jmeter/trunk/licenses/src/jquery-3.3.1.txt (from r1853321, jmeter/trunk/licenses/src/jquery-2.1.3.txt) URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/src/jquery-3.3.1.txt?p2=jmeter/trunk/licenses/src/jquery-3.3.1.txt&p1=jmeter/trunk/licenses/src/jquery-2.1.3.txt&r1=1853321&r2=1855116&rev=1855116&view=diff ============================================================================== --- jmeter/trunk/licenses/src/jquery-2.1.3.txt (original) +++ jmeter/trunk/licenses/src/jquery-3.3.1.txt Sat Mar 9 14:10:03 2019 @@ -1,21 +1,20 @@ -Copyright 2014 jQuery Foundation and other contributors -http://jquery.com/ - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright JS Foundation and other contributors, https://js.foundation/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file