You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2008/05/26 21:59:33 UTC
svn commit: r660286 - in /ant/ivy/core/trunk: CHANGES.txt
src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom
Author: maartenc
Date: Mon May 26 12:59:30 2008
New Revision: 660286
URL: http://svn.apache.org/viewvc?rev=660286&view=rev
Log:
FIX: An empty exclusion tag results in an IllegalArgumentException (IVY-821)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom
Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=660286&r1=660285&r2=660286&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Mon May 26 12:59:30 2008
@@ -81,6 +81,7 @@
- IMPROVEMENT: Change allownomd and skipbuildwithoutivy into a more semantically correct name (IVY-297)
- IMPROVEMENT: Smarter determination if an expression is exact or not for RegexpPatternMatcher and GlobPatternMatcher
+- FIX: An empty exclusion tag results in an IllegalArgumentException (IVY-821)
- FIX: Maven scope defined in POM dependencyManagement section not honoured (IVY-811)
- FIX: SFTPRepository incorrectly calculates last modified time for resources (IVY-815)
- FIX: Filesystem resolver does not evaluate [branch] token when publishing (IVY-814)
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java?rev=660286&r1=660285&r2=660286&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java Mon May 26 12:59:30 2008
@@ -345,8 +345,10 @@
Node node = childs.item(i);
if (node instanceof Element && EXCLUSION.equals(node.getNodeName())) {
String groupId = getFirstChildText((Element) node, GROUP_ID);
- String arteficatId = getFirstChildText((Element) node, ARTIFACT_ID);
- exclusions.add(ModuleId.newInstance(groupId, arteficatId));
+ String artifactId = getFirstChildText((Element) node, ARTIFACT_ID);
+ if ((groupId != null) && (artifactId != null)) {
+ exclusions.add(ModuleId.newInstance(groupId, artifactId));
+ }
}
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom?rev=660286&r1=660285&r2=660286&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-exclusion.pom Mon May 26 12:59:30 2008
@@ -53,6 +53,9 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.0.2</version>
+ <exclusions>
+ <exclusion />
+ </exclusions>
</dependency>
</dependencies>
</project>