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 2014/12/27 15:04:05 UTC
[1/2] ant-ivy git commit: fix bug introduced in 6d2e199
Repository: ant-ivy
Updated Branches:
refs/heads/master f42805ac0 -> 03542311e
fix bug introduced in 6d2e199
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/56c04300
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/56c04300
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/56c04300
Branch: refs/heads/master
Commit: 56c04300e8f05bdaccc2ec60fc751c09d86b7b68
Parents: f42805a
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sat Dec 27 15:01:56 2014 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sat Dec 27 15:01:56 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/ivy/core/resolve/IvyNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/56c04300/src/java/org/apache/ivy/core/resolve/IvyNode.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/resolve/IvyNode.java b/src/java/org/apache/ivy/core/resolve/IvyNode.java
index 3764c47..f4e7702 100644
--- a/src/java/org/apache/ivy/core/resolve/IvyNode.java
+++ b/src/java/org/apache/ivy/core/resolve/IvyNode.java
@@ -916,7 +916,7 @@ public class IvyNode implements Comparable<IvyNode> {
Collection<Artifact> ret = new ArrayList<Artifact>();
for (Entry<ArtifactId, Artifact> entry : allArtifacts.entrySet()) {
if (MatcherHelper.matches(rule.getMatcher(), rule.getId(), entry.getKey())) {
- ret.add(allArtifacts.get(entry.getValue()));
+ ret.add(entry.getValue());
}
}
return ret;
[2/2] ant-ivy git commit: use XMLUnit to abstract the order of the
XML elements
Posted by hi...@apache.org.
use XMLUnit to abstract the order of the XML elements
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/03542311
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/03542311
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/03542311
Branch: refs/heads/master
Commit: 03542311e2a461f0324ec700e98e78b5540bcff8
Parents: 56c0430
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sat Dec 27 15:03:49 2014 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sat Dec 27 15:03:49 2014 +0100
----------------------------------------------------------------------
.classpath.default | 1 +
ivy.xml | 1 +
.../ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java | 7 +++----
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/03542311/.classpath.default
----------------------------------------------------------------------
diff --git a/.classpath.default b/.classpath.default
index 9d0aa20..24d26f5 100644
--- a/.classpath.default
+++ b/.classpath.default
@@ -30,6 +30,7 @@
<classpathentry kind="lib" path="lib/commons-vfs.jar"/>
<classpathentry kind="lib" path="lib/jsch.jar"/>
<classpathentry kind="lib" path="lib/junit.jar"/>
+ <classpathentry kind="lib" path="lib/xmlunit.jar"/>
<classpathentry kind="lib" path="lib/oro.jar"/>
<classpathentry kind="lib" path="lib/bcpg-jdk14.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk14.jar"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/03542311/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 834a176..9351517 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -62,6 +62,7 @@
<dependency org="org.apache.ant" name="ant-testutil" rev="1.7.0" conf="test->default" transitive="false" />
<dependency org="ant" name="ant-launcher" rev="1.6.2" conf="test->default" transitive="false"/>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="test->default" transitive="false"/>
+ <dependency org="xmlunit" name="xmlunit" rev="1.5" conf="test->default" transitive="false"/>
<!-- This dependency is necessary for having validation in junit tests when running with JDK1.4 -->
<dependency org="xerces" name="xercesImpl" rev="2.6.2" conf="test->default" />
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/03542311/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
index b2e56ae..8ed79d0 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
@@ -25,8 +25,6 @@ import java.io.InputStreamReader;
import java.util.Date;
import java.util.GregorianCalendar;
-import junit.framework.TestCase;
-
import org.apache.ivy.core.module.descriptor.Configuration;
import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
@@ -37,8 +35,9 @@ import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser;
import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest;
import org.apache.ivy.util.FileUtil;
+import org.custommonkey.xmlunit.XMLTestCase;
-public class XmlModuleDescriptorWriterTest extends TestCase {
+public class XmlModuleDescriptorWriterTest extends XMLTestCase {
private static String LICENSE;
static {
try {
@@ -155,7 +154,7 @@ public class XmlModuleDescriptorWriterTest extends TestCase {
String expected = readEntirely("test-write-extrainfo-from-maven.xml").replaceAll("\r\n",
"\n").replace('\r', '\n');
- assertEquals(expected, wrote);
+ assertXMLEqual(expected, wrote);
}
public void testExtends() throws Exception {