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/11/09 22:50:20 UTC

[incubator-netbeans] branch master updated (bcb22df -> b021bbe)

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 bcb22df  Merge pull request #265 from jlahoda/split-finish-build
     add c0d9d79  For CDDL+GPL dual licensed 'external' binaries, picking up CDDL. verify-libs-and-licenses should now only accept GPL if it is with CPE and compile-time/optional only.
     new b021bbe  Merge pull request #266 from jlahoda/pick-cddl

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:
 .../external/harness-launchers-8.2-license.txt     | 429 +--------------------
 jemmy/external/jemmy-2.3.1.1-license.txt           | 429 +--------------------
 .../nbi.engine-external-binaries-8.2-license.txt   | 429 +--------------------
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |   9 +-
 nbbuild/licenses/CDDL-1.0                          |  25 +-
 .../external/platform-launchers-8.2-license.txt    | 429 +--------------------
 6 files changed, 33 insertions(+), 1717 deletions(-)

-- 
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 #266 from jlahoda/pick-cddl

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 b021bbeda2908048bad5c58c2df93f88c3a1d429
Merge: bcb22df c0d9d79
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Thu Nov 9 23:50:18 2017 +0100

    Merge pull request #266 from jlahoda/pick-cddl
    
    For CDDL+GPL dual licensed 'external' binaries, picking up CDDL. veri…

 .../external/harness-launchers-8.2-license.txt     | 429 +--------------------
 jemmy/external/jemmy-2.3.1.1-license.txt           | 429 +--------------------
 .../nbi.engine-external-binaries-8.2-license.txt   | 429 +--------------------
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |   9 +-
 nbbuild/licenses/CDDL-1.0                          |  25 +-
 .../external/platform-launchers-8.2-license.txt    | 429 +--------------------
 6 files changed, 33 insertions(+), 1717 deletions(-)

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