You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/01/30 11:50:18 UTC

[incubator-netbeans] branch master updated (8ea00ce -> 944f58a)

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

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


    from 8ea00ce  Merge pull request #391 from JaroslavTulach/jtulach/GitReplace
     add 8be06a4  Use correct ALv2 header for newly created files in nbbuild
     add f4e171c  [NETBEANS-311] Add license infos for individual files to modules and integrate into build process
     add 57bbf74  [NETBEANS-314] Add license info for files sourced from W3C
     add 4327ec0  [NETBEANS-309] Add license info for icons merged after donation
     add 9d3fd69  [NETBEANS-315] Remove usage of rss-0_91.dtd and replace with XHTML1 DTDs
     add 49524f1  Remove files from rat exclusions and add explicit license information
     new 944f58a  Merge pull request #396 from matthiasblaesing/file-licenses

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:
 css.editor/licenseinfo.xml                         |  44 ++++
 html.editor/licenseinfo.xml                        |  66 +++++
 .../src/org/netbeans/modules/html/editor/todo.txt  |   5 -
 j2ee.persistence/licenseinfo.xml                   |  64 +++++
 maven.coverage/licenseinfo.xml                     |  32 +++
 .../nbbuild/extlibs/CreateLicenseSummary.java      | 293 +++++++++++++++------
 .../nbbuild/extlibs/ExclusionsFromLicenseInfo.java |  74 ++++++
 .../nbbuild/extlibs/ReportFromLicenseinfo.java     | 256 ++++++++++++++++++
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |  62 +++++
 .../nbbuild/extlibs/licenseinfo/CommentType.java   |  36 +++
 .../nbbuild/extlibs/licenseinfo/Fileset.java       | 135 ++++++++++
 .../nbbuild/extlibs/licenseinfo/Licenseinfo.java   |  84 ++++++
 .../nbbuild/extlibs/licenseinfo/Licenseinfos.java  |  41 +++
 nbbuild/build.xml                                  | 141 ++++------
 nbbuild/licenseinfo.xml                            |  35 +++
 nbbuild/licenses/ISO-8879-SGML                     |   4 +
 nbbuild/licenses/OASIS                             |  22 ++
 nbbuild/licenses/W3C2                              |  39 +++
 nbbuild/licenses/WSDL-2004                         |  25 ++
 nbbuild/licenses/names.properties                  |   1 +
 nbbuild/nbproject/project.xml                      |   2 +-
 nbbuild/rat-exclusions.txt                         |  52 ++--
 nbbuild/rat-licenseinfo-stub.txt                   |  11 +
 nbbuild/tagref                                     |   4 +
 o.apache.xml.resolver/licenseinfo.xml              |  32 +++
 o.n.bootstrap/readme/README-bin.txt                |   4 +
 performance/licenseinfo.xml                        |  28 ++
 schema2beans/licenseinfo.xml                       |  27 ++
 spellchecker.dictionary_en/licenseinfo.xml         |  30 +++
 .../navigator/resources/lastsel/file.lastsel_mime1 |   2 +
 web.browser.api/licenseinfo.xml                    |  48 ++++
 websvc.saas.api/licenseinfo.xml                    |  28 ++
 .../modules/websvc/saas/model/wadl20061109.xsd     | 289 --------------------
 .../netbeans/modules/websvc/saas/util/testwadl.xml |   6 +-
 welcome/licenseinfo.xml                            |  35 +++
 .../welcome/content/CombinationRSSFeed.java        |   4 +-
 .../modules/welcome/content/RSSEntityResolver.java |  74 ++++++
 .../netbeans/modules/welcome/content/RSSFeed.java  |   2 +-
 .../netbeans/modules/welcome/resources/layer.xml   |  19 --
 .../modules/welcome/resources/rss-0_91.dtd         | 175 ------------
 .../modules/welcome/resources}/xhtml-lat1.ent      |   0
 .../modules/welcome/resources}/xhtml-special.ent   |   0
 .../modules/welcome/resources}/xhtml-symbol.ent    |   0
 .../welcome/resources}/xhtml1-transitional.dtd     |   0
 xml.catalog/licenseinfo.xml                        |  32 +++
 xml.jaxb/licenseinfo.xml                           |  33 +++
 xml.schema.completion/licenseinfo.xml              |  27 ++
 xml.wsdl.model/licenseinfo.xml                     |  30 +++
 xml/licenseinfo.xml                                |  32 +++
 xsl/licenseinfo.xml                                |  28 ++
 50 files changed, 1815 insertions(+), 698 deletions(-)
 create mode 100644 css.editor/licenseinfo.xml
 create mode 100644 html.editor/licenseinfo.xml
 delete mode 100644 html.editor/src/org/netbeans/modules/html/editor/todo.txt
 create mode 100644 j2ee.persistence/licenseinfo.xml
 create mode 100644 maven.coverage/licenseinfo.xml
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ExclusionsFromLicenseInfo.java
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ReportFromLicenseinfo.java
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/licenseinfo/CommentType.java
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/licenseinfo/Fileset.java
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/licenseinfo/Licenseinfo.java
 create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/licenseinfo/Licenseinfos.java
 create mode 100644 nbbuild/licenseinfo.xml
 create mode 100644 nbbuild/licenses/ISO-8879-SGML
 create mode 100644 nbbuild/licenses/OASIS
 create mode 100644 nbbuild/licenses/W3C2
 create mode 100644 nbbuild/licenses/WSDL-2004
 create mode 100644 nbbuild/rat-licenseinfo-stub.txt
 create mode 100644 o.apache.xml.resolver/licenseinfo.xml
 create mode 100644 performance/licenseinfo.xml
 create mode 100644 schema2beans/licenseinfo.xml
 create mode 100644 spellchecker.dictionary_en/licenseinfo.xml
 create mode 100644 web.browser.api/licenseinfo.xml
 create mode 100644 websvc.saas.api/licenseinfo.xml
 delete mode 100644 websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
 create mode 100644 welcome/licenseinfo.xml
 create mode 100644 welcome/src/org/netbeans/modules/welcome/content/RSSEntityResolver.java
 delete mode 100644 welcome/src/org/netbeans/modules/welcome/resources/rss-0_91.dtd
 copy {nbbuild/antsrc/org/netbeans/nbbuild => welcome/src/org/netbeans/modules/welcome/resources}/xhtml-lat1.ent (100%)
 copy {nbbuild/antsrc/org/netbeans/nbbuild => welcome/src/org/netbeans/modules/welcome/resources}/xhtml-special.ent (100%)
 copy {nbbuild/antsrc/org/netbeans/nbbuild => welcome/src/org/netbeans/modules/welcome/resources}/xhtml-symbol.ent (100%)
 copy {html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml => welcome/src/org/netbeans/modules/welcome/resources}/xhtml1-transitional.dtd (100%)
 create mode 100644 xml.catalog/licenseinfo.xml
 create mode 100644 xml.jaxb/licenseinfo.xml
 create mode 100644 xml.schema.completion/licenseinfo.xml
 create mode 100644 xml.wsdl.model/licenseinfo.xml
 create mode 100644 xml/licenseinfo.xml
 create mode 100644 xsl/licenseinfo.xml

-- 
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[incubator-netbeans] 01/01: Merge pull request #396 from matthiasblaesing/file-licenses

Posted by ma...@apache.org.
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 944f58a2b3df0b20789aa111bb94e3c34783b998
Merge: 8ea00ce 49524f1
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Tue Jan 30 12:50:14 2018 +0100

    Merge pull request #396 from matthiasblaesing/file-licenses
    
    Cleanup/Separate/Document licenses in apache netbeans

 css.editor/licenseinfo.xml                         |   44 +
 html.editor/licenseinfo.xml                        |   66 ++
 .../src/org/netbeans/modules/html/editor/todo.txt  |    5 -
 j2ee.persistence/licenseinfo.xml                   |   64 +
 maven.coverage/licenseinfo.xml                     |   32 +
 .../nbbuild/extlibs/CreateLicenseSummary.java      |  293 +++--
 .../nbbuild/extlibs/ExclusionsFromLicenseInfo.java |   74 ++
 .../nbbuild/extlibs/ReportFromLicenseinfo.java     |  256 ++++
 .../nbbuild/extlibs/VerifyLibsAndLicenses.java     |   62 +
 .../nbbuild/extlibs/licenseinfo/CommentType.java   |   36 +
 .../nbbuild/extlibs/licenseinfo/Fileset.java       |  135 +++
 .../nbbuild/extlibs/licenseinfo/Licenseinfo.java   |   84 ++
 .../nbbuild/extlibs/licenseinfo/Licenseinfos.java  |   41 +
 nbbuild/build.xml                                  |  141 +--
 nbbuild/licenseinfo.xml                            |   35 +
 nbbuild/licenses/ISO-8879-SGML                     |    4 +
 nbbuild/licenses/OASIS                             |   22 +
 nbbuild/licenses/W3C2                              |   39 +
 nbbuild/licenses/WSDL-2004                         |   25 +
 nbbuild/licenses/names.properties                  |    1 +
 nbbuild/nbproject/project.xml                      |    2 +-
 nbbuild/rat-exclusions.txt                         |   52 +-
 nbbuild/rat-licenseinfo-stub.txt                   |   11 +
 nbbuild/tagref                                     |    4 +
 o.apache.xml.resolver/licenseinfo.xml              |   32 +
 o.n.bootstrap/readme/README-bin.txt                |    4 +
 performance/licenseinfo.xml                        |   28 +
 schema2beans/licenseinfo.xml                       |   27 +
 spellchecker.dictionary_en/licenseinfo.xml         |   30 +
 .../navigator/resources/lastsel/file.lastsel_mime1 |    2 +
 web.browser.api/licenseinfo.xml                    |   48 +
 websvc.saas.api/licenseinfo.xml                    |   28 +
 .../modules/websvc/saas/model/wadl20061109.xsd     |  289 -----
 .../netbeans/modules/websvc/saas/util/testwadl.xml |    6 +-
 welcome/licenseinfo.xml                            |   35 +
 .../welcome/content/CombinationRSSFeed.java        |    4 +-
 .../modules/welcome/content/RSSEntityResolver.java |   74 ++
 .../netbeans/modules/welcome/content/RSSFeed.java  |    2 +-
 .../netbeans/modules/welcome/resources/layer.xml   |   19 -
 .../modules/welcome/resources/rss-0_91.dtd         |  175 ---
 .../modules/welcome/resources/xhtml-lat1.ent       |  196 +++
 .../modules/welcome/resources/xhtml-special.ent    |   80 ++
 .../modules/welcome/resources/xhtml-symbol.ent     |  237 ++++
 .../welcome/resources/xhtml1-transitional.dtd      | 1248 ++++++++++++++++++++
 xml.catalog/licenseinfo.xml                        |   32 +
 xml.jaxb/licenseinfo.xml                           |   33 +
 xml.schema.completion/licenseinfo.xml              |   27 +
 xml.wsdl.model/licenseinfo.xml                     |   30 +
 xml/licenseinfo.xml                                |   32 +
 xsl/licenseinfo.xml                                |   28 +
 50 files changed, 3576 insertions(+), 698 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists