Author: maartenc Date: Wed Dec 16 22:43:13 2009 New Revision: 891461 URL: http://svn.apache.org/viewvc?rev=891461&view=rev Log: FIX: resolve fails for transitive relocated maven modules when the type of the dependency was set to 'jar'
Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=891461&r1=891460&r2=891461&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Wed Dec 16 22:43:13 2009 @@ -101,6 +101,7 @@ - IMPROVEMENT: Trace a message when a property file referenced from the settings doesn't exixts (IVY-1074) - IMPROVEMENT: use defaultconf in combination with defaultconfmapping (IVY-1135) (thanks to Jon Schneider) +- FIX: resolve fails for transitive relocated maven modules when the type of the dependency was set to 'jar' - FIX: optional dependencies, sources and javadocs aren't resolved when a maven module is relocated - FIX: Encountered 'multiple artifacts retrieved to same file' error when module does not have multiple artifacts (IVY-1148) - FIX: Use of a shared DocumentBuilder causes SAXException during parallel resolutions (IVY-1147) Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=891461&r1=891460&r2=891461&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java Wed Dec 16 22:43:13 2009 @@ -295,7 +295,7 @@ ConfMapper mapping = (ConfMapper) MAVEN2_CONF_MAPPING.get(scope); mapping.addMappingConfs(dd, dep.isOptional()); Map extraAtt = new HashMap(); - if ((dep.getClassifier() != null) || (dep.getType() != null)) { + if ((dep.getClassifier() != null) || ((dep.getType() != null) && !"jar".equals(dep.getType()))) { String type = "jar"; if (dep.getType() != null) { type = dep.getType();