This is an automated email from the ASF dual-hosted git repository.

jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit e7e6a310a4e489b6728fd5bddcf20d2d3ac8cbcb
Merge: af3dbdb c7e1099
Author: Jan Lahoda <lah...@gmail.com>
AuthorDate: Sun Nov 26 14:00:45 2017 +0100

    Merge pull request #285 from jlahoda/ide-verify-libs-and-licenses-1
    
    Fixing some problems reported by verify-libs-and-licenses

 .../external/JavaEWAH-0.7.9-license.txt            |   5 +-
 c.jcraft.jsch/external/jsch-0.1.54-license.txt     |   8 +-
 c.jcraft.jzlib/external/jzlib-1.0.7-license.txt    |  10 +-
 ...21-spec-license.txt => css2.1-spec-license.txt} |   7 +-
 css.editor/external/css3-spec-license.txt          |   8 +-
 db.dataview/external/h2-1.4.196-license.txt        | 169 +-----
 .../external/exechlp-1.0-license.txt               | 614 ++++++++++++++-------
 .../external/libpam4j-1.1-license.txt              |   3 +-
 .../external/processtreekiller-1.0.7-license.txt   |   3 +-
 .../external/winp-1.14-patched-license.txt         |   4 +-
 .../external/eclipselink-2.5.2-licence.txt         |   2 +-
 .../external/eclipselink-2.5.2-licence.txt         |   5 +-
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |   3 +-
 nbbuild/licenses/{BSD-jsch-variant => BSD-jsch}    |   2 +-
 nbbuild/licenses/{BSD-jsch-variant => BSD-jzlib}   |   3 +-
 nbbuild/licenses/BSD-postgresql                    |  26 +
 .../licenses/EPL-v10-with-commons                  |   7 -
 .../licenses/EPL-v10-with-osgi                     |   7 -
 nbbuild/licenses/names.properties                  |   3 +
 ...3-license.txt => commons-codec-1.3-license.txt} |   4 +-
 .../external/commons.codec-1.3-notice.txt          |   2 -
 .../external/commons-httpclient-3.1-license.txt    |   2 +-
 .../external/commons-io-1.4-license.txt            |   6 +-
 .../external/common-lang-2.6-notice.txt            |   5 -
 ....6-license.txt => commons-lang-2.6-license.txt} |   6 +-
 .../external/commons-logging-1.1.1-license.txt     |   4 +-
 .../external/commons-logging-1.1.1-notice.txt      |   5 -
 .../external/ant-1.10.1-license.txt                |   4 +-
 .../external/ant-1.10.1-notice.txt                 |   6 +
 .../external/ws-commons-util-1.0.1-license.txt     |   6 +-
 .../external/resolver-1.2-license.txt              |   7 +-
 .../external/resolver-1.2-notice.txt               |   3 -
 .../external/xmlrpc-client-3.0-license.txt         |   6 +-
 ...0-license.txt => xmlrpc-common-3.0-license.txt} |   6 +-
 .../external/xmlrpc-server-3.0-license.txt         |   6 +-
 o.eclipse.core.contenttype/external/binaries-list  |   1 -
 ...rg.eclipse.core.contenttype-3.4.100-license.txt |  72 ---
 ....contenttype-3.4.100.v20110423-0524-license.txt |  34 +-
 o.eclipse.core.jobs/external/binaries-list         |   1 -
 .../org.eclipse.core.jobs-3.5.100-license.txt      |  34 +-
 .../org.eclipse.core.jobs-3.5.101-license.txt      |  72 ---
 .../org.eclipse.core.net-1.2.100-license.txt       |  72 ---
 ..._1.2.100.I20110511-0800_nosignature-license.txt |  34 +-
 ....runtime.compatibility.auth-3.2.200-license.txt |  72 ---
 ....auth_3.2.200.v20110110_nosignature-license.txt |  34 +-
 .../org.eclipse.core.runtime-3.7.0-license.txt     |   6 +-
 .../org.eclipse.equinox.app-1.3.100-license.txt    |   8 +-
 ...ipse.equinox.common-3.6.0.v20110523-license.txt |  34 +-
 ...ipse.equinox.common_3.6.0.v20110523-license.txt |  72 ---
 ...inox.preferences-3.4.2_nosignature-license.txt} |   6 +-
 ...3.5.200.v20120522-1841_nosignature-license.txt} |   9 +-
 .../org.eclipse.equinox.security-1.1.1-license.txt |  72 ---
 ....equinox.security-1.1.1_nosignature-license.txt |  34 +-
 ...pse.jgit.java7-3.6.2.201501210735-r-license.txt |  28 +-
 ...g.eclipse.jgit-3.6.2.201501210735-r-license.txt |  26 +-
 ...bugzilla.core-3.17.0.v20150828-2026-license.txt |  72 ---
 ...bugzilla.core_3.17.0.v20150828-2026-license.txt |  34 +-
 ....commons.core-3.17.0.v20150625-2042-license.txt |  72 ---
 ....commons.core_3.17.0.v20150625-2042-license.txt |  34 +-
 ...n.commons.net-3.17.0.v20150706-2057-license.txt |  72 ---
 ...n.commons.net_3.17.0.v20150706-2057-license.txt |  34 +-
 ...ositories.core-1.9.0.v20150625-2042-license.txt |  72 ---
 ...ositories.core_1.9.0.v20150625-2042-license.txt |  34 +-
 ...ommons.xmlrpc-3.17.0.v20150625-2042-license.txt |  72 ---
 ...ommons.xmlrpc_3.17.0.v20150625-2042-license.txt |  34 +-
 ...yn.tasks.core-3.17.0.v20150828-2026-license.txt |  72 ---
 ...yn.tasks.core_3.17.0.v20150828-2026-license.txt |  34 +-
 ...onfluence.core_2.6.0.v20150901-2143-license.txt |   9 +-
 ....v20150901-2143-patched-nosignature-license.txt |   7 +-
 ...markdown.core_2.6.0.v20150901-2143-license.txt} |   4 +-
 ...t.textile.core_2.6.0.v20150901-2143-license.txt |   7 +-
 71 files changed, 622 insertions(+), 1729 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.

Reply via email to