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 f64da9b15ca5f2a60a1648a05cc6339347d65591
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Wed Jun 13 23:08:07 2018 +0200

    [NETBEANS-824] Correct license for BIndex
    
    BIndex contains a small XML parser, that is MIT licensed, so the license
    file was completed with that information.
    
    The NOTICE file itself is mostly empty, but references an about file, that
    describes the licensing situation and contains a notice about trademarks. 
The
    latter part was extracted and included as a notice.
---
 apisupport.harness/external/bindex-2.2-license.txt | 27 ++++++++++++++++++-
 apisupport.harness/external/bindex-2.2-notice.txt  |  7 +++++
 .../licenses/Apache-2.0+MIT-Bindex                 | 30 +++++++++++++++++-----
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/apisupport.harness/external/bindex-2.2-license.txt 
b/apisupport.harness/external/bindex-2.2-license.txt
index 09cf122..26570d7 100644
--- a/apisupport.harness/external/bindex-2.2-license.txt
+++ b/apisupport.harness/external/bindex-2.2-license.txt
@@ -1,10 +1,35 @@
 Name: BIndex
 Version: 2.2
-License: Apache-2.0
+License: Apache-2.0+MIT-Bindex
 Description: OSGi bundle repository indexer.
 Origin: OSGi
 URL: http://www.osgi.org/Repository/BIndex
 
+Parts of this work are licensed:
+
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+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/apisupport.harness/external/bindex-2.2-notice.txt 
b/apisupport.harness/external/bindex-2.2-notice.txt
new file mode 100644
index 0000000..d324648
--- /dev/null
+++ b/apisupport.harness/external/bindex-2.2-notice.txt
@@ -0,0 +1,7 @@
+OSGi OBR BIndex Program
+
+OSGi™ is a trademark, registered trademark, or service mark of The OSGi 
Alliance
+in the US and other countries. Java™ is a trademark, registered trademark, or
+service mark of Sun Microsystems, Inc. in the US and other countries. All other
+trademarks, registered trademarks, or service marks used in the Content are the
+property of their respective owners and are hereby recognized.
\ No newline at end of file
diff --git a/apisupport.harness/external/bindex-2.2-license.txt 
b/nbbuild/licenses/Apache-2.0+MIT-Bindex
similarity index 90%
copy from apisupport.harness/external/bindex-2.2-license.txt
copy to nbbuild/licenses/Apache-2.0+MIT-Bindex
index 09cf122..3148ca7 100644
--- a/apisupport.harness/external/bindex-2.2-license.txt
+++ b/nbbuild/licenses/Apache-2.0+MIT-Bindex
@@ -1,9 +1,27 @@
-Name: BIndex
-Version: 2.2
-License: Apache-2.0
-Description: OSGi bundle repository indexer.
-Origin: OSGi
-URL: http://www.osgi.org/Repository/BIndex
+Parts of this work are licensed:
+
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+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
matthiasblaes...@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to