From 0dcf83ab8c53731a7284a31edb69b7a9311c7fb0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 15 Oct 2020 14:06:04 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/xmlunit#f941cb8602175a8f73005e9649b423c671eb95be --- .gitignore | 11 + ...sable-tests-requiring-network-access.patch | 130 +++++++++ sources | 1 + xmlunit.spec | 276 ++++++++++++++++++ 4 files changed, 418 insertions(+) create mode 100644 0001-Disable-tests-requiring-network-access.patch create mode 100644 sources create mode 100644 xmlunit.spec diff --git a/.gitignore b/.gitignore index e69de29..bef2d87 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,11 @@ +/results_* +/*.src.rpm + +/xmlunit1.0.zip +/xmlunit-1.3-src.zip +/xmlunit-1.4-src.zip +/xmlunit-1.5-src.zip +/xmlunit-1.6-src.zip +/xmlunit-2.6.2-src.tar.gz +/xmlunit-2.6.3-src.tar.gz +/xmlunit-2.7.0-src.tar.gz diff --git a/0001-Disable-tests-requiring-network-access.patch b/0001-Disable-tests-requiring-network-access.patch new file mode 100644 index 0000000..04bef68 --- /dev/null +++ b/0001-Disable-tests-requiring-network-access.patch @@ -0,0 +1,130 @@ +diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java +--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java 2018-08-21 22:03:14.000000000 +0200 ++++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java 2020-05-15 13:40:22.050239084 +0200 +@@ -43,14 +43,6 @@ + } + + @Test +- public void testNodesByXPath_withNull_shouldFailed() { +- +- thrown.expectAssertionError(format("%nExpecting not blank but was:")); +- +- assertThat("").nodesByXPath(null); +- } +- +- @Test + public void testNodesByXPath_withWhitespacesOnly_shouldFailed() { + + thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">")); +diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java +--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java 2020-05-03 21:05:12.000000000 +0200 ++++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java 2020-05-15 13:44:15.720157403 +0200 +@@ -91,64 +91,12 @@ + } + + @Test +- public void testIsValidAgainst_withEmptySourcesArray_shouldPass() { +- +- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); +- +- assertThat(xml).isValidAgainst(); +- assertThat(xml).isValidAgainst(new Object[0]); +- } +- +- @Test +- public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() { +- +- thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + +- " message=cvc-complex-type.2.4.b: The content of element 'Book' is not complete." + +- " One of '{\"https://www.xmlunit.org/publishing\":Publisher}' is expected."); +- +- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml")); +- +- assertThat(xml).isValidAgainst(); +- } +- +- @Test +- public void testIsValid_shouldPass() { +- +- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); +- +- assertThat(xml).isValid(); +- } +- +- @Test +- public void testIsValid_withBrokenXml_shouldPass() { +- +- thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" + +- " message=cvc-complex-type.2.4.b: The content of element 'Book' is not complete." + +- " One of '{\"https://www.xmlunit.org/publishing\":Publisher}' is expected."); +- +- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml")); +- +- assertThat(xml).isValid(); +- } +- +- @Test + public void testIsInvalid_withBrokenXml_shouldPass() { + + StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml")); + + assertThat(xml).isInvalid(); + } +- +- @Test +- public void testIsInvalid_shouldField() { +- +- thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*" +- + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>\\nto be invalid"); +- +- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml")); +- +- assertThat(xml).isInvalid(); +- } + + @Test + public void testIsValidAgainst_withNullSchemaSources_shouldFailed() { +Nur in xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj: XmlAssertValidationTest.java~. +diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java +--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java 2020-04-28 10:10:30.000000000 +0200 ++++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java 2020-05-15 13:47:13.361335083 +0200 +@@ -31,14 +31,6 @@ + public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule(); + + @Test +- public void testValueByXPath_withNull_shouldFailed() { +- +- thrown.expectAssertionError(format("%nExpecting not blank but was:")); +- +- assertThat("").valueByXPath(null); +- } +- +- @Test + public void testValueByXPath_withWhitespacesOnly_shouldFailed() { + + thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">")); +Nur in xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj: XmlAssertValueByXPathTest.java~. +diff -r -u xmlunit-2.7.0-src-orig/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java +--- xmlunit-2.7.0-src-orig/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java 2019-12-31 14:00:54.000000000 +0100 ++++ xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java 2020-05-15 13:49:17.980758207 +0200 +@@ -78,19 +78,6 @@ + is(valid(new StreamSource(new File(TestResources.BOOK_XSD))))); + } + +- @Test +- public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() { +- try { +- Class.forName("java.nio.file.FileSystem"); +- } catch (Throwable t) { +- assumeTrue("Skipping on Java6 as it doesn't like xmlunit.org's certificate", +- false); +- } +- assertThat(new StreamSource(new File(TEST_RESOURCE_DIR + "BookXsdGenerated.xml")), +- is(new ValidationMatcher())); +- +- } +- + @Test(expected = AssertionError.class) + public void shouldThrowOnBrokenInstanceWithoutExplicitSchemaSource() { + assertThat(new StreamSource(new File(TEST_RESOURCE_DIR + "invalidBook.xml")), +Nur in xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers: ValidationMatcherTest.java~. diff --git a/sources b/sources new file mode 100644 index 0000000..4d4b1d2 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xmlunit-2.7.0-src.tar.gz) = 888e13165962d1a3906236e760fccd28cb7053f962a34da58d8c3b9305cd1a610aca7be19f7fca9fec69ef4be4cb5e2a8355a0c43f27c14d6d3b693e1a0f8d6e diff --git a/xmlunit.spec b/xmlunit.spec new file mode 100644 index 0000000..4223afa --- /dev/null +++ b/xmlunit.spec @@ -0,0 +1,276 @@ +# Copyright (c) 2000-2007, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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. +# 3. Neither the name of the JPackage Project 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. +# + +Name: xmlunit +Summary: Provides classes to do asserts on xml +Epoch: 0 +Version: 2.7.0 +Release: 4%{?dist} +# xmlunit2 is licensed under ASL 2.0, xmlunit-legacy is still BSD-licensed +License: ASL 2.0 and BSD + +URL: https://www.xmlunit.org/ +Source0: https://github.com/xmlunit/xmlunit/releases/download/v%{version}/%{name}-%{version}-src.tar.gz + +Patch0: 0001-Disable-tests-requiring-network-access.patch + +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) +BuildRequires: mvn(com.sun.xml.bind:jaxb-impl) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.bytebuddy:byte-buddy) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.mockito:mockito-core) + +%description +XMLUnit provides you with the tools to verify the XML you emit is the one you +want to create. It provides helpers to validate against an XML Schema, assert +the values of XPath queries or compare XML documents against expected outcomes. + + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +Javadoc for %{name} + + +%package assertj +Summary: Assertj for %{name} + +%description assertj +This package provides %{summary}. + + +%package core +Summary: Core package for %{name} + +%description core +This package provides %{summary}. + + +%package legacy +Summary: Legacy package for %{name} + +%description legacy +This package provides %{summary}. + + +%package matchers +Summary: Matchers for %{name} + +%description matchers +This package provides %{summary}. + + +%package placeholders +Summary: Placeholders for %{name} + +%description placeholders +This package provides %{summary}. + + +%prep +%setup -q -n %{name}-%{version}-src + +%patch0 -p1 + +%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin +%pom_remove_plugin :maven-assembly-plugin + +# Add deps to EE APIs removed in Java 11 +%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api . xmlunit-core +%pom_change_dep com.sun.xml.bind:jaxb-core com.sun.xml.bind:jaxb-impl . xmlunit-core +%pom_add_dep com.sun.istack:istack-commons-runtime::test xmlunit-core + +%mvn_alias "org.xmlunit:xmlunit-legacy" "xmlunit:xmlunit" + + +%build +%mvn_build -s + +%install +%mvn_install + + +%files -f .mfiles-xmlunit-parent +%doc README.md CONTRIBUTING.md RELEASE_NOTES.md +%license LICENSE + +%files javadoc -f .mfiles-javadoc +%files assertj -f .mfiles-xmlunit-assertj +%files core -f .mfiles-xmlunit-core +%files legacy -f .mfiles-xmlunit-legacy +%files matchers -f .mfiles-xmlunit-matchers +%files placeholders -f .mfiles-xmlunit-placeholders + + +%changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0:2.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Mat Booth - 0:2.7.0-3 +- Allow building against JDK 11 + +* Sat Jul 11 2020 Jiri Vanek - 0:2.7.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed May 13 2020 Dr. Tilmann Bubeck - 0:2.7.0-1 +- Update to version 2.7.0. + +* Fri Jan 31 2020 Fedora Release Engineering - 0:2.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jul 29 2019 Fabio Valentini - 0:2.6.3-1 +- Update to version 2.6.3. + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 01 2017 Michael Simacek - 0:1.6-5 +- Install with XMvn + +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jan 04 2015 Dr. Tilmann Bubeck - 0:1.6-1 +- update to upstream's xmlunit-1.6 + +* Wed Nov 5 2014 Mikolaj Izdebski - 0:1.5-3 +- Remove workaround for RPM bug #646523 + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Oct 11 2013 Dr. Tilmann Bubeck - 0:1.5-1 +- update to upstream's xmlunit-1.5 + +* Fri Sep 27 2013 Mikolaj Izdebski - 0:1.4-4 +- Enable test suite +- Resolves: rhbz#987412 + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jun 12 2013 Stanislav Ochotnicky - 0:1.4-2 +- Update to latest packaging guidelines +- Cleanup BuildRequires + +* Fri Feb 15 2013 Dr. Tilmann Bubeck - 0:1.4-1 +- update to upstream's xmlunit-1.4 + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-3 +- Build javadoc only. + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-2 +- BR java 1.6 to prevent gcj failure. + +* Thu Dec 30 2010 Alexander Kurtakov 0:1.3-1 +- Update to new upstream. +- Drop gcj. +- Rebuild docs. + +* Thu Mar 11 2010 Peter Lemenkov - 0:1.0-8.3 +- Added missing Requires jpackage-utils + +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.0-8.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.0-7.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.0-6.2 +- drop repotag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.0-6jpp.1 +- Autorebuild for GCC 4.3 + +* Thu Jan 17 2008 Permaine Cheung - 0:1.0-5jpp.1 +- Update to the same version as upstream + + Tue Dec 18 2007 Ralph Apel - 0:1.0-5jpp +- Add poms and depmap frags +- Make Vendor, Distribution based on macro +- Add gcj_support option + +* Mon Mar 12 2007 Permaine Cheung - 0:1.0-4jpp.1 +- Add missing BR, patch to build javadoc, and other rpmlint issues + +* Mon May 08 2006 Ralph Apel - 0:1.0-4jpp +- First JPP-1.7 release + +* Thu Aug 26 2004 Ralph Apel - 0:1.0-3jpp +- Build with ant-1.6.2 + +* Wed Dec 17 2003 Paul Nasrat - 0:1.0-2jpp +- Fix license and improved description +- Thanks to Ralph Apel who produced a spec - merged version info + +* Wed Dec 17 2003 Paul Nasrat - 0:1.0-1jpp +- Initial Version +