You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/11/21 18:15:40 UTC
[GitHub] lkishalmi closed pull request #1026: [NETBEANS-1719] Removing
accidentally added jar files.
lkishalmi closed pull request #1026: [NETBEANS-1719] Removing accidentally added jar files.
URL: https://github.com/apache/incubator-netbeans/pull/1026
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/nbbuild/build.xml b/nbbuild/build.xml
index 981a07b518..889f6bc21b 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>
@@ -1622,9 +1622,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 60f11c444c..0000000000
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 3926208e63..0000000000
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 d0ad2e9c69..0000000000
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 9d5fe16e3d..0000000000
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 3a7fc266c3..0000000000
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 d8ca2bacf3..0000000000
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 f99b8af20d..0000000000
Binary files a/platform/netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar and /dev/null differ
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists