You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/12/01 23:05:40 UTC

[incubator-netbeans] 01/01: Merge pull request #306 from jlahoda/ide-verify-libs-and-licenses-2

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

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

commit d1b7a3569a1eb9fe004276a4ef0d3a56bf8b0174
Merge: 2be2f4c 8d3b50e
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Sat Dec 2 00:05:37 2017 +0100

    Merge pull request #306 from jlahoda/ide-verify-libs-and-licenses-2
    
    Some more updates to fix issues reported by verify-libs-and-licenses.

 .../external/json-simple-1.1.1-license.txt         |   5 +
 libs.lucene/external/lucene-core-3.5.0-license.txt |   9 +-
 libs.lucene/external/lucene-core-3.5.0-notice.txt  |   3 -
 libs.xerces/external/xerces-2.8.0-notice.txt       |  15 -
 ....0-license.txt => xercesImpl-2.8.0-license.txt} |   4 +-
 libs.xerces/external/xercesImpl-2.8.0-notice.txt   |   9 +
 .../external/apache-maven-3.3.9-bin-license.txt    |   5 +
 maven.embedder/external/jdom-1.0-license.txt       |   1 -
 maven.embedder/external/jdom-1.0-notice.txt        |  51 +--
 .../external/maven-dependency-tree-2.0-license.txt |   4 +-
 ... indexer-core-6.0-SNAPSHOT-patched-license.txt} |   7 +-
 .../external/javax.annotation-api-1.2-license.txt  | 355 +++++++++++++++++++++
 ...-5.5.3-license.txt => lucene-5.5.3-license.txt} |   8 +-
 maven.indexer/external/lucene-5.5.3-notice.txt     | 188 +++++++++++
 .../external/lucene-queryparser-5.5.3-license.txt  | 210 ------------
 maven/build.xml                                    |   2 +-
 maven/external/aether-api-1.13.1-license.txt       |  72 +++++
 maven/external/binaries-list                       |   4 +-
 .../external/jarjar-1.5-license.txt                |  12 +-
 .../licenses/Apache-2.0-lucene                     |  10 -
 nbbuild/licenses/BSD-ispell-enwl                   |  44 +++
 nbbuild/licenses/names.properties                  |   2 +
 22 files changed, 705 insertions(+), 315 deletions(-)

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