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/10/27 22:46:12 UTC

[incubator-netbeans] branch master updated (93eb1fe -> 4ae6d93)

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

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


    from 93eb1fe  Merge pull request #195 from junichi11/fix-rat-exclusions
     add acf765c  Fixing verify-libs-and-licenses for cluster.config=platform.
     add 5aa883a  Must copy the binaries to nbi/engine.
     add 3e6e264  Fixing typo.
     add a2445e6  Fixing file name.
     new 4ae6d93  Merge pull request #196 from jlahoda/fix-verify-libs-and-licenses-for-platform

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apisupport.harness/external/binaries-list          |   3 +-
 ...cense.txt => harness-launchers-8.2-license.txt} |   3 +-
 .../external/jnlp-servlet-license.txt              |  38 -
 apisupport.harness/nbproject/project.properties    |  10 +-
 applemenu/build.xml                                |   2 +-
 ...emenu-external-desktop-classes-8.2-license.txt} |   3 +-
 applemenu/external/binaries-list                   |   2 +-
 .../external/orange-extensions-1.3.1-license.txt   |   4 +-
 core.browser.webview/nbproject/project.properties  |   1 +
 core.network/external/binaries-list                |   2 +-
 .../external/nsProxyAutoConfig-license.txt         |  44 --
 .../nsProxyAutoConfig-mozilla2.0-license.txt       | 478 ++++++++++++
 core.network/nbproject/project.properties          |   2 +-
 dlight.nativeexecution/tools/pty/.hgignore         |  19 -
 jemmy/external/jemmy-2.3.1.1-license.txt           |   2 +
 libs.asm/external/asm-all-5.0.1-license.txt        |   2 +-
 libs.javafx/build.xml                              |  27 +
 libs.javafx/external/binaries-list                 |   2 +-
 .../external/openjfx-master-rt-8-license.txt       | 416 +----------
 libs.javafx/nbproject/project.xml                  |   2 +
 .../external/jna-platform-4.2.2-license.txt        |   2 +
 libs.jna/external/jna-4.2.2-license.txt            |   2 +
 libs.junit4/external/hamcrest-core-1.3-license.txt |   2 +-
 libs.nbi.ant/build.xml                             |   4 -
 libs.nbi.ant/external/binaries-list                |  17 -
 .../external/nbi.engine-ext-binaries-licenses.txt  |  40 -
 libs.nbi.ant/nbproject/project.xml                 |   7 +-
 libs.nbi.engine/build.xml                          |   2 +-
 libs.nbi.engine/external/binaries-list             |   2 +-
 .../external/nbi.engine-ext-binaries-licenses.txt  |  40 -
 .../nbi.engine-external-binaries-8.2-license.txt   |   6 +-
 .../{osgi-4.2-license.txt => osgi-5.0-license.txt} |   0
 libs.testng/external/testng-6.8.1-dist-license.txt |   2 -
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |  36 +-
 .../org/netbeans/nbbuild/extlibs/ignored-binaries  |   6 +
 .../licenses/BSD-INRIA                             |   7 -
 .../licenses/BSD-Masory                            |   7 -
 .../licenses/BSD-hamcrest                          |   7 -
 .../licenses/OSGi                                  |   8 -
 nbbuild/licenses/names.properties                  |   6 +-
 .../external/net.java.html.boot.fx-1.5-license.txt |   9 +-
 .../external/net.java.html.boot.fx-1.5-notice.txt  |   8 +
 net.java.html.boot.fx/nbproject/project.xml        |   2 +-
 .../net.java.html.boot.script-1.5-license.txt      |   9 +-
 .../net.java.html.boot.script-1.5-notice.txt       |   8 +
 net.java.html.boot.script/nbproject/project.xml    |   2 +-
 .../external/net.java.html.boot-1.5-license.txt    |   9 +-
 .../external/net.java.html.boot-1.5-notice.txt     |   8 +
 net.java.html.boot/nbproject/project.xml           |   2 +-
 .../external/net.java.html.geo-1.5-license.txt     |   9 +-
 .../external/net.java.html.geo-1.5-notice.txt      |   8 +
 net.java.html.geo/nbproject/project.xml            |   2 +-
 .../external/net.java.html.json-1.5-license.txt    |   9 +-
 .../external/net.java.html.json-1.5-notice.txt     |   8 +
 net.java.html.json/nbproject/project.xml           |   2 +-
 .../external/net.java.html.sound-1.5-license.txt   |   9 +-
 .../external/net.java.html.sound-1.5-notice.txt    |   8 +
 net.java.html.sound/nbproject/project.xml          |   2 +-
 .../external/net.java.html-1.5-license.txt         |   9 +-
 .../external/net.java.html-1.5-notice.txt          |   8 +
 net.java.html/nbproject/project.xml                |   2 +-
 ...g.eclipse.osgi_3.9.1.v20140110-1610-license.txt |   4 +-
 o.n.bootstrap/external/binaries-list               |   5 +-
 o.n.bootstrap/external/nbexec.exe-license.txt      | 826 ---------------------
 o.n.bootstrap/external/nbexec64.dll-license.txt    | 826 ---------------------
 ...ense.txt => platform-launchers-8.2-license.txt} |   7 +
 o.n.bootstrap/nbproject/project.properties         |   8 +-
 .../external/ko4j-1.5-license.txt                  |   9 +-
 o.n.html.ko4j/external/ko4j-1.5-notice.txt         |   8 +
 o.n.html.ko4j/nbproject/project.xml                |   2 +-
 .../external/xhr4j-1.5-license.txt                 |   9 +-
 o.n.html.xhr4j/external/xhr4j-1.5-notice.txt       |   8 +
 o.n.html.xhr4j/nbproject/project.xml               |   2 +-
 73 files changed, 732 insertions(+), 2380 deletions(-)
 rename apisupport.harness/external/{harness-launchers-license.txt => harness-launchers-8.2-license.txt} (99%)
 delete mode 100644 apisupport.harness/external/jnlp-servlet-license.txt
 copy applemenu/external/{applemenu-external-desktop-classes-license.txt => applemenu-external-desktop-classes-8.2-license.txt} (99%)
 delete mode 100644 core.network/external/nsProxyAutoConfig-license.txt
 create mode 100644 core.network/external/nsProxyAutoConfig-mozilla2.0-license.txt
 delete mode 100644 dlight.nativeexecution/tools/pty/.hgignore
 rename o.n.bootstrap/external/nbexec64.exe-license.txt => libs.javafx/external/openjfx-master-rt-8-license.txt (52%)
 delete mode 100644 libs.nbi.ant/external/binaries-list
 delete mode 100644 libs.nbi.ant/external/nbi.engine-ext-binaries-licenses.txt
 delete mode 100644 libs.nbi.engine/external/nbi.engine-ext-binaries-licenses.txt
 rename applemenu/external/applemenu-external-desktop-classes-license.txt => libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt (99%)
 rename libs.osgi/external/{osgi-4.2-license.txt => osgi-5.0-license.txt} (100%)
 copy libs.asm/external/asm-all-5.0.1-license.txt => nbbuild/licenses/BSD-INRIA (90%)
 copy applemenu/external/orange-extensions-1.3.1-license.txt => nbbuild/licenses/BSD-Masory (92%)
 copy libs.junit4/external/hamcrest-core-1.3-license.txt => nbbuild/licenses/BSD-hamcrest (88%)
 copy netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610-license.txt => nbbuild/licenses/OSGi (94%)
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.boot.fx/external/net.java.html.boot.fx-1.5-license.txt (98%)
 create mode 100644 net.java.html.boot.fx/external/net.java.html.boot.fx-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.boot.script/external/net.java.html.boot.script-1.5-license.txt (98%)
 create mode 100644 net.java.html.boot.script/external/net.java.html.boot.script-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.boot/external/net.java.html.boot-1.5-license.txt (98%)
 create mode 100644 net.java.html.boot/external/net.java.html.boot-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.geo/external/net.java.html.geo-1.5-license.txt (98%)
 create mode 100644 net.java.html.geo/external/net.java.html.geo-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.json/external/net.java.html.json-1.5-license.txt (98%)
 create mode 100644 net.java.html.json/external/net.java.html.json-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html.sound/external/net.java.html.sound-1.5-license.txt (98%)
 create mode 100644 net.java.html.sound/external/net.java.html.sound-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => net.java.html/external/net.java.html-1.5-license.txt (98%)
 create mode 100644 net.java.html/external/net.java.html-1.5-notice.txt
 delete mode 100644 o.n.bootstrap/external/nbexec.exe-license.txt
 delete mode 100644 o.n.bootstrap/external/nbexec64.dll-license.txt
 rename o.n.bootstrap/external/{nbexec.dll-license.txt => platform-launchers-8.2-license.txt} (99%)
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => o.n.html.ko4j/external/ko4j-1.5-license.txt (98%)
 create mode 100644 o.n.html.ko4j/external/ko4j-1.5-notice.txt
 copy libs.jna.platform/external/jna-platform-4.2.2-license.txt => o.n.html.xhr4j/external/xhr4j-1.5-license.txt (98%)
 create mode 100644 o.n.html.xhr4j/external/xhr4j-1.5-notice.txt

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

[incubator-netbeans] 01/01: Merge pull request #196 from jlahoda/fix-verify-libs-and-licenses-for-platform

Posted by ge...@apache.org.
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 4ae6d933acba8f158f1606918356b7e01ad54670
Merge: 93eb1fe a2445e6
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Sat Oct 28 00:46:10 2017 +0200

    Merge pull request #196 from jlahoda/fix-verify-libs-and-licenses-for-platform
    
    Fix verify libs and licenses for platform

 apisupport.harness/external/binaries-list          |   3 +-
 ...cense.txt => harness-launchers-8.2-license.txt} |   3 +-
 .../external/jnlp-servlet-license.txt              |  38 -
 apisupport.harness/nbproject/project.properties    |  10 +-
 applemenu/build.xml                                |   2 +-
 ...emenu-external-desktop-classes-8.2-license.txt} |   3 +-
 applemenu/external/binaries-list                   |   2 +-
 .../external/orange-extensions-1.3.1-license.txt   |   4 +-
 core.browser.webview/nbproject/project.properties  |   1 +
 core.network/external/binaries-list                |   2 +-
 .../external/nsProxyAutoConfig-license.txt         |  44 --
 .../nsProxyAutoConfig-mozilla2.0-license.txt       | 478 ++++++++++++
 core.network/nbproject/project.properties          |   2 +-
 dlight.nativeexecution/tools/pty/.hgignore         |  19 -
 jemmy/external/jemmy-2.3.1.1-license.txt           |   2 +
 libs.asm/external/asm-all-5.0.1-license.txt        |   2 +-
 libs.javafx/build.xml                              |  27 +
 libs.javafx/external/binaries-list                 |   2 +-
 .../external/openjfx-master-rt-8-license.txt       | 416 +----------
 libs.javafx/nbproject/project.xml                  |   2 +
 .../external/jna-platform-4.2.2-license.txt        |   2 +
 libs.jna/external/jna-4.2.2-license.txt            |   2 +
 libs.junit4/external/hamcrest-core-1.3-license.txt |   2 +-
 libs.nbi.ant/build.xml                             |   4 -
 libs.nbi.ant/external/binaries-list                |  17 -
 .../external/nbi.engine-ext-binaries-licenses.txt  |  40 -
 libs.nbi.ant/nbproject/project.xml                 |   7 +-
 libs.nbi.engine/build.xml                          |   2 +-
 libs.nbi.engine/external/binaries-list             |   2 +-
 .../external/nbi.engine-ext-binaries-licenses.txt  |  40 -
 .../nbi.engine-external-binaries-8.2-license.txt   |   6 +-
 .../{osgi-4.2-license.txt => osgi-5.0-license.txt} |   0
 libs.testng/external/testng-6.8.1-dist-license.txt |   2 -
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |  36 +-
 .../org/netbeans/nbbuild/extlibs/ignored-binaries  |   6 +
 .../licenses/BSD-INRIA                             |   7 -
 .../licenses/BSD-Masory                            |   7 -
 .../licenses/BSD-hamcrest                          |   7 -
 .../licenses/OSGi                                  |   8 -
 nbbuild/licenses/names.properties                  |   6 +-
 .../external/net.java.html.boot.fx-1.5-license.txt |   9 +-
 .../external/net.java.html.boot.fx-1.5-notice.txt  |   8 +
 net.java.html.boot.fx/nbproject/project.xml        |   2 +-
 .../net.java.html.boot.script-1.5-license.txt      |   9 +-
 .../net.java.html.boot.script-1.5-notice.txt       |   8 +
 net.java.html.boot.script/nbproject/project.xml    |   2 +-
 .../external/net.java.html.boot-1.5-license.txt    |   9 +-
 .../external/net.java.html.boot-1.5-notice.txt     |   8 +
 net.java.html.boot/nbproject/project.xml           |   2 +-
 .../external/net.java.html.geo-1.5-license.txt     |   9 +-
 .../external/net.java.html.geo-1.5-notice.txt      |   8 +
 net.java.html.geo/nbproject/project.xml            |   2 +-
 .../external/net.java.html.json-1.5-license.txt    |   9 +-
 .../external/net.java.html.json-1.5-notice.txt     |   8 +
 net.java.html.json/nbproject/project.xml           |   2 +-
 .../external/net.java.html.sound-1.5-license.txt   |   9 +-
 .../external/net.java.html.sound-1.5-notice.txt    |   8 +
 net.java.html.sound/nbproject/project.xml          |   2 +-
 .../external/net.java.html-1.5-license.txt         |   9 +-
 .../external/net.java.html-1.5-notice.txt          |   8 +
 net.java.html/nbproject/project.xml                |   2 +-
 ...g.eclipse.osgi_3.9.1.v20140110-1610-license.txt |   4 +-
 o.n.bootstrap/external/binaries-list               |   5 +-
 o.n.bootstrap/external/nbexec.exe-license.txt      | 826 ---------------------
 o.n.bootstrap/external/nbexec64.dll-license.txt    | 826 ---------------------
 ...ense.txt => platform-launchers-8.2-license.txt} |   7 +
 o.n.bootstrap/nbproject/project.properties         |   8 +-
 .../external/ko4j-1.5-license.txt                  |   9 +-
 o.n.html.ko4j/external/ko4j-1.5-notice.txt         |   8 +
 o.n.html.ko4j/nbproject/project.xml                |   2 +-
 .../external/xhr4j-1.5-license.txt                 |   9 +-
 o.n.html.xhr4j/external/xhr4j-1.5-notice.txt       |   8 +
 o.n.html.xhr4j/nbproject/project.xml               |   2 +-
 73 files changed, 732 insertions(+), 2380 deletions(-)

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