This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 2062551 Remove incubator parts (#1221) 2062551 is described below commit 20625511b56d48b2d0797cb0dfd838ec9e09a655 Author: Junichi Yamamoto <junich...@apache.org> AuthorDate: Tue Apr 30 15:13:52 2019 +0900 Remove incubator parts (#1221) - Remove "incubator" - Fix the Travis CI and the Jenkins build links - Remove DISCLAIMER - Apply the patch for DISCLAIMER from @matthiasblaesing --- DISCLAIMER | 8 -------- README.md | 20 ++++++++++---------- nbbuild/build.xml | 4 ---- nbbuild/templates/projectized.xml | 5 ----- 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index d6f7fea..0000000 --- a/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache NetBeans is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of -all newly accepted projects until a further review indicates that the -infrastructure, communications, and decision making process have stabilized in -a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the -ASF. diff --git a/README.md b/README.md index a286b34..ff3529e 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ Apache NetBeans is an open source development environment, tooling platform, and ### Build status * TravisCI: - * [![Build Status](https://travis-ci.org/apache/incubator-netbeans.svg?branch=master)](https://travis-ci.org/apache/incubator-netbeans) + * [![Build Status](https://travis-ci.org/apache/netbeans.svg?branch=master)](https://travis-ci.org/apache/netbeans) * Apache Jenkins: - * Linux: [![Build Status](https://builds.apache.org/job/incubator-netbeans-linux/badge/icon)](https://builds.apache.org/job/incubator-netbeans-linux/) - * Windows: [![Build Status](https://builds.apache.org/job/incubator-netbeans-windows/badge/icon)](https://builds.apache.org/job/incubator-netbeans-windows/) + * Linux: [![Build Status](https://builds.apache.org/view/M-R/view/NetBeans/job/netbeans-linux/badge/icon)](https://builds.apache.org/view/M-R/view/NetBeans/job/netbeans-linux/) + * Windows: [![Build Status](https://builds.apache.org/view/M-R/view/NetBeans/job/netbeans-windows/badge/icon)](https://builds.apache.org/view/M-R/view/NetBeans/job/netbeans-windows/) ### Requirements @@ -40,11 +40,11 @@ Apache NetBeans is an open source development environment, tooling platform, and **Note:** NetBeans also runs with JDK 8, although then it will not include tools for the JDK 9 Shell. -**Note:** NetBeans license violation checks are managed via the [rat-exclusions.txt](https://github.com/apache/incubator-netbeans/blob/master/nbbuild/rat-exclusions.txt) file. +**Note:** NetBeans license violation checks are managed via the [rat-exclusions.txt](https://github.com/apache/netbeans/blob/master/nbbuild/rat-exclusions.txt) file. ### Building NetBeans -Build with the default config (See the [cluster.config](https://github.com/apache/incubator-netbeans/blob/ab66c7fdfdcbf0bde67b96ddb075c83451cdd1a6/nbbuild/cluster.properties#L19) property.) +Build with the default config (See the [cluster.config](https://github.com/apache/netbeans/blob/ab66c7fdfdcbf0bde67b96ddb075c83451cdd1a6/nbbuild/cluster.properties#L19) property.) ``` $ ant ``` @@ -61,7 +61,7 @@ Build the NetBeans Platform: $ ant -Dcluster.config=platform ``` -**Note:** You can also use `php`, `enterprise`, etc. See the [cluster.properties](https://github.com/apache/incubator-netbeans/blob/master/nbbuild/cluster.properties) file. +**Note:** You can also use `php`, `enterprise`, etc. See the [cluster.properties](https://github.com/apache/netbeans/blob/master/nbbuild/cluster.properties) file. #### Building Windows Launchers Windows launchers can be build using [MinGW](http://www.mingw.org/) both on Windows and Linux. @@ -87,9 +87,9 @@ $ ant tryme ### Get In Touch -[Subscribe](mailto:users-subscr...@netbeans.incubator.apache.org) or [mail](mailto:us...@netbeans.incubator.apache.org) the [us...@netbeans.incubator.apache.org](mailto:us...@netbeans.incubator.apache.org) list - Ask questions, find answers, and also help other users. +[Subscribe](mailto:users-subscr...@netbeans.apache.org) or [mail](mailto:us...@netbeans.apache.org) the [us...@netbeans.apache.org](mailto:us...@netbeans.apache.org) list - Ask questions, find answers, and also help other users. -[Subscribe](mailto:dev-subscr...@netbeans.incubator.apache.org) or [mail](mailto:d...@netbeans.incubator.apache.org) the [d...@netbeans.incubator.apache.org](mailto:d...@netbeans.incubator.apache.org) list - Join development discussions, propose new ideas and connect with contributors. +[Subscribe](mailto:dev-subscr...@netbeans.apache.org) or [mail](mailto:d...@netbeans.apache.org) the [d...@netbeans.apache.org](mailto:d...@netbeans.apache.org) list - Join development discussions, propose new ideas and connect with contributors. ### Download @@ -109,8 +109,8 @@ is kept in an independent repository. To fully understand the code you may want to merge the modern and ancient versions together: ```bash -$ git clone https://github.com/apache/incubator-netbeans.git -$ cd incubator-netbeans +$ git clone https://github.com/apache/netbeans.git +$ cd netbeans $ git log platform/uihandler/arch.xml ``` diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 24f76f5..7c03de8 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -108,7 +108,6 @@ </fileset> <zipfileset dir="${nb_all}" includes="LICENSE" fullpath="META-INF/LICENSE"/> <zipfileset dir="${nb_all}/nbbuild" includes="notice-stub.txt" fullpath="META-INF/NOTICE"/> - <zipfileset dir="${nb_all}" includes="DISCLAIMER" fullpath="META-INF/DISCLAIMER"/> </jar> <taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/> </target> @@ -586,7 +585,6 @@ Hg ID: ${hg.id} <include name="*.css"/> <include name="*.html"/> <include name="DEPENDENCIES"/> - <include name="DISCLAIMER"/> <include name="LICENSE"/> <include name="NOTICE"/> <include name="licenses/**"/> @@ -1603,7 +1601,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d /> <taskdef name="createdependencies" classname="org.netbeans.nbbuild.extlibs.CreateDependencies" classpath="${nbantext.jar}"/> <createdependencies refid="source.dirset" dependencies="${netbeans.dest.dir}/DEPENDENCIES"/> - <copy file="${nb_all}/DISCLAIMER" tofile="${netbeans.dest.dir}/DISCLAIMER" /> </target> <target name="-copy-platform-readme" depends="-check-nb-cluster" unless="has.nb.cluster"> @@ -1680,7 +1677,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <zipfileset file="${nb.build.dir}/NOTICE" /> <zipfileset file="${nb.build.dir}/LICENSE" /> <zipfileset dir="${nb.build.dir}/licenses" includes="**" prefix="licenses" /> - <zipfileset file="${nb_all}/DISCLAIMER" /> <zipfileset file="${source.zip.readme}" fullpath="README.md" erroronmissingarchive="false" /> </zip> </target> diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml index 903ef67..4cc1058 100644 --- a/nbbuild/templates/projectized.xml +++ b/nbbuild/templates/projectized.xml @@ -227,7 +227,6 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= <jar> <zipfileset dir="${nb_all}" includes="LICENSE" fullpath="META-INF/LICENSE"/> <zipfileset dir="${nb_all}/nbbuild" includes="notice-stub.txt" fullpath="META-INF/NOTICE"/> - <zipfileset dir="${nb_all}" includes="DISCLAIMER" fullpath="META-INF/DISCLAIMER"/> </jar> </presetdef> </target> @@ -399,7 +398,6 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= <zip zipfile="${netbeans.zipped.sources.dir}/${code.name.base.dashes}.zip"> <zipfileset dir="${src.dir}" /> <zipfileset dir="${build.dir}" prefix="META-INF" includes="LICENSE NOTICE" /> - <zipfileset dir="${nb_all}" prefix="META-INF" includes="DISCLAIMER" /> </zip> </target> @@ -444,7 +442,6 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= </filterchain> </concat> - <copy file="${nb_all}/DISCLAIMER" todir="${build.dir}/nbm-extras/META-INF/" /> <property name="license.file.override" location="${build.dir}/nbm-extras/META-INF/LICENSE"/> <property name="extra.license.files" value=""/> <zipfileset id="extra.nbm.files" dir="${build.dir}/nbm-extras/" /> @@ -547,8 +544,6 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= </tokenfilter> </filterchain> </concat> - - <copy file="${nb_all}/DISCLAIMER" todir="${build.classes.dir}/META-INF/" /> </target> <target name="jar" depends="-prepare-mandatory-files-for-module,projectized-common.jar" /> --------------------------------------------------------------------- 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