geertjanw closed pull request #261: Removing notice fragments that are unnecessary per the release vote t? URL: https://github.com/apache/incubator-netbeans/pull/261
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/junitlib/external/junit-4.12-notice.txt b/junitlib/external/junit-4.12-notice.txt deleted file mode 100644 index 952103043..000000000 --- a/junitlib/external/junit-4.12-notice.txt +++ /dev/null @@ -1,2 +0,0 @@ -JUnit 4.12 is licensed under EPL-v10. -See https://www.eclipse.org/legal/epl-v10.html. diff --git a/libs.felix/external/org.apache.felix.main-4.2.1-notice.txt b/libs.felix/external/org.apache.felix.main-4.2.1-notice.txt index 49171bdb6..8b4b009ac 100644 --- a/libs.felix/external/org.apache.felix.main-4.2.1-notice.txt +++ b/libs.felix/external/org.apache.felix.main-4.2.1-notice.txt @@ -1,7 +1,3 @@ - -Apache Felix Main -Copyright 2006-2013 The Apache Software Foundation - This product includes software developed at The OSGi Alliance (http://www.osgi.org/). Copyright (c) OSGi Alliance (2000, 2012). diff --git a/nbbuild/build.xml b/nbbuild/build.xml index db1024677..ae53891ac 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1475,6 +1475,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <fileset file="${nb.build.dir}/notice-temp" /> <fileset dir="${nb_all}" includes="*/notice.txt" /> + <filterchain> + <tokenfilter> + <filetokenizer /> + <replaceregex pattern="(\r?\n)(\r?\n)+" + replace="\1\1" + flags="g" /> + </tokenfilter> + </filterchain> </concat> <dirset id="source.dirset" dir="${nb_all}" includes="${allmodules}" @@ -1508,7 +1516,15 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <concat destfile="${nb.build.dir}/NOTICE"> <fileset file="${nb_all}/nbbuild/notice-stub.txt" /> <fileset dir="${nb_all}" - includes="*/notice.txt" /> + includes="*/notice.txt" /> + <filterchain> + <tokenfilter> + <filetokenizer /> + <replaceregex pattern="(\r?\n)(\r?\n)+" + replace="\1\1" + flags="g" /> + </tokenfilter> + </filterchain> </concat> <concat destfile="${nb.build.dir}/LICENSE"> <fileset file="${nb_all}/nbbuild/license-stub.txt" /> diff --git a/nbbuild/notice-stub.txt b/nbbuild/notice-stub.txt index 16737de03..5bfd3e752 100644 --- a/nbbuild/notice-stub.txt +++ b/nbbuild/notice-stub.txt @@ -5,4 +5,5 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The code is based on NetBeans Copyright (c) Oracle Corp -that has been kindly donated to the Apache Software Foundation. \ No newline at end of file +that has been kindly donated to the Apache Software Foundation. + diff --git a/net.java.html.boot.fx/external/net.java.html.boot.fx-1.5-notice.txt b/net.java.html.boot.fx/external/net.java.html.boot.fx-1.5-notice.txt deleted file mode 100644 index 7c16fe38c..000000000 --- a/net.java.html.boot.fx/external/net.java.html.boot.fx-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -FX WebView Bootstrap -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html.boot.script/external/net.java.html.boot.script-1.5-notice.txt b/net.java.html.boot.script/external/net.java.html.boot.script-1.5-notice.txt deleted file mode 100644 index ee3ec2a82..000000000 --- a/net.java.html.boot.script/external/net.java.html.boot.script-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Presenter via javax.script -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html.boot/external/net.java.html.boot-1.5-notice.txt b/net.java.html.boot/external/net.java.html.boot-1.5-notice.txt deleted file mode 100644 index f24655d25..000000000 --- a/net.java.html.boot/external/net.java.html.boot-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Browser Bootstrap -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html.geo/external/net.java.html.geo-1.5-notice.txt b/net.java.html.geo/external/net.java.html.geo-1.5-notice.txt deleted file mode 100644 index 053a84375..000000000 --- a/net.java.html.geo/external/net.java.html.geo-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Geolocation API -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html.json/external/net.java.html.json-1.5-notice.txt b/net.java.html.json/external/net.java.html.json-1.5-notice.txt deleted file mode 100644 index d5325846b..000000000 --- a/net.java.html.json/external/net.java.html.json-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -JSON Model in Java -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html.sound/external/net.java.html.sound-1.5-notice.txt b/net.java.html.sound/external/net.java.html.sound-1.5-notice.txt deleted file mode 100644 index 559b34db8..000000000 --- a/net.java.html.sound/external/net.java.html.sound-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Sound API via HTML -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/net.java.html/external/net.java.html-1.5-notice.txt b/net.java.html/external/net.java.html-1.5-notice.txt deleted file mode 100644 index 772244323..000000000 --- a/net.java.html/external/net.java.html-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -HTML Context -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/o.n.html.ko4j/external/ko4j-1.5-notice.txt b/o.n.html.ko4j/external/ko4j-1.5-notice.txt deleted file mode 100644 index fa790e6a6..000000000 --- a/o.n.html.ko4j/external/ko4j-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Knockout.js for Java -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/o.n.html.xhr4j/external/xhr4j-1.5-notice.txt b/o.n.html.xhr4j/external/xhr4j-1.5-notice.txt deleted file mode 100644 index 1902957d4..000000000 --- a/o.n.html.xhr4j/external/xhr4j-1.5-notice.txt +++ /dev/null @@ -1,8 +0,0 @@ - -XHR via Java -Copyright 2017 NetBeans - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
