[
https://issues.apache.org/jira/browse/IVY-1087?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12723754#action_12723754
]
aleksey zhukov commented on IVY-1087:
-------------------------------------
OK, I have fixed that. Please review the patch.
diff -up ./XmlModuleDescriptorParser.java.orig ./XmlModuleDescriptorParser.java
--- ./XmlModuleDescriptorParser.java.orig 2009-06-24 13:15:54.000000000
-0500
+++ ./XmlModuleDescriptorParser.java 2009-06-24 12:12:58.000000000 -0500
@@ -521,6 +521,8 @@ public class XmlModuleDescriptorParser e
String name = settings.substitute(attributes.getValue("name"));
String branch = settings.substitute(attributes.getValue("branch"));
String branchConstraint =
settings.substitute(attributes.getValue("branchConstraint"));
+ branchConstraint = branchConstraint == null ? branch :
branchConstraint;
+
String rev = settings.substitute(attributes.getValue("rev"));
String revConstraint =
settings.substitute(attributes.getValue("revConstraint"));
revConstraint = revConstraint == null ? rev : revConstraint;
If this is ok, please add it to the trunk.
> ivy:resolve ignores branch in "dynamic" resolve mode
> ----------------------------------------------------
>
> Key: IVY-1087
> URL: https://issues.apache.org/jira/browse/IVY-1087
> Project: Ivy
> Issue Type: Bug
> Components: Core
> Affects Versions: 2.1.0-RC1
> Environment: Linux 2.6.18-92.1.22.el5 #1 SMP Tue Dec 16 12:03:43 EST
> 2008 i686 athlon i386 GNU/Linux
> Reporter: aleksey zhukov
> Priority: Blocker
>
> When I call ivy:resolve as following
> <ivy:resolve file="${deps.file}" showProgress="false" conf="compile"
> resolveMode="dynamic"/>
> and having
> <ivy
> pattern="${ivy.local.default.root}/[organisation]/[branch]/[module]-ivys/ivy-[revision].xml"/>
> <artifact
> pattern="${ivy.local.default.root}/[organisation]/[branch]/[artifact]-[revision].[ext]"/>
>
> set in my defaultResolver
> ivy:resolver ignores [branch] and looks for ivy.xml in
> "${ivy.local.default.root}/[organisation]//[module]-ivys/ivy-[revision].xml"
> and artifact in
> "${ivy.local.default.root}/[organisation]//[artifact]-[revision].[ext]".
> However if I call <ivy:resolve file="${deps.file}" showProgress="false"
> conf="compile"/> without resolveMode set, everything is fine and resolve
> follows [organisation]/[branch] path.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
