Fixing some problems reported by verify-libs-and-licenses

c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9-license.txt

@@ -1,7 +1,8 @@
 Name: JavaEWAH
 Version: 0.7.9
-License: Apache License 2.0
-Origin: https://code.google.com/p/javaewah/
+License: Apache-2.0
+Origin: JavaEWAH Project
+URL: https://github.com/lemire/javaewah
 Description: Compressed variant of Java BitSet
 
                                  Apache License

c.jcraft.jsch/external/jsch-0.1.54-license.txt

@@ -1,11 +1,11 @@
 Name: JSch
 Version: 0.1.54
-License: BSD-jsch-variant
-OSR: 3548
-Origin: http://www.jcraft.com/jsch/
+License: BSD-jsch
+Origin: JCraft Inc.
+URL: http://www.jcraft.com/jsch/
 Description: Java implementation of SSH2
 
-Copyright (c) 2002-2016 Atsuhiko Yamanaka, JCraft,Inc.
+Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

c.jcraft.jzlib/external/jzlib-1.0.7-license.txt

@@ -1,8 +1,8 @@
 Name: JZlib
 Version: 1.0.7
-License: BSD-jzlib-variant
-OSR: 12659
-Origin: http://www.jcraft.com/jzlib/
+License: BSD-jzlib
+Origin: JCraft, Inc.
+URL: http://www.jcraft.com/jzlib/
 Description: Java implementation of zlib
 
 Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
@@ -13,8 +13,8 @@ modification, are permitted provided that the following conditions are met:
   1. Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
 
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the distribution.
 
   3. The names of the authors may not be used to endorse or promote products

css.editor/external/css21-spec-license.txt → css.editor/external/css2.1-spec-license.txt

@@ -1,9 +1,10 @@
 Name: CSS 2.1 Specification
-License: W3C (the original at http://www.w3.org/TR/CSS21/)
-OSR: 9248
+License: W3C
 Version: 2.1
 Description: Documentation for the CSS 2.1 standard
-Origin: http://www.w3.org/TR/CSS21/
+Origin: W3C
+URL: http://www.w3.org/TR/CSS21/
+Files: css21-spec.zip
 
 W3C (R) Intellectual Rights Notice and Legal Disclaimers
 

css.editor/external/css3-spec-license.txt

@@ -1,9 +1,9 @@
 Name: CSS 3 Specification
-License: W3C (the original at http://www.w3.org/Style/CSS/current-work)
-OSR: 
-Version: 
+License: W3C
+Version: 3
 Description: Documentation for the CSS 3 standard
-Origin: http://www.w3.org/TR/css3-*
+Origin: W3C
+URL: http://www.w3.org/TR/css3-*
 
 W3C (R) Intellectual Rights Notice and Legal Disclaimers
 

extexecution.process/external/libpam4j-1.1-license.txt

@@ -1,14 +1,13 @@
 Name: libpam4j
 Version: 1.1
 License: MIT
-OSR: 12293
 Origin: https://libpam4j.dev.java.net
 Source: https://libpam4j.dev.java.net
 Description: Java binding for Unix PAM library.
 
 The MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) __YEARS__, __NAMES__
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

extexecution.process/external/processtreekiller-1.0.7-license.txt

@@ -1,14 +1,13 @@
 Name: nb-processtree-killer
 Version: 1.0.7
 License: MIT
-OSR: 12294
 Origin: http://kenai.com/projects/nb-process-killler
 Source: http://kenai.com/projects/nb-process-killler
 Description: Library allowing to kill external process trees.
 
 The MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) __YEARS__, __NAMES__
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

extexecution.process/external/winp-1.14-patched-license.txt

@@ -1,14 +1,14 @@
 Name: winp
 Version: 1.14
 License: MIT
-OSR: 12292
 Origin: https://winp.dev.java.net
 Source: https://winp.dev.java.net
 Description: Library allowing to control windows processes.
+Files: winp-1.14-sources.jar
 
 The MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) __YEARS__, __NAMES__
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

j2ee.eclipselink/external/eclipselink-2.5.2-licence.txt

@@ -51,7 +51,7 @@ derivative works of the Program.
 
 "Contributor" means any person or entity that distributes the Program.
 
-"Licensed Patents " mean patent claims licensable by a Contributor which are
+"Licensed Patents" mean patent claims licensable by a Contributor which are
 necessarily infringed by the use or sale of its Contribution alone or when
 combined with the Program.
 

j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-licence.txt

@@ -1,7 +1,8 @@
 Name: EclipseLink
+Origin: Eclipse
 Version: 2.5.2
 Description: The Eclipse Persistence Services Project ( EclipseLink) project.
-License: Eclipse Public License - v 1.0 and Eclipse Distribution License v 1.0
+License: EPL-1.0
 Origin: http://www.eclipse.org/eclipselink/
 Files: org.eclipse.persistence.jpa.modelgen_2.5.2.jar
 
@@ -51,7 +52,7 @@ derivative works of the Program.
 
 "Contributor" means any person or entity that distributes the Program.
 
-"Licensed Patents " mean patent claims licensable by a Contributor which are
+"Licensed Patents" mean patent claims licensable by a Contributor which are
 necessarily infringed by the use or sale of its Contribution alone or when
 combined with the Program.
 

nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java

@@ -215,7 +215,7 @@ private void testLicenseFilesAreProperlyFormattedPhysically() throws IOException
                         } else {
                             trailingSpace = c == ' ';
                             column++;
-                            if (pastHeader && column > MAX_LINE_LEN) {
+                            if (pastHeader && column > MAX_LINE_LEN && CHECK_MAX_LINE_LEN) {
                                 msg.append("\n" + path + " has line #" + line + " longer than 80 characters");
                                 continue FILE;
                             }
@@ -234,6 +234,7 @@ private void testLicenseFilesAreProperlyFormattedPhysically() throws IOException
         pseudoTests.put("testLicenseFilesAreProperlyFormattedPhysically", msg.length() > 0 ? "Some license files were badly formatted" + msg : null);
     }
 
+    private static final boolean CHECK_MAX_LINE_LEN = false;
     private static final int MAX_LINE_LEN = 100;//temporary increased from: 80
 
     private void testLicenses() throws IOException {

nbbuild/licenses/BSD-jsch-variant → nbbuild/licenses/BSD-jsch

@@ -1,4 +1,4 @@
-Copyright (c) 2002,2003,2004,2005 Atsuhiko Yamanaka, JCraft,Inc.
+Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

nbbuild/licenses/BSD-jzlib

@@ -0,0 +1,25 @@
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

nbbuild/licenses/BSD-postgresql

@@ -0,0 +1,26 @@
+Copyright (c) 1997-2011, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+   of its contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

nbbuild/licenses/EPL-v10-with-commons

@@ -0,0 +1,50 @@
+The Eclipse Foundation makes available all content in this plug-in ("Content").
+Unless otherwise indicated below, the Content is provided to you under the
+terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy
+of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. For
+purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no
+such license exists, contact the Redistributor. Unless otherwise indicated
+below, the terms and conditions of the EPL still apply to any source code in
+the Content and such source code may be obtained at http://www.eclipse.org.
+
+Third Party Content
+
+The Content includes items that have been sourced from third parties as set out
+below. If you did not receive this Content directly from the Eclipse
+Foundation, the following is provided for informational purposes only, and you
+should look to the Redistributor’s license for terms and conditions of use.
+
+Jakarta Commons Collections
+
+The plug-in includes software developed by The Apache Software Foundation as
+part of the Jakarta Commons Collections project.
+
+The Jakarta Commons Collections binary code can be found in the plug-in JAR in
+the following files:
+
+  • org\eclipse\core\internal\registry\ReferenceMap.class
+
+The Jakarta Commons Collections source code can be found in src.zip in the
+following files:
+
+  • org\eclipse\core\internal\registry\ReferenceMap.java
+
+Your use of the Jakarta Commons Collections code is subject to the terms and
+conditions of the Apache License, Version 2.0. A copy of the license is
+contained in the file LICENSE-2.0.txt and is also available at http://
+www.apache.org/licenses/LICENSE-2.0.html.
+
+The Apache attribution notice file NOTICE.TXT is included with the Content in
+accordance with 4d of the Apache License, Version 2.0
+
+The names "Jakarta" and "Apache Software Foundation" must not be used to
+endorse or promote products derived from this software without prior written
+permission. For written permission, please contact [email protected].
+
+Java and all Java-based trademarks and logos are trademarks or registered
+trademarks of Sun Microsystems, Inc. in the United States and other countries.

nbbuild/licenses/EPL-v10-with-osgi

@@ -0,0 +1,58 @@
+The Eclipse Foundation makes available all content in this plug-in ("Content").
+Unless otherwise indicated below, the Content is provided to you under the
+terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy
+of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. For
+purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no
+such license exists, contact the Redistributor. Unless otherwise indicated
+below, the terms and conditions of the EPL still apply to any source code in
+the Content and such source code may be obtained at http://www.eclipse.org.
+
+Third Party Content
+
+The Content includes items that have been sourced from third parties as set out
+below. If you did not receive this Content directly from the Eclipse
+Foundation, the following is provided for informational purposes only, and you
+should look to the Redistributor’s license for terms and conditions of use.
+
+OSGi Materials
+
+All files in the following sub-directories (and their sub-directories):
+
+  • org/osgi
+
+shall be defined as the "OSGi Materials." The OSGi Materials are:
+
+    Copyright (c) 2000, 2006
+
+    OSGi Alliance Bishop Ranch 6
+    2400 Camino Ramon, Suite 375
+    San Ramon, CA 94583 USA
+
+    All Rights Reserved.
+
+The OSGi Materials are provided to you under the terms and conditions of the
+Apache License, Version 2.0. A copy of the license is contained in the file
+LICENSE-2.0.txt and is also available at http://www.apache.org/licenses/
+LICENSE-2.0.html.
+
+Implementation of certain elements of the OSGi Materials may be subject to
+third party intellectual property rights, including without limitation, patent
+rights (such a third party may or may not be a member of the OSGi Alliance).
+The OSGi Alliance and its members are not responsible and shall not be held
+responsible in any manner for identifying or failing to identify any or all
+such third party intellectual property rights.
+
+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. Java and all Java-based trademarks and logos are trademarks or
+registered trademarks of Sun Microsystems, Inc. in the United States and other
+countries.
+

nbbuild/licenses/names.properties

@@ -21,6 +21,9 @@ OSGi=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html) with
 BSD-hamcrest=BSD license with hamcrest copyright
 BSD-INRIA=BSD license with INRIA copyright
 BSD-Masory=BSD license with Yuvi Masory copyright
+BSD-jsch=BSD-like JSch license
+BSD-jzlib=BSD-like zlib license
+BSD-postgresql=BSD with PostgreSQL Global Development Group copyright
 EPL-v10=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
 LGPL-2.1=LGPLv2.1 (https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)
 INRIA=BSD license with INRIA headers

o.apache.commons.codec/external/commons.codec-1.3-license.txt → o.apache.commons.codec/external/commons-codec-1.3-license.txt

@@ -1,9 +1,9 @@
 Name: Apache Commons Codec
+Origin: Apache Software Foundation
 Version: 1.3
 License: Apache-2.0
-OSR: 5462
 Description: Provides implementations of common encoders and decoders.
-Origin: http://commons.apache.org/codec/
+URL: http://commons.apache.org/codec/
 
                                  Apache License
                            Version 2.0, January 2004

o.apache.commons.httpclient/external/commons-httpclient-3.1-license.txt

@@ -1,7 +1,7 @@
 Name: Apache Commons HttpClient
+Origin: Apache Software Foundation
 Version: 3.1
 License: Apache-2.0
-OSR: 490
 Description: HTTP client
 Origin: http://hc.apache.org/
 

o.apache.commons.io/external/commons-io-1.4-license.txt

@@ -1,9 +1,9 @@
 Name: Apache Commons IO
+Description: Assist with developing IO functionality
+Origin: Apache Software Foundation
 Version: 1.4
 License: Apache-2.0
-OSR: 11129
-Origin: http://commons.apache.org/io/
-Description: Assist with developing IO functionality
+URL: http://commons.apache.org/io/