Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Download binaries task is broken #1313

Merged
merged 3 commits into from
Jun 21, 2019
Merged

Download binaries task is broken #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
022de83
Test to verify that DownloadBinaries from tasks.jar is properly funct…
Jun 19, 2019
02b8d54
Adding missing ConfigureProxy class
Jun 19, 2019
7500714
Removing unnecessary imports
Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions harness/apisupport.harness/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion harness/apisupport.harness/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down