This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 1193443a929aebb1596efaae3b62b5ce44bf5829
Merge: a7ab624 ba70c38
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Fri Aug 31 19:30:16 2018 +0200
Merge pull request #807 from matthiasblaesing/netbeans-1171
[NETBEANS-1171] Invalid license files in web.core.syntax module
.../external/harness-launchers-8.2-license.txt | 25 +-
harness/jemmy/external/jemmy-2.3.1.1-license.txt | 25 +-
.../nbi.engine-external-binaries-8.2-license.txt | 25 +-
.../external/exechlp-1.0-license.txt | 25 +-
.../external/extbrowser-dlls-18.03.15-license.txt | 25 +-
...4cc001a41ab9138496b11e2ae256a159ffd-license.txt | 25 +-
.../external/jaxws-2.2.6-cddl10-license.txt | 25 +-
.../nbbuild/extlibs/CreateLicenseSummary.java | 89 ++-
.../nbbuild/extlibs/VerifyLibsAndLicenses.java | 63 +-
nbbuild/licenses/BSD-tlddoc | 26 +
nbbuild/licenses/BSD-tldxslt | 26 +
nbbuild/licenses/CDDL-1.0 | 25 +-
nbbuild/licenses/names.properties | 2 +
...lemenu-external-desktop-classes-8.2-license.txt | 25 +-
.../profiler-external-binaries-8.2-license.txt | 25 +-
web.core.syntax/build.xml | 119 +++-
web.core.syntax/external/binaries-list | 8 +-
web.core.syntax/external/cddl_11_license.txt | 747 ---------------------
.../generated-jsf12-tlddoc-1.2-20-license.txt | 33 +-
.../generated-jstl11-doc-1.1.2-license.txt | 209 ++++++
.../generated-struts-tags-1.3.10-license.txt | 209 ++++++
.../generated-struts-tags-1.3.10-notice.txt | 6 +
.../external/jsf-impl-1.2-20-license.txt | 34 +-
.../external/standard-1.1.2-license.txt | 209 ++++++
web.core.syntax/external/struts-1.3.10-license.txt | 211 ++++++
web.core.syntax/external/struts-1.3.10-notice.txt | 10 +
.../external/struts-tags_apache20_license.txt | 53 --
web.core.syntax/external/tlddoc-1.3-license.txt | 34 +
web.core.syntax/licenseinfo.xml | 22 +-
web.core.syntax/nbproject/project.properties | 6 +-
.../tlddoc/HowGenerateDocumentation.html | 62 --
web.core.syntax/tlddoc/xslt/alltags-frame.html.xsl | 103 +++
.../tlddoc/xslt/alltags-noframe.html.xsl | 103 +++
web.core.syntax/tlddoc/xslt/function.html.xsl | 276 ++++++++
web.core.syntax/tlddoc/xslt/help-doc.html.xsl | 235 +++++++
web.core.syntax/tlddoc/xslt/index.html.xsl | 75 +++
.../tlddoc/xslt/overview-frame.html.xsl | 114 ++++
.../tlddoc/xslt/overview-summary.html.xsl | 208 ++++++
web.core.syntax/tlddoc/xslt/stylesheet.css | 2 -
web.core.syntax/tlddoc/xslt/tag.html.xsl | 510 ++++++++++++++
web.core.syntax/tlddoc/xslt/tld-frame.html.xsl | 188 ++++++
web.core.syntax/tlddoc/xslt/tld-summary.html.xsl | 445 ++++++++++++
web.core.syntax/tlddoc/xslt/tld1_1-tld1_2.xsl | 153 +++++
web.core.syntax/tlddoc/xslt/tld1_2-tld2_0.xsl | 290 ++++++++
web.core.syntax/tlddoc/xslt/tld2_0-tld2_1.xsl | 70 ++
web.core.syntax/tlddoc/xslt/tld2_1-tld2_1.xsl | 79 +++
46 files changed, 4058 insertions(+), 1221 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
