Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

respect MVNW_VERBOSE when printing diagnostic stuff

This commit is contained in:
Konstantin Sobolev 2017-10-19 10:35:15 -07:00 committed by rfscholte
parent 4d3985c4b3
commit 68e102a63c
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
View File

@ -77,13 +77,13 @@ public class DefaultDownloader implements Downloader {
while ((numRead = in.read(buffer)) != -1) { while ((numRead = in.read(buffer)) != -1) {
progressCounter += numRead; progressCounter += numRead;
if (progressCounter / PROGRESS_CHUNK > 0) { if (progressCounter / PROGRESS_CHUNK > 0) {
System.out.print("."); Logger.info(".");
progressCounter = progressCounter - PROGRESS_CHUNK; progressCounter = progressCounter - PROGRESS_CHUNK;
} }
out.write(buffer, 0, numRead); out.write(buffer, 0, numRead);
} }
} finally { } finally {
System.out.println(""); Logger.info("");
if (in != null) { if (in != null) {
in.close(); in.close();
} }

12
maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
View File

@ -60,7 +60,7 @@ public class Installer {
if (alwaysDownload || !localZipFile.exists()) { if (alwaysDownload || !localZipFile.exists()) {
File tmpZipFile = new File(localZipFile.getParentFile(), localZipFile.getName() + ".part"); File tmpZipFile = new File(localZipFile.getParentFile(), localZipFile.getName() + ".part");
tmpZipFile.delete(); tmpZipFile.delete();
System.out.println("Downloading " + distributionUrl); Logger.info("Downloading " + distributionUrl);
download.download(distributionUrl, tmpZipFile); download.download(distributionUrl, tmpZipFile);
tmpZipFile.renameTo(localZipFile); tmpZipFile.renameTo(localZipFile);
downloaded = true; downloaded = true;
@ -71,10 +71,10 @@ public class Installer {
if (downloaded || alwaysUnpack || dirs.isEmpty()) { if (downloaded || alwaysUnpack || dirs.isEmpty()) {
for (File dir : dirs) { for (File dir : dirs) {
System.out.println("Deleting directory " + dir.getAbsolutePath()); Logger.info("Deleting directory " + dir.getAbsolutePath());
deleteDir(dir); deleteDir(dir);
} }
System.out.println("Unzipping " + localZipFile.getAbsolutePath() + " to " + distDir.getAbsolutePath()); Logger.info("Unzipping " + localZipFile.getAbsolutePath() + " to " + distDir.getAbsolutePath());
unzip(localZipFile, distDir); unzip(localZipFile, distDir);
dirs = listDirs(distDir); dirs = listDirs(distDir);
if (dirs.isEmpty()) { if (dirs.isEmpty()) {
@ -110,7 +110,7 @@ public class Installer {
ProcessBuilder pb = new ProcessBuilder("chmod", "755", mavenCommand.getCanonicalPath()); ProcessBuilder pb = new ProcessBuilder("chmod", "755", mavenCommand.getCanonicalPath());
Process p = pb.start(); Process p = pb.start();
if (p.waitFor() == 0) { if (p.waitFor() == 0) {
System.out.println("Set executable permissions for: " + mavenCommand.getAbsolutePath()); Logger.info("Set executable permissions for: " + mavenCommand.getAbsolutePath());
} else { } else {
BufferedReader is = new BufferedReader(new InputStreamReader(p.getInputStream())); BufferedReader is = new BufferedReader(new InputStreamReader(p.getInputStream()));
Formatter stdout = new Formatter(); Formatter stdout = new Formatter();
@ -126,8 +126,8 @@ public class Installer {
errorMessage = e.getMessage(); errorMessage = e.getMessage();
} }
if (errorMessage != null) { if (errorMessage != null) {
System.out.println("Could not set executable permissions for: " + mavenCommand.getAbsolutePath()); Logger.warn("Could not set executable permissions for: " + mavenCommand.getAbsolutePath());
System.out.println("Please do this manually if you want to use maven."); Logger.warn("Please do this manually if you want to use maven.");
} }
} }

18
maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java Normal file
View File

@ -0,0 +1,18 @@
package org.apache.maven.wrapper;
/**
* @author <a href="mailto:konstantin.sobolev@gmail.com">Konstantin Sobolev</a>
*/
public class Logger {
private static final boolean VERBOSE = "true".equalsIgnoreCase(MavenWrapperMain.MVNW_VERBOSE);
public static void info(String msg) {
if (VERBOSE) {
System.out.println(msg);
}
}
public static void warn(String msg) {
System.out.println(msg);
}
}

7
maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
View File

@ -39,17 +39,12 @@ public class MavenWrapperMain {
public static final String MVNW_VERBOSE = "MVNW_VERBOSE"; public static final String MVNW_VERBOSE = "MVNW_VERBOSE";
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
boolean verbose = "true".equalsIgnoreCase(System.getenv(MVNW_VERBOSE));
File wrapperJar = wrapperJar(); File wrapperJar = wrapperJar();
File propertiesFile = wrapperProperties(wrapperJar); File propertiesFile = wrapperProperties(wrapperJar);
File rootDir = rootDir(wrapperJar); File rootDir = rootDir(wrapperJar);
String wrapperVersion = wrapperVersion(); String wrapperVersion = wrapperVersion();
Logger.info("Takari Maven Wrapper " + wrapperVersion);
if (verbose) {
System.out.println("Takari Maven Wrapper " + wrapperVersion);
}
Properties systemProperties = System.getProperties(); Properties systemProperties = System.getProperties();
systemProperties.putAll(parseSystemPropertiesFromArgs(args)); systemProperties.putAll(parseSystemPropertiesFromArgs(args));

2
maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
View File

@ -29,6 +29,8 @@ public class DownloaderTest {
testDir = new File("target/test-files/DownloadTest"); testDir = new File("target/test-files/DownloadTest");
rootDir = new File(testDir, "root"); rootDir = new File(testDir, "root");
downloadFile = new File(rootDir, "file"); downloadFile = new File(rootDir, "file");
if (downloadFile.exists())
downloadFile.delete();
remoteFile = new File(testDir, "remoteFile"); remoteFile = new File(testDir, "remoteFile");
FileUtils.write(remoteFile, "sometext"); FileUtils.write(remoteFile, "sometext");
sourceRoot = remoteFile.toURI(); sourceRoot = remoteFile.toURI();