diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 3f709cb77f..bfc05b3cfe 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -51,6 +51,9 @@ public class Maven extends Builder { * Identifies {@link MavenInstallation} to be used. */ private final String mavenName; + + private final static String MAVEN_1_INSTALLATION_COMMON_FILE = "bin/maven"; + private final static String MAVEN_2_INSTALLATION_COMMON_FILE = "bin/mvn"; @DataBoundConstructor public Maven(String targets,String name) { @@ -257,8 +260,13 @@ public class Maven extends Builder { return; } - // I couldn't come up with a simple logic to test for a maven installation - // there seems to be just too much difference between m1 and m2. + File maven1File = new File(f,MAVEN_1_INSTALLATION_COMMON_FILE); + File maven2File = new File(f,MAVEN_2_INSTALLATION_COMMON_FILE); + + if(!maven1File.exists() && !maven2File.exists()) { + error(Messages.Maven_NotMavenDirectory(f)); + return; + } ok(); } diff --git a/core/src/main/resources/hudson/tasks/Messages.properties b/core/src/main/resources/hudson/tasks/Messages.properties index db04f8f81e..715a16ec6a 100644 --- a/core/src/main/resources/hudson/tasks/Messages.properties +++ b/core/src/main/resources/hudson/tasks/Messages.properties @@ -54,6 +54,7 @@ Mailer.UserProperty.DisplayName=E-mail Maven.DisplayName=Invoke top-level Maven targets Maven.ExecFailed=command execution failed Maven.MavenHomeRequired=MAVEN_HOME is required +Maven.NotMavenDirectory={0} doesn''t look like a Maven directory Maven.NoExecutable=Couldn''t find any executable in {0} Maven.NotADirectory={0} is not a directory diff --git a/core/src/main/resources/hudson/tasks/Messages_de.properties b/core/src/main/resources/hudson/tasks/Messages_de.properties index a65f4e254e..86b262f034 100644 --- a/core/src/main/resources/hudson/tasks/Messages_de.properties +++ b/core/src/main/resources/hudson/tasks/Messages_de.properties @@ -53,6 +53,7 @@ Mailer.UserProperty.DisplayName=E-Mail Maven.DisplayName=Maven Goals aufrufen Maven.ExecFailed=Befehlsausführung fehlgeschlagen Maven.MavenHomeRequired=MAVEN_HOME muß gesetzt sein +Maven.NotMavenDirectory={0} sieht nicht wie ein Maven-Verzeichnis aus. Maven.NoExecutable=Konnte keine ausführbare Datei in {0} finden Maven.NotADirectory={0} ist kein Verzeichnis diff --git a/core/src/main/resources/hudson/tasks/Messages_fr.properties b/core/src/main/resources/hudson/tasks/Messages_fr.properties index 32862d9288..feb8af5128 100644 --- a/core/src/main/resources/hudson/tasks/Messages_fr.properties +++ b/core/src/main/resources/hudson/tasks/Messages_fr.properties @@ -53,6 +53,7 @@ Mailer.UserProperty.DisplayName=Email Maven.DisplayName=Invoquer les cibles Maven de haut niveau Maven.ExecFailed=L''exécution de la commande a échoué. Maven.MavenHomeRequired=MAVEN_HOME est obligatoire +Maven.NotMavenDirectory={0} ne semble pas être un répertoire Maven Maven.NoExecutable=Impossible de trouver un exécutable dans {0} Maven.NotADirectory={0} n''est pas un répertoire diff --git a/core/src/main/resources/hudson/tasks/Messages_ja.properties b/core/src/main/resources/hudson/tasks/Messages_ja.properties index 1106316e75..d78208aea4 100644 --- a/core/src/main/resources/hudson/tasks/Messages_ja.properties +++ b/core/src/main/resources/hudson/tasks/Messages_ja.properties @@ -24,4 +24,5 @@ JavadocArchiver.DisplayName=Javadoc\u306e\u4fdd\u5b58 JavadocArchiver.DisplayName.Generic=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 JavadocArchiver.DisplayName.Javadoc=Javadoc Maven.DisplayName=Maven\u306e\u547c\u3073\u51fa\u3057 -Maven.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093 \ No newline at end of file +Maven.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093 +Maven.NotMavenDirectory={0}\u306b\u306fMaven\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059 diff --git a/core/src/main/resources/hudson/tasks/Messages_nl.properties b/core/src/main/resources/hudson/tasks/Messages_nl.properties index bb60f47442..2a28d43f8c 100644 --- a/core/src/main/resources/hudson/tasks/Messages_nl.properties +++ b/core/src/main/resources/hudson/tasks/Messages_nl.properties @@ -52,6 +52,7 @@ Mailer.UserProperty.DisplayName=E-mail Maven.DisplayName=Voer top-niveau Maven taken uit Maven.ExecFailed=uitvoer commando is gefaald Maven.MavenHomeRequired=MAVEN_HOME is verplicht +Maven.NotMavenDirectory={0} is geen Maven folder Maven.NoExecutable=Kon geen uitvoerbaar bestand vinde in {0} Maven.NotADirectory={0} is geen folder diff --git a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties index c6d054db20..11d71ecd85 100644 --- a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties @@ -52,6 +52,7 @@ Mailer.UserProperty.DisplayName=E-mail Maven.DisplayName=Invocar alvos Maven de alto n\u00EDvel Maven.ExecFailed=execu\u00E7\u00E3o de comando falhou Maven.MavenHomeRequired=MAVEN_HOME \u00E9 requerido +Maven.NotMavenDirectory={0} n\u00E3o parece ser um diret\u00F3rio Maven Maven.NoExecutable=N\u00E3o pode encontrar nehum execut\u00E1vel em {0} Maven.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio diff --git a/core/src/main/resources/hudson/tasks/Messages_ru.properties b/core/src/main/resources/hudson/tasks/Messages_ru.properties index 99898eab0b..2a43d6f6e8 100644 --- a/core/src/main/resources/hudson/tasks/Messages_ru.properties +++ b/core/src/main/resources/hudson/tasks/Messages_ru.properties @@ -52,6 +52,7 @@ Mailer.UserProperty.DisplayName=\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u043 Maven.DisplayName=\u0412\u044b\u0437\u0432\u0430\u0442\u044c \u0446\u0435\u043b\u0438 Maven \u0432\u0435\u0440\u0445\u043d\u0435\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f Maven.ExecFailed=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c Maven.MavenHomeRequired=MAVEN_HOME \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d +Maven.NotMavenDirectory={0} \u043d\u0435 \u043f\u043e\u0445\u043e\u0436\u0430 \u043d\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e Maven Maven.NoExecutable=\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u044f\u0435\u043c\u044b\u0445 \u0444\u0430\u0439\u043b\u043e\u0432 \u0432 {0} Maven.NotADirectory={0} \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0435\u0439 diff --git a/core/src/main/resources/hudson/tasks/Messages_tr.properties b/core/src/main/resources/hudson/tasks/Messages_tr.properties index 8a09fa562e..a6d7eee7df 100644 --- a/core/src/main/resources/hudson/tasks/Messages_tr.properties +++ b/core/src/main/resources/hudson/tasks/Messages_tr.properties @@ -52,6 +52,7 @@ Mailer.UserProperty.DisplayName=E-posta Maven.DisplayName=En \u00fcst seviye Maven hedeflerini \u00e7al\u0131\u015ft\u0131r Maven.ExecFailed=Komut \u00e7al\u0131\u015ft\u0131rma ba\u015far\u0131s\u0131z Maven.MavenHomeRequired=MAVEN_HOME gerekli +Maven.NotMavenDirectory={0}, bir Maven dizinine benzemiyor Maven.NoExecutable={0} i\u00e7erisinde herhangi bir \u00e7al\u0131\u015ft\u0131r\u0131labilir bulunamad\u0131 Maven.NotADirectory={0}, bir dizin de\u011fil