dorkbox
/
JavaBuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved maven check to just before it tries to upload (so that logic can 

be executed/checked if not connected to the internet)
This commit is contained in:
nathan 2018-02-19 15:03:40 +01:00
parent 36de9e55da
commit 6fb9520b78
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/dorkbox/build/MavenExporter.java
View File

@ -15,13 +15,7 @@
*/
package dorkbox.build;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.*;
import java.net.ConnectException;
import java.net.URL;
import java.util.List;
@ -30,16 +24,7 @@ import java.util.Properties;
import org.bouncycastle.openpgp.PGPException;
import org.slf4j.LoggerFactory;
import com.ning.http.client.AsyncHandler;
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfig;
import com.ning.http.client.HttpResponseBodyPart;
import com.ning.http.client.HttpResponseHeaders;
import com.ning.http.client.HttpResponseStatus;
import com.ning.http.client.ListenableFuture;
import com.ning.http.client.Request;
import com.ning.http.client.RequestBuilder;
import com.ning.http.client.Response;
import com.ning.http.client.*;
import com.ning.http.client.providers.jdk.JDKAsyncHttpProvider;
import com.ning.http.multipart.FilePart;
import com.ning.http.multipart.StringPart;
@ -134,25 +119,6 @@ class MavenExporter {
BuildLog.start();
// make sure we have internet!
URL maven = new URL("http://www.maven.org/");
BufferedReader in = null;
boolean hasInternet = false;
try {
in = new BufferedReader(new InputStreamReader(maven.openStream()));
hasInternet = true;
} catch (Exception ignored) {
} finally {
IO.closeQuietly(in);
}
if (!hasInternet) {
BuildLog.title("MAVEN").println("Not able to connect to maven.org, aborting.");
BuildLog.finish();
return;
}
BuildLog.title("MAVEN").println("Exporting to sonatype");
// TODO: maybe use straight java (ie: no libs?)
@ -265,6 +231,26 @@ class MavenExporter {
return;
}
// make sure we have internet!
URL maven = new URL("http://www.maven.org/");
BufferedReader in = null;
boolean hasInternet = false;
try {
in = new BufferedReader(new InputStreamReader(maven.openStream()));
hasInternet = true;
} catch (Exception ignored) {
} finally {
IO.closeQuietly(in);
}
if (!hasInternet) {
BuildLog.title("MAVEN")
.println("Not able to connect to maven.org, aborting.");
BuildLog.finish();
return;
}
final File pomAscFile = new File(pomFile.getAbsolutePath() + ".asc");
final File jarAscFile = new File(jarFile.getAbsolutePath() + ".asc");