From f1d705e76298eaaa81094609d2d62c057a14efb4 Mon Sep 17 00:00:00 2001 From: "Kuhnert, Sven" Date: Mon, 26 Aug 2019 16:06:23 +0200 Subject: [PATCH] IVY-1606: incorrect dependency order on buildlist --- .../org/apache/ivy/core/sort/SortEngine.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/ivy/core/sort/SortEngine.java b/src/java/org/apache/ivy/core/sort/SortEngine.java index 712a203cf..fa211fa72 100644 --- a/src/java/org/apache/ivy/core/sort/SortEngine.java +++ b/src/java/org/apache/ivy/core/sort/SortEngine.java @@ -24,10 +24,12 @@ import java.util.Map; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.resolve.IvyNode; import org.apache.ivy.plugins.circular.CircularDependencyException; import org.apache.ivy.plugins.circular.CircularDependencyStrategy; import org.apache.ivy.plugins.circular.IgnoreCircularDependencyStrategy; +import org.apache.ivy.plugins.version.AbstractVersionMatcher; import org.apache.ivy.plugins.version.VersionMatcher; import org.apache.ivy.util.Checks; @@ -120,7 +122,19 @@ protected CircularDependencyStrategy getCircularStrategy() { } protected VersionMatcher getVersionMatcher() { - return settings.getVersionMatcher(); + VersionMatcher matcher = new AbstractVersionMatcher("all") { + + @Override + public boolean isDynamic(ModuleRevisionId askedMrid) { + return false; + } + + @Override + public boolean accept(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) { + return true; + } + }; + return matcher; } }