natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IVY-1606: incorrect dependency order on buildlist

This commit is contained in:
Kuhnert, Sven 2019-08-26 16:06:23 +02:00
parent 3cdf4752ec
commit f1d705e762
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/apache/ivy/core/sort/SortEngine.java
View File

@ -24,10 +24,12 @@ import java.util.List;
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 @@ public class SortEngine {
}
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;
}
}