You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/05/25 13:48:54 UTC
[08/50] [abbrv] ant-ivy git commit: revert part of the patch for
IVY-1141, some unit tests are expecting the reverse
revert part of the patch for IVY-1141, some unit tests are expecting the reverse
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/8cba88fa
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/8cba88fa
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/8cba88fa
Branch: refs/heads/xooki2asciidoc
Commit: 8cba88fa1a5dbcf8986e2726b15eeb1d823d87ec
Parents: 2d7c6f5
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Sep 6 20:21:21 2015 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Sep 6 20:21:21 2015 +0200
----------------------------------------------------------------------
.../org/apache/ivy/plugins/version/LatestVersionMatcher.java | 6 ------
.../apache/ivy/plugins/version/LatestVersionMatcherTest.java | 7 -------
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8cba88fa/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
index 5a30b24..2ab2b33 100644
--- a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
+++ b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java
@@ -39,12 +39,6 @@ public class LatestVersionMatcher extends AbstractVersionMatcher {
}
public boolean needModuleDescriptor(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) {
- // if asking for a branch, foundMrid will likely have an invalid value that doesn't
- // come from the module descriptor itself. return true so accept is given the real
- // module descriptor with the correct branch.
- if (askedMrid.getBranch() != null) {
- return true;
- }
List<Status> statuses = StatusManager.getCurrent().getStatuses();
Status lowest = (Status) statuses.get(statuses.size() - 1);
String latestLowest = "latest." + lowest.getName();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8cba88fa/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
index f72d899..5997e83 100644
--- a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
@@ -42,13 +42,6 @@ public class LatestVersionMatcherTest extends TestCase {
assertNeed("latest.integration", false);
}
- public void testNeedModuleDescriptorForBranches() throws Exception {
- assertNeed("latest.release", "trunk", true);
- assertNeed("latest.milestone", "trunk", true);
- // different branches will have different latest.integration artifacts
- assertNeed("latest.integration", "trunk", true);
- }
-
public void testNeedModuleDescriptorCustomStatus() throws Exception {
StatusManager.getCurrent().addStatus(new Status("release", false));
StatusManager.getCurrent().addStatus(new Status("snapshot", true));