continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r781888 - /continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Date Fri, 05 Jun 2009 02:06:19 GMT
Author: ctan
Date: Fri Jun  5 02:06:19 2009
New Revision: 781888

URL: http://svn.apache.org/viewvc?rev=781888&view=rev
Log:
[CONTINUUM-2257] do not override release arguments when setting the local repository

Modified:
    continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java

Modified: continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=781888&r1=781887&r2=781888&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Fri Jun  5 02:06:19 2009
@@ -41,6 +41,7 @@
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author Jason van Zyl
@@ -252,7 +253,17 @@
 
         if ( repository != null )
         {
-            descriptor.setAdditionalArguments( "\"-Dmaven.repo.local=" + repository.getLocation()
+ "\"" );
+            String args = descriptor.getAdditionalArguments();
+
+            if ( StringUtils.isNotEmpty( args ) )
+            {
+                descriptor.setAdditionalArguments( args +
+                                                   " \"-Dmaven.repo.local=" + repository.getLocation()
+ "\"" );
+            }
+            else
+            {
+                descriptor.setAdditionalArguments( "\"-Dmaven.repo.local=" + repository.getLocation()
+ "\"" );
+            }
         }
 
         //other properties



Mime
View raw message