This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch release100 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/release100 by this push: new 33982a2 [NETBEANS-1719] Removing accidentally added jar files. 33982a2 is described below commit 33982a214aba038c43ac9e399e75d887d3cac9e5 Author: Jan Lahoda <jlah...@netbeans.org> AuthorDate: Wed Nov 21 18:26:51 2018 +0100 [NETBEANS-1719] Removing accidentally added jar files. --- nbbuild/build.xml | 11 +++++++++-- .../api/autoupdate/data/dummy-signed-twice.jar | Bin 4368 -> 0 bytes .../org/netbeans/api/autoupdate/data/dummy-signed.jar | Bin 2796 -> 0 bytes platform/javahelp/external/jhall-2.0_05.jar | Bin 562749 -> 0 bytes platform/libs.junit4/external/hamcrest-core-1.3.jar | Bin 45024 -> 0 bytes platform/libs.junit4/external/junit-4.12.jar | Bin 314932 -> 0 bytes platform/libs.osgi/external/osgi.cmpn-4.2.jar | Bin 223786 -> 0 bytes .../org.eclipse.osgi_3.9.1.v20140110-1610.jar | Bin 1333309 -> 0 bytes 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 4aabaa0..8c6e57f 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -72,8 +72,8 @@ <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> <manifest dir="${nb_all}"> <include name="nbbuild/external/binaries-list"/> - <include name="libs.junit4/external/binaries-list"/> - <include name="javahelp/external/binaries-list"/> + <include name="platform/libs.junit4/external/binaries-list"/> + <include name="platform/javahelp/external/binaries-list"/> </manifest> </downloadbinaries> @@ -1618,9 +1618,16 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </condition> <zip zipfile="${nb.build.dir}/${cluster.config}-src-${buildnum}.zip" duplicate="preserve"> <zipfileset dir="${nb_all}" includes="${source.dirs}"> + <!--exclude all build directories and external jars/zips in the top level directory:--> <exclude name="*/build/"/> <exclude name="*/external/*.jar"/> <exclude name="*/external/*.zip"/> + <!--exclude all build directories and external jars/zips in the cluster directories, + but keep nbi/infra/build, which is a directory with sources:--> + <exclude name="[^n]*/*/build/"/> + <exclude name="nb/*/build/"/> + <exclude name="*/*/external/*.jar"/> + <exclude name="*/*/external/*.zip"/> <exclude name="nbbuild/netbeans/**"/> <exclude name="nbbuild/cluster.properties" /> </zipfileset> diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed-twice.jar b/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed-twice.jar deleted file mode 100644 index 60f11c4..0000000 Binary files a/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed-twice.jar and /dev/null differ diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed.jar b/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed.jar deleted file mode 100644 index 3926208..0000000 Binary files a/platform/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/dummy-signed.jar and /dev/null differ diff --git a/platform/javahelp/external/jhall-2.0_05.jar b/platform/javahelp/external/jhall-2.0_05.jar deleted file mode 100644 index d0ad2e9..0000000 Binary files a/platform/javahelp/external/jhall-2.0_05.jar and /dev/null differ diff --git a/platform/libs.junit4/external/hamcrest-core-1.3.jar b/platform/libs.junit4/external/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16..0000000 Binary files a/platform/libs.junit4/external/hamcrest-core-1.3.jar and /dev/null differ diff --git a/platform/libs.junit4/external/junit-4.12.jar b/platform/libs.junit4/external/junit-4.12.jar deleted file mode 100644 index 3a7fc26..0000000 Binary files a/platform/libs.junit4/external/junit-4.12.jar and /dev/null differ diff --git a/platform/libs.osgi/external/osgi.cmpn-4.2.jar b/platform/libs.osgi/external/osgi.cmpn-4.2.jar deleted file mode 100644 index d8ca2ba..0000000 Binary files a/platform/libs.osgi/external/osgi.cmpn-4.2.jar and /dev/null differ diff --git a/platform/netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar b/platform/netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar deleted file mode 100644 index f99b8af..0000000 Binary files a/platform/netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar and /dev/null differ --------------------------------------------------------------------- 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