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 71906fc9234b44c5851d149d75f6ad28dc9d5bfe
Merge: 112352a f45a226
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Sat Dec 29 16:09:26 2018 +0100
Merge pull request #1057 from matthiasblaesing/NETBEANS-1818
[Netbeans-1818] Fix/remove license files
.../nbproject/project.properties | 1 -
.../websvc.wsitconf/nbproject/project.properties | 1 -
.../nbproject/project.properties | 1 -
.../nbproject/project.properties | 1 -
.../nbproject/project.properties | 1 -
.../nbproject/project.properties | 1 -
ide/spellchecker/nbproject/project.properties | 1 -
.../XMLFormatterTest/testReformatSample2.pass | 4 +-
.../testReformat/netbeans_build.xml | 2 -
.../XMLFormatterTest/testReformatSample2.pass | 2 -
.../testReformat/netbeans_build.xml | 2 -
.../nbproject/project.properties | 1 -
.../org/netbeans/nbbuild/ModuleListParser.java | 5 +-
nbbuild/licenses/GPL-with-Proguard-exception | 382 -------
nbbuild/rat-exclusions.txt | 1 -
nbbuild/standard-nbm-license.txt | 1039 ++++----------------
.../nbbuild/InsertModuleAllTargetsTest.java | 32 +-
.../nbbuild/JarWithModuleAttributesTest.java | 4 +-
.../org/netbeans/nbbuild/ModuleListParserTest.java | 26 +-
.../org/netbeans/nbbuild/ParseProjectXmlTest.java | 4 +-
.../src/org/netbeans/nbbuild/RecursiveDeps.xml | 2 +
.../unit/src/org/netbeans/nbbuild/TestDeps.xml | 6 +-
platform/o.n.core/licenses/DISTRIBUTION.txt | 27 -
platform/o.n.core/licenses/LICENSE.txt | 733 --------------
.../o.n.core/licenses/THIRDPARTYLICENSEREADME.txt | 462 ---------
platform/o.n.core/nbproject/project.properties | 2 +-
26 files changed, 259 insertions(+), 2484 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
