- 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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=14
2013-10-03 12:28:47 +00:00 · 2013-10-03 12:28:47 +00:00 · ce4b9c63f0
commit ce4b9c63f0
parent 5540bf99db
7 changed files with 136 additions and 59 deletions
--- a/xmlunit-1.0.pom
+++ b/xmlunit-1.0.pom
@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>xmlunit</groupId>
-  <artifactId>xmlunit</artifactId>
-  <version>1.0</version>
-</project>
--- a/xmlunit-1.5-src.zip
+++ b/xmlunit-1.5-src.zip
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae2f340dfa730e3932bd970b2008a67696b32517ae8bf74f49e7149caa1842ae
+size 818928
--- a/xmlunit-1.5.pom
+++ b/xmlunit-1.5.pom
@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2007-2013, Jeff Martin, Tim Bacon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of the xmlunit.sourceforge.net nor the names
+      of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!--
+
+  This POM is not usable as means to build XMLUnit with Maven2, it is
+  a minimal POM to allow XMLUnit's artifacts to be added to a Maven
+  repository.
+
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xmlunit</groupId>
+  <artifactId>xmlunit</artifactId>
+  <packaging>jar</packaging>
+  <name>XMLUnit for Java</name>
+  <version>1.5</version>
+  <url>http://xmlunit.sourceforge.net/</url>
+  <description>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.</description>
+  <licenses>
+    <license>
+      <name>BSD License</name>
+      <url>http://xmlunit.svn.sourceforge.net/viewvc/*checkout*/xmlunit/trunk/xmlunit/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://xmlunit.svn.sourceforge.net/viewvc/xmlunit/</url>
+    <connection>scm:svn:https://xmlunit.svn.sourceforge.net/svnroot/xmlunit/branches/xmlunit-1.x</connection>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <!-- Personally I'm not fond of the developers section but Sonatype's OSSRH
+       requires it -->
+  <developers>
+    <developer>
+      <id>bodewig</id>
+      <name>Stefan Bodewig</name>
+      <email>stefan.bodewig@freenet dot de</email>
+    </developer>
+  </developers>
+</project>
--- a/xmlunit-java5-enum.patch
+++ b/xmlunit-java5-enum.patch
@ -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());
--- a/xmlunit-no-javac-target.patch
+++ b/xmlunit-no-javac-target.patch
@ -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 @@
- 
-   <target name="compile" depends="init">
-     <mkdir dir="${out.dir}"/>
-    <javac srcdir="${src.dir}/java:${test.dir}/java" destdir="${out.dir}" debug="on" target="1.2">
-+    <javac srcdir="${src.dir}/java:${test.dir}/java" destdir="${out.dir}" debug="on">
-       <classpath>
-         <pathelement location="${xmlxsl.lib}"/>
-         <pathelement location="${junit.lib}"/>
--- 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

--- 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 <<EOF
+db5.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/
+EOF
+
 export CLASSPATH=
 export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
-ant jar test docs
+ant -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs

 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+mkdir -p %{buildroot}%{_javadir}
+install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

 # Javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
+
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 build/lib/%{name}-%{version}.pom \
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap

 %files
 %defattr(0644,root,root,0755)
-%doc README.txt LICENSE.txt XMLUnit.pdf example.html
-%{_javadir}/*
-%{_mavenpomdir}/*
+%doc README.txt LICENSE.txt
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/*

 %files javadoc
 %defattr(0644,root,root,0755)
+%doc userguide
 %{_javadocdir}/%{name}

 %changelog