Merge pull request #138 from aheritier/JENKINS-9791

[FIXED JENKINS-9791] : Improve the post deployment job to make a clear error if you disabled artifacts archives
jenkinsci · May 30, 2011 · c5d1b42 · c5d1b42
2 parents 84a78d5 + be03ace
commit c5d1b42
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
@@ -122,6 +122,14 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
             return true;
         }
 
+        if(build instanceof MavenModuleSetBuild && ((MavenModuleSetBuild)build).getParent().isArchivingDisabled()){
+          listener.getLogger().println("[ERROR] You cannot use the \"Deploy artifacts to Maven repository\" feature if you " +
+                                           "disabled " +
+                                           "automatic artifact archiving");
+          build.setResult(Result.FAILURE);
+          return true;
+        }
+
         listener.getLogger().println("Deploying artifacts to "+url);
         try {
 

diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html
@@ -13,4 +13,8 @@
   Note that regardless of this configuration, you can always manually come back
   to Jenkins and deploy any of the past artifacts to any repository of your choice,
   after the fact.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html
@@ -11,4 +11,9 @@
   <p>
   Hinweis: Unabhängig von dieser Einstellung können Sie aber auch jederzeit manuell
   Artefakte aus durchgeführten Builds in beliebige Repositories ausbringen.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
+
 </div>
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html
@@ -13,4 +13,8 @@
   Note that regardless of this configuration, you can always manually come back
   to Jenkins and deploy any of the past artifacts to any repository of your choice,
   after the fact.
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html
@@ -9,4 +9,8 @@
 
   <p>
   この設定を行っているかによらず、Jenkinsの画面からいつでも過去の成果物を任意のリポジトリにデプロイできます。
+
+  <p>
+  <b>To use this feature you shouldn't deactivate the automatic artifact archiving.</b>
+  </p>
 </div>