Author: maartenc
Date: Thu Mar 8 14:39:03 2007
New Revision: 516201
URL: http://svn.apache.org/viewvc?view=rev&rev=516201
Log:
FIX: ivy.revision property not set correctly for second resolve (IVY-429)
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-double.xml
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=516201&r1=516200&r2=516201
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Thu Mar 8 14:39:03 2007
@@ -16,6 +16,7 @@
- IMPROVE: Add a unit test to verify that latest.integration accepts released
modules (IVY-394) (thanks to Gilles Scokart)
- IMPROVE: New "modules in use" section in console report at the end of
resolve (IVY-373) (thanks to John Wiliams)
+- FIX: ivy.revision property not set correctly for second resolve (IVY-429)
- FIX: NPE when no organisation or no name is provided in module element of
ivyconf (IVY-422)
- FIX: FileUtil#copy(File src, File dest, CopyProgressListener l, boolean
overwrite) (IVY-420)
- FIX: ${project.groupId} and ${project.version} not processed correctly in
poms (IVY-425)
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java?view=diff&rev=516201&r1=516200&r2=516201
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java Thu
Mar 8 14:39:03 2007
@@ -173,7 +173,6 @@
if (_file == null) {
_file = new File(getProject().getBaseDir(),
getProperty(settings, "ivy.dep.file"));
}
- _revision = getProperty(_revision, settings,
"ivy.revision");
report = ivy.resolve(
_file.toURL(),
getResolveOptions(confs, settings));
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java?view=diff&rev=516201&r1=516200&r2=516201
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
Thu Mar 8 14:39:03 2007
@@ -138,11 +138,13 @@
_resolve.execute();
assertEquals("resolve-simple", getIvy().getVariable("ivy.module"));
+ assertEquals("1.0", getIvy().getVariable("ivy.revision"));
_resolve.setFile(new
File("test/java/org/apache/ivy/ant/ivy-double.xml"));
_resolve.execute();
assertEquals("resolve-double", getIvy().getVariable("ivy.module"));
+ assertEquals("1.1", getIvy().getVariable("ivy.revision"));
}
public void testFailure() throws Exception {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-double.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-double.xml?view=diff&rev=516201&r1=516200&r2=516201
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-double.xml
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/ivy-double.xml Thu
Mar 8 14:39:03 2007
@@ -1,7 +1,7 @@
<ivy-module version="1.0">
<info organisation="apache"
module="resolve-double"
- revision="1.0"
+ revision="1.1"
status="release"
/>
<dependencies>
