Author: maartenc
Date: Tue Oct 14 12:28:11 2008
New Revision: 704631
URL: http://svn.apache.org/viewvc?rev=704631&view=rev
Log:
FIX: pre-resolve-dependency event doesn't export branch information (IVY-941)
(thanks to Jaroslaw Wypychowski)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=704631&r1=704630&r2=704631&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Oct 14 12:28:11 2008
@@ -103,6 +103,7 @@
- FIX: Default retrieve, publish and deliver patterns doesn't include the
[classifier] token (IVY-935)
- FIX: Can't use latest.release for pom dependencies (IVY-936)
- FIX: Unable to resolve snapshot versions depending on xml elements order
(IVY-940)
+- FIX: pre-resolve-dependency event doesn't export branch information
(IVY-941) (thanks to Jaroslaw Wypychowski)
2.0.0-rc1
=====================================
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java?rev=704631&r1=704630&r2=704631&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java Tue Oct
14 12:28:11 2008
@@ -66,6 +66,7 @@
protected void addMridAttributes(ModuleRevisionId mrid) {
addModuleIdAttributes(mrid.getModuleId());
addAttribute("revision", mrid.getRevision());
+ addAttribute("branch",mrid.getBranch());
addAttributes(mrid.getQualifiedExtraAttributes());
addAttributes(mrid.getExtraAttributes());
}
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java?rev=704631&r1=704630&r2=704631&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
Tue Oct 14 12:28:11 2008
@@ -41,6 +41,8 @@
dd.getDependencyRevisionId().getRevision());
addAttribute("req-revision-dynamic",
dd.getDynamicConstraintDependencyRevisionId().getRevision());
+ addAttribute("req-branch", requestedRevisionId.getBranch());
+ addAttribute("req-branch-default",
dd.getDependencyRevisionId().getBranch());
}
public DependencyDescriptor getDependencyDescriptor() {
