diff --git a/xmlunit-1.0.pom b/xmlunit-1.0.pom deleted file mode 100644 index 50f9283..0000000 --- a/xmlunit-1.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - xmlunit - xmlunit - 1.0 - \ No newline at end of file diff --git a/xmlunit-1.5-src.zip b/xmlunit-1.5-src.zip new file mode 100644 index 0000000..369e2c8 --- /dev/null +++ b/xmlunit-1.5-src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae2f340dfa730e3932bd970b2008a67696b32517ae8bf74f49e7149caa1842ae +size 818928 diff --git a/xmlunit-1.5.pom b/xmlunit-1.5.pom new file mode 100644 index 0000000..e67d549 --- /dev/null +++ b/xmlunit-1.5.pom @@ -0,0 +1,78 @@ + + + + + + 4.0.0 + xmlunit + xmlunit + jar + XMLUnit for Java + 1.5 + http://xmlunit.sourceforge.net/ + XMLUnit compares a control XML document to a test document or the result of a transformation, validates documents, and compares the results of XPath expressions. + + + BSD License + http://xmlunit.svn.sourceforge.net/viewvc/*checkout*/xmlunit/trunk/xmlunit/LICENSE.txt + + + + http://xmlunit.svn.sourceforge.net/viewvc/xmlunit/ + scm:svn:https://xmlunit.svn.sourceforge.net/svnroot/xmlunit/branches/xmlunit-1.x + + + + junit + junit + 3.8.2 + true + + + + + + bodewig + Stefan Bodewig + stefan.bodewig@freenet dot de + + + diff --git a/xmlunit-java5-enum.patch b/xmlunit-java5-enum.patch deleted file mode 100644 index 38c972e..0000000 --- a/xmlunit-java5-enum.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xmlunit/src/java/org/custommonkey/xmlunit/HTMLDocumentBuilder.java 2003-02-27 20:47:32.000000000 -0500 -+++ xmlunit/src/java/org/custommonkey/xmlunit/HTMLDocumentBuilder.java.orig 2008-07-29 16:25:39.863675489 -0400 -@@ -283,9 +283,9 @@ - Object attrName, attrValue; - - attributes.clear(); -- for(Enumeration enum = attributeSet.getAttributeNames(); -- enum.hasMoreElements(); ) { -- attrName = enum.nextElement(); -+ for(Enumeration attributeSetEnum = attributeSet.getAttributeNames(); -+ attributeSetEnum.hasMoreElements(); ) { -+ attrName = attributeSetEnum.nextElement(); - attrValue = attributeSet.getAttribute(attrName); - attributes.addAttribute("", "", attrName.toString(), - "CDATA", attrValue.toString()); diff --git a/xmlunit-no-javac-target.patch b/xmlunit-no-javac-target.patch deleted file mode 100644 index 5b8aea2..0000000 --- a/xmlunit-no-javac-target.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmlunit/build.xml.orig 2003-04-23 18:26:58.000000000 -0400 -+++ xmlunit/build.xml 2008-07-29 16:34:26.966674010 -0400 -@@ -25,7 +25,7 @@ - - - -- -+ - - - diff --git a/xmlunit.changes b/xmlunit.changes index 2688040..3252235 100644 --- a/xmlunit.changes +++ b/xmlunit.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Oct 3 12:16:24 UTC 2013 - mvyskocil@suse.com + +- Update to 1.5 + * If one node in the comparison has children while the other one + has not, XMLUnit 1.5 will signal a CHILD_NODELIST_LEN GTH + difference and CHILD_NODE_NOT_FOUND differences for each child + node of the node that has children in addition to a + HAS_CHILD_NODES difference. + 1.4: + * xsi:type attributes now have their value interpreted as a QName and will + compare as identical if their namespace URI and local + names match even if they use different prefixes + 1.3: + * Try to match control Element with first unmatched test one instead of + creating CHILD_NODE_NOT_FOUND + 1.2: + * null XPath on missing node + * SAXParserFactory can be configured + * new Validator class to validate schema definitions + 1.1: + * Support for XML Namespaces in XPath processing + * Support for XML Schema validation using any JAXP compliant parser +- dropped xmlunit-java5-enum.patch, not needed +- dropped xmlunit-no-javac-target.patch, not needed +- put userguide to javadoc package + ------------------------------------------------------------------- Wed Sep 11 10:03:55 UTC 2013 - mvyskocil@suse.com diff --git a/xmlunit.spec b/xmlunit.spec index cf44fdc..8bc4851 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -19,22 +19,20 @@ Name: xmlunit -Version: 1.0 +Version: 1.5 Release: 0 Summary: Provides classes to do asserts on XML License: BSD-3-Clause Group: Development/Libraries/Java Url: http://xmlunit.sourceforge.net/ -Source0: http://download.sourceforge.net/xmlunit/xmlunit1.0.zip -Source1: http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom -Patch0: xmlunit-java5-enum.patch -Patch1: xmlunit-no-javac-target.patch +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip +Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom BuildRequires: ant BuildRequires: ant-junit BuildRequires: ant-trax BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: junit +BuildRequires: junit4 BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xerces-j2 @@ -59,18 +57,17 @@ Summary: Javadoc for %{name} Group: Documentation/HTML %description javadoc -Javadoc for %{name}. +Javadoc for %{name}. Also contains userguide. %prep -%setup -q -n %{name} -%patch0 -p1 -%patch1 -p1 +%setup -q %{__perl} -pi -e 's/\r$//g' README.txt LICENSE.txt # remove all binary libs and javadocs -find . -name "*.jar" | xargs rm -rm -r doc +find . -name "*.jar" -delete + +%build cat > build.properties << EOF junit.lib=$(build-classpath junit) @@ -78,34 +75,38 @@ xmlxsl.lib=$(build-classpath xalan-j2 xerces-j2 xml-commons-jaxp-1.3-apis) test.report.dir=test EOF -%build +cat > docbook.properties <