Author: maartenc
Date: Sat Jun 26 21:49:50 2010
New Revision: 958290
URL: http://svn.apache.org/viewvc?rev=958290&view=rev
Log:
FIX: The ivy-module version used by XmlModuleDescriptorWriter is hard coded to
'1.0' (IVY-1199)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sat Jun 26 21:49:50 2010
@@ -127,6 +127,7 @@ for detailed view of each issue, please
- 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: The ivy-module version used by XmlModuleDescriptorWriter is hard coded
to '1.0' (IVY-1199)
- FIX: makepom ignores artifact type in ivy.xml and hardcodes 'jar' in the
output pom (IVY-736) (thanks to Aaron Hachez)
- FIX: Ant output wasn't always prefixed by the name of the Ivy task
- FIX: Resolved Ivy properties written to cache during ivy:resolve incorrectly
represents forced revisions (IVY-1159)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
Sat Jun 26 21:49:50 2010
@@ -80,7 +80,13 @@ public final class XmlModuleDescriptorWr
xmlNamespace.append("
xmlns:").append(ns.getKey()).append("=\"")
.append(ns.getValue()).append("\"");
}
- out.println("<ivy-module version=\"1.0\"" + xmlNamespace + ">");
+
+ String version = "2.0";
+ if (md.getInheritedDescriptors().length > 0) {
+ version = "2.2";
+ }
+
+ out.println("<ivy-module version=\"" + version + "\"" +
xmlNamespace + ">");
printInfoTag(md, out);
printConfigurations(md, out);
printPublications(md, out);
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
Sat Jun 26 21:49:50 2010
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="myorg"
module="mymodule"
revision="1.0"
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
Sat Jun 26 21:49:50 2010
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0" xmlns:e="http://ant.apache.org/ivy/extra";>
+<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra";>
<info organisation="myorg"
module="mymodule"
revision="myrev"
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
Sat Jun 26 21:49:50 2010
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="myorg"
module="mymodule"
revision="NONE"
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml?rev=958290&r1=958289&r2=958290&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
Sat Jun 26 21:49:50 2010
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="2.0">
<info organisation="myorg"
module="mymodule"
revision="NONE"
