Author: xavier
Date: Thu Jun 12 03:31:27 2008
New Revision: 667034
URL: http://svn.apache.org/viewvc?rev=667034&view=rev
Log:
FIX: Ivy unit tests fail because 'classifier' attribute of 'artifacts' element
is missing in ivy.xsd (IVY-837)
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=667034&r1=667033&r2=667034&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Jun 12 03:31:27 2008
@@ -86,6 +86,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: Ivy unit tests fail because 'classifier' attribute of 'artifacts'
element is missing in ivy.xsd (IVY-837)
- FIX: Ivy build system: fix build.xml to allow "ant coverage-report" behind a
proxy (IVY-832)
- FIX: NPE in AbstractResolver.exists() if a resource cannot be found (IVY-831)
- FIX: Ivy distribution jars contains duplicate entries (IVY-828)
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=667034&r1=667033&r2=667034&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
Thu Jun 12 03:31:27 2008
@@ -483,13 +483,13 @@
public Artifact getSourceArtifact() {
return new MDArtifact(
ivyModuleDescriptor, mrid.getName(), "source", "jar",
- null, Collections.singletonMap("classifier", "sources"));
+ null, Collections.singletonMap("m:classifier", "sources"));
}
public Artifact getJavadocArtifact() {
return new MDArtifact(
ivyModuleDescriptor, mrid.getName(), "javadoc", "jar",
- null, Collections.singletonMap("classifier", "javadoc"));
+ null, Collections.singletonMap("m:classifier", "javadoc"));
}
public void addSourceArtifact() {
