You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/09/24 22:25:39 UTC
svn commit: r1389557 -
/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
Author: rmannibucau
Date: Mon Sep 24 20:25:39 2012
New Revision: 1389557
URL: http://svn.apache.org/viewvc?rev=1389557&view=rev
Log:
better guess of mvn command
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
Modified: openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java?rev=1389557&r1=1389556&r2=1389557&view=diff
==============================================================================
--- openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java (original)
+++ openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java Mon Sep 24 20:25:39 2012
@@ -113,7 +113,7 @@ public class CompareLibraries {
artifact = "-Dartifact=" + String.format("org.apache.openejb:%s:%s:%s", artifactId, version, "zip");
}
- final int i = Exec.exec("mvn", "-X", "org.apache.maven.plugins:maven-dependency-plugin:2.4:get", "-DrepoUrl=http://repo1.maven.apache.org/maven2", artifact);
+ final int i = Exec.exec(mvn(), "-X", "org.apache.maven.plugins:maven-dependency-plugin:2.4:get", "-DrepoUrl=http://repo1.maven.apache.org/maven2", artifact);
if (i != 0) {
throw new IllegalStateException("Download failed: " + i);
@@ -122,6 +122,22 @@ public class CompareLibraries {
return artifact(repository, artifactId, version, classifier);
}
+ private static String mvn() {
+ String m2 = System.getenv("M2_HOME");
+ if (m2 == null) {
+ m2 = System.getenv("MAVEN_HOME");
+ }
+ if (m2 == null) {
+ m2 = System.getProperty("M2_HOME");
+ }
+
+ if (m2 == null) {
+ return "mvn";
+ } else {
+ return m2 + "/bin/mvn";
+ }
+ }
+
private static List<File> list(File previousFile) throws IOException {
final List<File> files = new ArrayList<File>();