You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/06/17 17:54:36 UTC
[incubator-netbeans] 05/06: [NETBEANS-848] Update license info for
testng
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch release90
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 786df5acb6cee47a1a68aa7637ac6ffcf744d252
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Jun 14 20:15:05 2018 +0200
[NETBEANS-848] Update license info for testng
---
libs.testng/external/testng-6.8.1-dist-license.txt | 35 ++++++++++++++++++-
libs.testng/external/testng-6.8.1-dist-notice.txt | 4 +++
.../licenses/Apache-2.0+MIT+testng | 39 ++++++++++++++++++----
3 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/libs.testng/external/testng-6.8.1-dist-license.txt b/libs.testng/external/testng-6.8.1-dist-license.txt
index 58a0b43..b9cb045 100644
--- a/libs.testng/external/testng-6.8.1-dist-license.txt
+++ b/libs.testng/external/testng-6.8.1-dist-license.txt
@@ -1,11 +1,44 @@
Name: TestNG
Version: 6.8.1
Description: Java testing framework.
-License: Apache-2.0
+License: Apache-2.0+MIT+testng
Origin: TestNG
URL: http://testng.org/doc/download.html
Files: testng-6.8.1-dist.jar, testng-6.8.1-javadoc.zip
+Parts of this work are licensed:
+
+The MIT License (MIT)
+
+Copyright 2011, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
+Includes Sizzle.js
+http://sizzlejs.com/
+Copyright 2011, The Dojo Foundation
+Released under the MIT, BSD, and GPL Licenses.
+
+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.
+
+
+Parts of this work are licensed:
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/libs.testng/external/testng-6.8.1-dist-notice.txt b/libs.testng/external/testng-6.8.1-dist-notice.txt
new file mode 100644
index 0000000..736c867
--- /dev/null
+++ b/libs.testng/external/testng-6.8.1-dist-notice.txt
@@ -0,0 +1,4 @@
+JCommander Copyright Notices
+============================
+
+Copyright 2010 Cedric Beust <ce...@beust.com>
\ No newline at end of file
diff --git a/libs.testng/external/testng-6.8.1-dist-license.txt b/nbbuild/licenses/Apache-2.0+MIT+testng
similarity index 89%
copy from libs.testng/external/testng-6.8.1-dist-license.txt
copy to nbbuild/licenses/Apache-2.0+MIT+testng
index 58a0b43..17898e0 100644
--- a/libs.testng/external/testng-6.8.1-dist-license.txt
+++ b/nbbuild/licenses/Apache-2.0+MIT+testng
@@ -1,10 +1,35 @@
-Name: TestNG
-Version: 6.8.1
-Description: Java testing framework.
-License: Apache-2.0
-Origin: TestNG
-URL: http://testng.org/doc/download.html
-Files: testng-6.8.1-dist.jar, testng-6.8.1-javadoc.zip
+Parts of this work are licensed:
+
+The MIT License (MIT)
+
+Copyright 2011, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
+Includes Sizzle.js
+http://sizzlejs.com/
+Copyright 2011, The Dojo Foundation
+Released under the MIT, BSD, and GPL Licenses.
+
+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.
+
+
+Parts of this work are licensed:
Apache License
Version 2.0, January 2004
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists