This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch release90 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit ea59d3e158e34c2d515f63cba361a089bb458312 Merge: fc01343 786df5a Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Sun Jun 17 19:53:23 2018 +0200 Merge branch 'licenses_backport' into release90 Backport license fixes. Review was done via PR #590 and PR #593 apisupport.harness/external/bindex-2.2-license.txt | 27 +- apisupport.harness/external/bindex-2.2-notice.txt | 7 + extexecution.process/build.xml | 43 - extexecution.process/external/binaries-list | 2 +- ...4-patched-license.txt => winp-1.26-license.txt} | 21 +- extexecution.process/external/winp.patch | 31 - extexecution.process/nbproject/project.properties | 2 +- extexecution.process/nbproject/project.xml | 4 +- .../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 +- .../licenses/MIT-winp | 20 +- 25 files changed, 179 insertions(+), 1782 deletions(-) -- To stop receiving notification emails like this one, please contact matthiasblaes...@apache.org. --------------------------------------------------------------------- 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