ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r726812 - in /ant/ivy/core/branches/2.0.x: ./ CHANGES.txt src/java/org/apache/ivy/Main.java
Date Mon, 15 Dec 2008 21:38:52 GMT
Author: maartenc
Date: Mon Dec 15 13:38:51 2008
New Revision: 726812

URL: http://svn.apache.org/viewvc?rev=726812&view=rev
Log:
IMPROVEMENT: Ivy Standalone setting to overwrite publications (IVY-976) (merged from trunk)

Modified:
    ant/ivy/core/branches/2.0.x/   (props changed)
    ant/ivy/core/branches/2.0.x/CHANGES.txt
    ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java

Propchange: ant/ivy/core/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 13:38:51 2008
@@ -1,2 +1,2 @@
 /ant/ivy/core/branches/2.0.0-rc2:707177-709027
-/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770
+/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,720308-720591

Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=726812&r1=726811&r2=726812&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.x/CHANGES.txt Mon Dec 15 13:38:51 2008
@@ -81,6 +81,10 @@
 	Patrick Woodworth
 	Jaroslaw Wypychowski
 	
+   2.0.0
+=====================================
+- IMPROVEMENT: Ivy Standalone setting to overwrite publications (IVY-976)
+
    2.0.0-rc2
 =====================================
 - DOCUMENTATION: Filesystem resolver: talks about "patterns" but does not mention these must
become absolute file paths (IVY-910)

Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java?rev=726812&r1=726811&r2=726812&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java (original)
+++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java Mon Dec 15 13:38:51 2008
@@ -120,6 +120,8 @@
                 .description("use given revision to publish the module").create())
             .addOption(new OptionBuilder("status").arg("status")
                 .description("use given status to publish the module").create())
+            .addOption(new OptionBuilder("overwrite")
+                .description("overwrite files in the repository if they exist").create())
 
             .addCategory("http auth options")
             .addOption(new OptionBuilder("realm").arg("realm")
@@ -271,7 +273,7 @@
                             .setPubrevision(settings.substitute(line.getOptionValue("revision")))
                             .setValidate(validate).setSrcIvyPattern(
                                 settings.substitute(line.getOptionValue("deliverto",
-                                    "ivy-[revision].xml"))));
+                                    "ivy-[revision].xml"))).setOverwrite(line.hasOption("overwrite")));
                 }
             }
             if (line.hasOption("main")) {



Mime
View raw message