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/06/17 17:16:55 UTC

[incubator-netbeans] branch master updated (7905fca -> ad9cf59)

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 7905fca  Merge pull request #593 from matthiasblaesing/licenses3
     add ccb4e5d  [NETBEANS-844] Use released version of maven-indexer 6.0.0
     add b60e8e9  [NETBEANS-824] Correct license for BIndex
     add 6e99445  [NETBEANS-846] Add notice file for Spring libraries
     add ef2faee  [NETBEANS-848] Update license info for testng
     new ad9cf59  Merge pull request #590 from matthiasblaesing/licenses2

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/bindex-2.2-license.txt |   27 +-
 apisupport.harness/external/bindex-2.2-notice.txt  |    7 +
 .../spring-framework-3.2.7.RELEASE-notice.txt      |    2 +
 .../spring-framework-4.0.1.RELEASE-notice.txt      |    2 +
 libs.testng/external/testng-6.8.1-dist-license.txt |   35 +-
 libs.testng/external/testng-6.8.1-dist-notice.txt  |    4 +
 maven.indexer/build.xml                            |   18 -
 .../external/NOTICE-patched-indexer-core-6.0.0     |    6 -
 maven.indexer/external/binaries-list               |   10 +-
 ...-license.txt => indexer-core-6.0.0-license.txt} |    2 +-
 .../external/indexer-core-6.0.0-notice.txt         |    5 +
 ...-5.5.3-license.txt => lucene-5.5.5-license.txt} |    4 +-
 ...ne-5.5.3-notice.txt => lucene-5.5.5-notice.txt} |    0
 maven.indexer/external/mvn-indexer.patch           | 1617 --------------------
 maven.indexer/nbproject/project.properties         |   10 +-
 maven.indexer/nbproject/project.xml                |   20 +-
 .../licenses/Apache-2.0+MIT+testng                 |   39 +-
 .../licenses/Apache-2.0+MIT-Bindex                 |   30 +-
 18 files changed, 159 insertions(+), 1679 deletions(-)
 create mode 100644 apisupport.harness/external/bindex-2.2-notice.txt
 create mode 100644 libs.springframework/external/spring-framework-3.2.7.RELEASE-notice.txt
 create mode 100644 libs.springframework/external/spring-framework-4.0.1.RELEASE-notice.txt
 create mode 100644 libs.testng/external/testng-6.8.1-dist-notice.txt
 delete mode 100644 maven.indexer/external/NOTICE-patched-indexer-core-6.0.0
 rename maven.indexer/external/{indexer-core-6.0-SNAPSHOT-patched-license.txt => indexer-core-6.0.0-license.txt} (99%)
 create mode 100644 maven.indexer/external/indexer-core-6.0.0-notice.txt
 rename maven.indexer/external/{lucene-5.5.3-license.txt => lucene-5.5.5-license.txt} (98%)
 rename maven.indexer/external/{lucene-5.5.3-notice.txt => lucene-5.5.5-notice.txt} (100%)
 delete mode 100644 maven.indexer/external/mvn-indexer.patch
 copy libs.testng/external/testng-6.8.1-dist-license.txt => nbbuild/licenses/Apache-2.0+MIT+testng (89%)
 copy apisupport.harness/external/bindex-2.2-license.txt => nbbuild/licenses/Apache-2.0+MIT-Bindex (90%)

-- 
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 #590 from matthiasblaesing/licenses2

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 ad9cf5917e332be11bc7f408581a2aea9bd16118
Merge: 7905fca ef2faee
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Jun 17 19:16:53 2018 +0200

    Merge pull request #590 from matthiasblaesing/licenses2
    
    License cleanup part 2

 apisupport.harness/external/bindex-2.2-license.txt |   27 +-
 apisupport.harness/external/bindex-2.2-notice.txt  |    7 +
 .../spring-framework-3.2.7.RELEASE-notice.txt      |    2 +
 .../spring-framework-4.0.1.RELEASE-notice.txt      |    2 +
 libs.testng/external/testng-6.8.1-dist-license.txt |   35 +-
 libs.testng/external/testng-6.8.1-dist-notice.txt  |    4 +
 maven.indexer/build.xml                            |   18 -
 .../external/NOTICE-patched-indexer-core-6.0.0     |    6 -
 maven.indexer/external/binaries-list               |   10 +-
 ...-license.txt => indexer-core-6.0.0-license.txt} |    2 +-
 .../external/indexer-core-6.0.0-notice.txt         |    5 +
 ...-5.5.3-license.txt => lucene-5.5.5-license.txt} |    4 +-
 ...ne-5.5.3-notice.txt => lucene-5.5.5-notice.txt} |    0
 maven.indexer/external/mvn-indexer.patch           | 1617 --------------------
 maven.indexer/nbproject/project.properties         |   10 +-
 maven.indexer/nbproject/project.xml                |   20 +-
 .../licenses/Apache-2.0+MIT+testng                 |   39 +-
 .../licenses/Apache-2.0+MIT-Bindex                 |   30 +-
 18 files changed, 159 insertions(+), 1679 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