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 74b7e3f27635eba1a85da24e7e51e2ebd8f2d65e
Merge: 8ceff22 3167ee6
Author: Geertjan Wielenga <geertjan.wiele...@oracle.com>
AuthorDate: Wed Nov 29 00:30:46 2017 +0100
Merge pull request #304 from jlahoda/choose-cddl
For various CDDL+GPL libraries, choosing CDDL.
libs.jaxb/external/binaries-list | 8 +-
libs.jaxb/external/jaxb-2.2.5-2-license.txt | 355 +++++++++
libs.jaxb/external/jaxb-2.2.5-license.txt | 722 ------------------
.../external/jaxb-api-2.2.5-javadoc-license.txt | 354 +++++++++
libs.jaxb/nbproject/project.properties | 18 +-
libs.jaxb/nbproject/project.xml | 6 +-
libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml | 9 +-
nbbuild/licenses/CDDL-1.1 | 399 ++++++++++
...4cc001a41ab9138496b11e2ae256a159ffd-license.txt | 406 ++++++++++
.../external/ValidationAPI-license.txt | 834 ---------------------
swing.validation/external/binaries-list | 2 +-
swing.validation/nbproject/project.properties | 2 +-
swing.validation/nbproject/project.xml | 2 +-
websvc.jaxws21/external/binaries-list | 2 +-
websvc.jaxws21/external/jaxws-2.2.6-license.txt | 378 +---------
websvc.jaxws21/nbproject/project.properties | 2 +-
.../external/jaxws-2.2.6-api-license.txt | 375 +--------
websvc.saas.api/build.xml | 2 +-
websvc.saas.api/external/binaries-list | 2 +-
...svc-saas-api-external-resources-8.2-license.txt | 406 ++++++++++
xml.jaxb.api/external/activation-1.1.1-license.txt | 354 +++++++++
xml.jaxb.api/external/jaxb-2.2.6-license.txt | 722 ------------------
xml.jaxb.api/external/jaxb-api-2.2.6-license.txt | 354 +++++++++
23 files changed, 2666 insertions(+), 3048 deletions(-)
--
To stop receiving notification emails like this one, please contact
"comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.
