ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1373341 - in /ant/ivy/core/branches/2.3.x: ./ CHANGES.txt src/java/org/apache/ivy/ant/IvyBuildNumber.java src/java/org/apache/ivy/ant/IvyFindRevision.java
Date Wed, 15 Aug 2012 11:34:27 GMT
Author: hibou
Date: Wed Aug 15 11:34:27 2012
New Revision: 1373341

URL: http://svn.apache.org/viewvc?rev=1373341&view=rev
Log:
merge r1373340:
IVY-1344: fix setting the branch attribute (Thanks to Ales Nosek)

Modified:
    ant/ivy/core/branches/2.3.x/   (props changed)
    ant/ivy/core/branches/2.3.x/CHANGES.txt
    ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyBuildNumber.java
    ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyFindRevision.java

Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
  Merged /ant/ivy/core/trunk:r1373340

Modified: ant/ivy/core/branches/2.3.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/CHANGES.txt?rev=1373341&r1=1373340&r2=1373341&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.3.x/CHANGES.txt Wed Aug 15 11:34:27 2012
@@ -83,6 +83,7 @@ for detailed view of each issue, please 
 	Stephen Nesbitt
 	Joshua Nichols
 	Bernard Niset
+	Ales Nosek
 	David Maplesden
 	Glen Marchesani
 	Phil Messenger
@@ -134,6 +135,7 @@ for detailed view of each issue, please 
 - FIX: ivy.xml extends feature complains about Windows filesystem path (IVY-1359) (thanks
to Mitch Gitman and Jean-Louis Boudart)
 - FIX: buildlist task chokes on absolute path to parent Ivy module (IVY-1364) (thanks to
Mitch Gitman and Jean-Louis Boudart)
 - FIX: The ignore circular dependency strategy is clobbering the warn strategy (IVY-1353)
(Thanks to Carl Quinn)
+- FIX: Buildnumber and IvyFindRevision Ant tasks should honour defaultBranch setting (IVY-1344)
(Thanks to Ales Nosek)
 
    2.3.0-rc1
 =====================================

Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyBuildNumber.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyBuildNumber.java?rev=1373341&r1=1373340&r2=1373341&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyBuildNumber.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyBuildNumber.java Wed Aug 15
11:34:27 2012
@@ -147,7 +147,7 @@ public class IvyBuildNumber extends IvyT
         Ivy ivy = getIvyInstance();
         IvySettings settings = ivy.getSettings();
         if (branch == null) {
-            settings.getDefaultBranch(new ModuleId(organisation, module));
+            branch = settings.getDefaultBranch(new ModuleId(organisation, module));
         }
         if (revision == null || revision.length() == 0) {
             revision = "latest.integration";

Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyFindRevision.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyFindRevision.java?rev=1373341&r1=1373340&r2=1373341&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyFindRevision.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/ant/IvyFindRevision.java Wed Aug 15
11:34:27 2012
@@ -93,7 +93,7 @@ public class IvyFindRevision extends Ivy
         Ivy ivy = getIvyInstance();
         IvySettings settings = ivy.getSettings();
         if (branch == null) {
-            settings.getDefaultBranch(new ModuleId(organisation, module));
+            branch = settings.getDefaultBranch(new ModuleId(organisation, module));
         }
         ResolvedModuleRevision rmr = ivy.findModule(ModuleRevisionId.newInstance(organisation,
             module, branch, revision));



Mime
View raw message