diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc index 46720303..6e2a57a0 100644 --- a/asciidoc/release-notes.adoc +++ b/asciidoc/release-notes.adoc @@ -60,6 +60,7 @@ Note, if you have resolved dependencies with version of Ivy prior to 2.6.0, you - FIX: when the `ivy:deliver` task is configured to replace dynamic revisions, it now replaces these revisions to the resolved revision before any conflict resolution was done, which was the original behavior before Ivy 2.3.0. This way, the delivered ivy.xml can be used to have reproducible dependency resolution, especially when multiple configurations are used. It also fixes issues where the dynamic revisions were replaced by versions from other configurations. (IVY-1485, IVY-1661) +- FIX: the `ivy:deliver` task didn't replace dynamic revision from inherited dependencies. (IVY-1410) (Thanks to Eric Milles) == Committers and Contributors diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java index 83440c4a..9af53fa3 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java @@ -1101,11 +1101,23 @@ public final class XmlModuleDescriptorUpdater { private void writeInheritedDependencies(ModuleDescriptor merged) { if (!mergedDependencies) { mergedDependencies = true; - writeInheritedItems(merged, merged.getDependencies(), DependencyPrinter.INSTANCE, + writeInheritedItems(merged, getDependencies(merged), DependencyPrinter.INSTANCE, "dependencies", false); } } + private DependencyDescriptor[] getDependencies(ModuleDescriptor merged) { + DependencyDescriptor[] dependencies = merged.getDependencies(); + for (int i = 0; i < dependencies.length; i += 1) { + ModuleRevisionId mrid = dependencies[i].getDependencyRevisionId(); + String rev = resolvedRevisions.get(mrid); // IVY-1410 + if (rev != null && !rev.equals(mrid.getRevision())) { + dependencies[i] = dependencies[i].clone(ModuleRevisionId.newInstance(mrid, rev)); + } + } + return dependencies; + } + /** *
* If publishing in merge mode, guarantee that any merged elements appearing before
diff --git a/test/java/org/apache/ivy/core/deliver/DeliverTest.java b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
index cb194bc7..aa303ef7 100644
--- a/test/java/org/apache/ivy/core/deliver/DeliverTest.java
+++ b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
@@ -92,6 +92,25 @@ public class DeliverTest {
assertTrue(deliverContent.contains("name=\"b\" rev=\"1.5\""));
}
+ /**
+ * Test case for IVY-1410.
+ */
+ @Test
+ public void testDeliver1410() throws Exception {
+ Project project = ivyDeliver.getProject();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
+ File ivyFile = new File(new URI(DeliverTest.class.getResource("ivy-1410.xml").toString()));
+
+ resolve(ivyFile);
+
+ ivyDeliver.setReplacedynamicrev(true);
+ ivyDeliver.doExecute();
+
+ String deliverContent = readFile(deliverDir.getAbsolutePath() + "/ivys/ivy-1.0.xml");
+ assertTrue(deliverContent.contains("org=\"org1\" name=\"mod1.1\" rev=\"1.1\""));
+ assertTrue(deliverContent.contains("org=\"org2\" name=\"mod2.1\" rev=\"0.7\""));
+ }
+
private void resolve(File ivyFile) {
IvyResolve ivyResolve = new IvyResolve();
ivyResolve.setProject(ivyDeliver.getProject());
diff --git a/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml b/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml
new file mode 100644
index 00000000..31f59d37
--- /dev/null
+++ b/test/java/org/apache/ivy/core/deliver/ivy-1410-parent.xml
@@ -0,0 +1,24 @@
+
+