From 022de83e18e53da97f44531da9d8d65aaa837275 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@oracle.com>
Date: Wed, 19 Jun 2019 17:09:11 +0200
Subject: [PATCH 1/3] Test to verify that DownloadBinaries from tasks.jar is
 properly functional

---
 harness/apisupport.harness/build.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/harness/apisupport.harness/build.xml b/harness/apisupport.harness/build.xml
index 256442d06ddd..548620f8fc35 100644
--- a/harness/apisupport.harness/build.xml
+++ b/harness/apisupport.harness/build.xml
@@ -32,6 +32,20 @@
             <zipfileset src="${nbantext.jar}" includes="${bundled.tasks}"/>
             <zipfileset file="taskdefs.properties" fullpath="org/netbeans/nbbuild/taskdefs.properties"/>
         </nb-ext-jar>
+        
+        <!-- verify that the DownloadBinaries task is properly functional -->
+        <taskdef name="TestDownload" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries">
+            <classpath>
+                <pathelement location="${cluster}/tasks.jar"></pathelement>
+            </classpath>
+        </taskdef>
+        <echo file="build/binaries-list">2F7553F50B0D14ED811B849C282DA8C1FFC32AAE org.ow2.asm:asm-all:5.0.1</echo>
+        <TestDownload>
+            <manifest dir="build">
+                <include name="binaries-list"/>
+            </manifest>
+        </TestDownload>
+        <delete file="build/asm-all-5.0.1.jar"/>
     </target>
 
     <target name="compile-jnlp-launcher" depends="init,compile">

From 02b8d54954b62f16fc0464825f4ee40f54fc07dc Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@oracle.com>
Date: Wed, 19 Jun 2019 17:10:05 +0200
Subject: [PATCH 2/3] Adding missing ConfigureProxy class

---
 harness/apisupport.harness/nbproject/project.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/harness/apisupport.harness/nbproject/project.properties b/harness/apisupport.harness/nbproject/project.properties
index 4f50462f6a1e..7db6d5727584 100644
--- a/harness/apisupport.harness/nbproject/project.properties
+++ b/harness/apisupport.harness/nbproject/project.properties
@@ -89,7 +89,8 @@ bundled.tasks=\
     org/netbeans/nbbuild/VerifyClassLinkage*.class,\
     org/netbeans/nbbuild/VerifyJNLP*.class,\
     org/netbeans/nbbuild/XMLUtil*.class,\
-    org/netbeans/nbbuild/extlibs/DownloadBinaries*.class
+    org/netbeans/nbbuild/extlibs/DownloadBinaries*.class,\
+    org/netbeans/nbbuild/extlibs/ConfigureProxy*.class
 
 test.unit.cp.extra=${netbeans.dest.dir}/harness/jnlp/jnlp-launcher.jar
 javadoc.arch=${basedir}/arch.xml

From 7500714b9c230388dd98371b83d7ea5ab8556d62 Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@oracle.com>
Date: Fri, 21 Jun 2019 10:59:16 +0200
Subject: [PATCH 3/3] Removing unnecessary imports

---
 .../org/netbeans/nbbuild/extlibs/DownloadBinaries.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
index c6f1363ca9a7..ae33e1c2a545 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
@@ -31,20 +31,12 @@
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;