Repository: ant-ivy Updated Branches: refs/heads/master 12aeeec70 -> 4b5ef21ed
tidy up code more Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/4b5ef21e Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/4b5ef21e Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/4b5ef21e Branch: refs/heads/master Commit: 4b5ef21ed6104befc80e1dd501f964e7ca6f1ce6 Parents: 12aeeec Author: Gintas Grigelionis <[email protected]> Authored: Mon Jan 8 23:12:06 2018 +0100 Committer: Gintas Grigelionis <[email protected]> Committed: Mon Jan 8 23:15:17 2018 +0100 ---------------------------------------------------------------------- src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java | 8 ++++++-- .../plugins/conflict/LatestCompatibleConflictManager.java | 2 +- src/java/org/apache/ivy/plugins/report/XmlReportWriter.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4b5ef21e/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java b/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java index 558565b..9356281 100644 --- a/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java +++ b/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java @@ -111,7 +111,12 @@ public class IvyNodeCallers { return mrid.toString(); } + @Deprecated public ModuleRevisionId getAskedDependencyId(ResolveData resolveData) { + return getAskedDependencyId(); + } + + public ModuleRevisionId getAskedDependencyId() { return dd.getDependencyRevisionId(); } @@ -274,8 +279,7 @@ public class IvyNodeCallers { if (!caller.canExclude()) { return false; } - ModuleDescriptor md = caller.getModuleDescriptor(); - Boolean doesExclude = node.doesExclude(md, rootModuleConf, + Boolean doesExclude = node.doesExclude(caller.getModuleDescriptor(), rootModuleConf, caller.getCallerConfigurations(), caller.getDependencyDescriptor(), artifact, callersStack); if (doesExclude != null) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4b5ef21e/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java index c8d968e..adf01cb 100644 --- a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java @@ -260,7 +260,7 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { if (callerNode.isBlacklisted(rootModuleConf)) { continue; } - if (versionMatcher.isDynamic(caller.getAskedDependencyId(node.getData()))) { + if (versionMatcher.isDynamic(caller.getAskedDependencyId())) { blacklisted.add(new IvyNodeBlacklist(conflictParent, selectedNode, evictedNode, node, rootModuleConf)); if (node.isEvicted(rootModuleConf) http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4b5ef21e/src/java/org/apache/ivy/plugins/report/XmlReportWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/report/XmlReportWriter.java b/src/java/org/apache/ivy/plugins/report/XmlReportWriter.java index 3da3a5b..fdee32d 100644 --- a/src/java/org/apache/ivy/plugins/report/XmlReportWriter.java +++ b/src/java/org/apache/ivy/plugins/report/XmlReportWriter.java @@ -228,7 +228,7 @@ public class XmlReportWriter { XMLHelper.escape(caller.getModuleRevisionId().getOrganisation()), XMLHelper.escape(caller.getModuleRevisionId().getName()), XMLHelper.escape(joinArray(caller.getCallerConfigurations(), ", ")), - XMLHelper.escape(caller.getAskedDependencyId(dep.getData()).getRevision()), + XMLHelper.escape(caller.getAskedDependencyId().getRevision()), XMLHelper.escape(dependencyDescriptor.getDependencyRevisionId().getRevision()), XMLHelper.escape(dependencyDescriptor.getDynamicConstraintDependencyRevisionId().getRevision()), XMLHelper.escape(caller.getModuleRevisionId().getRevision()),
