Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.gitignore

@@ -1 +1,4 @@
 /xml-maven-plugin-1.0-source-release.zip
+/xml-maven-plugin-1.0.1-source-release.zip
+/xml-maven-plugin-1.0.2-source-release.zip
+/xml-maven-plugin-1.1.0.tar.gz

changelog

@@ -0,0 +1,104 @@
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.2-12
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.2-11
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.0.2-6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Dec 12 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.2-4
+- Package cleanup for unretirement.
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Mar 22 2018 Michael Simacek <msimacek@redhat.com> - 1.0.2-1
+- Update to upstream version 1.0.2
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue May 16 2017 Mat Booth <mat.booth@redhat.com> - 1.0.1-3
+- Remove unnecessary deps on xml-commons-apis and xerces
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jun 16 2016 Alexander Kurtakov <akurtako@redhat.com> 1.0.1-1
+- Update to upstream 1.0.1 release.
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 30 2015 Mat Booth <mat.booth@redhat.com> - 1.0-12
+- Fix FTBFS
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Sep 12 2013 Marek Goldmann <mgoldman@redhat.com> - 1.0-9
+- Use xmvn
+- Make the integration tests build
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Apr 02 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-7
+- Fix FTBFS rhbz #914586
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.0-5
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 21 2012 David Nalley <david@gnsa.us> - 1.0-3
+- patched to remove offending integration tests
+
+* Thu Feb 16 2012 David Nalley <david@gnsa.us> - 1.0-2
+- removed needless arguments for setup
+- reduced description line to less than 80 chars
+- added license to -javadoc
+- removed unused source file
+- removed all update_maven_depmap references
+
+* Mon Jan 16 2012 David Nalley <david@gnsa.us> - 1.0-1
+- Initial rpm build - spec modified from mageia's version of same

remove-failing-it.patch

@@ -1,27 +0,0 @@
---- src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java.old	2012-02-21 11:39:04.824470906 -0500
-+++ src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java	2012-02-21 11:39:29.195166230 -0500
-@@ -185,24 +185,6 @@
-         return sw.toString();
-     }
- 
--    /**
--     * Builds the it7 test project.
--     */
--    public void testIt8() throws Exception
--    {
--        if ( !java1_6_Aware() )
--        {
--        	System.out.println( " skip test due to non compliance jvm version need 1.6" );
--            return;
--        }
--        final String dir = "src/test/it8";
--        runTest( dir );
--        Document doc1 = parse( new File( dir, "target/generated-resources/xml/xslt/doc1.xml" ) );
--        
--        assertEquals("SAXON 8.7 from Saxonica", eval( doc1, "/root/vendor" ) );
--        assertEquals("http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
--        assertEquals("2.0", eval( doc1, "/root/version" ) );
--    }
- 
-     /**
-      * Builds the it10 test project.

sources

@@ -1 +1 @@
-9c1ebea50fb8076421864b062a34bf21  xml-maven-plugin-1.0-source-release.zip
+SHA512 (xml-maven-plugin-1.1.0.tar.gz) = 89b3a1a8d730cca980e50932a6efd0c3b7c6b6adce1a40303d7c17339992f31c20124b9c8844721302e6ad5eaedc45d60920a62acca909f14247885518d0ab45

xml-maven-plugin.spec

@@ -1,120 +1,61 @@
-Name:          xml-maven-plugin
-Version:       1.0
-Release:       7%{?dist}
-Summary:       Maven XML Plugin
-Group:         Development/Libraries
-License:       ASL 2.0
-Url:           http://mojo.codehaus.org/xml-maven-plugin/
-Source0:       http://repo2.maven.org/maven2/org/codehaus/mojo/xml-maven-plugin/1.0/xml-maven-plugin-1.0-source-release.zip
-Patch0:        remove-failing-it.patch	       
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: mojo-parent
+Name:           xml-maven-plugin
+Summary:        Maven XML Plugin
+Version:        1.1.0
+Release:        %autorelease
+License:        Apache-2.0
 
-BuildRequires: apache-rat-plugin
-BuildRequires: maven-local
-BuildRequires: maven-changes-plugin
-BuildRequires: maven-checkstyle-plugin
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-plugin-cobertura
+URL:            https://www.mojohaus.org/xml-maven-plugin/
+Source0:        https://github.com/mojohaus/xml-maven-plugin/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires: plexus-component-api
-BuildRequires: plexus-io
-BuildRequires: plexus-resources
-BuildRequires: plexus-utils
-BuildRequires: saxon
-BuildRequires: xalan-j2
-BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
-BuildRequires: xml-commons-resolver
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Requires:      jpackage-utils
-Requires:      java
-BuildArch:     noarch
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-invoker-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.codehaus.mojo:mojo-parent:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-resources)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(xml-resolver:xml-resolver)
 
 %description
 A plugin for various XML related tasks like validation and transformation.
 
+
 %package javadoc
 Summary:       Javadocs for %{name}
-Group:         Development/Libraries
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-%prep
-%setup -q
-%patch0 -p0 
-for d in LICENSE NOTICE ; do
-  iconv -f iso8859-1 -t utf-8 $d.txt > $d.txt.conv && mv -f $d.txt.conv $d.txt
-  sed -i 's/\r//' $d.txt
-done
-rm -rf src/it/it8
-rm -rf src/it/mojo-1438-validate
 
-# In maven 3, the functionality we need has been moved to maven-core
-%pom_remove_dep org.apache.maven:maven-project
-%pom_add_dep org.apache.maven:maven-core
+%prep
+%autosetup
+
+# Add the version
+sed -i 's|stylesheet |stylesheet version="1.0" |'  src/it/it8/src/main/xsl/it8.xsl
+
+%pom_xpath_set pom:mojo.java.target 8
+
 
 %build
-mvn-rpmbuild -Dmojo.java.target=1.5 -Dmaven.test.skip=true -DskipITs \
-  install javadoc:aggregate
+%mvn_build -f
+
 
 %install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/xml-maven-plugin-%{version}.jar \
-  %{buildroot}%{_javadir}/xml-maven-plugin.jar
-  
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-xml-maven-plugin.pom
-%add_maven_depmap JPP-xml-maven-plugin.pom xml-maven-plugin.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/xml-maven-plugin
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/xml-maven-plugin
+%mvn_install
 
 
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
 
-%files
-%{_javadir}/xml-maven-plugin.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%doc LICENSE.txt NOTICE.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
 
-%files javadoc
-%{_javadocdir}/xml-maven-plugin
-%doc LICENSE.txt NOTICE.txt
 
 %changelog
-* Tue Mar 02 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-7
-- Fix FTBFS rhbz #914586
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.0-5
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 21 2012 David Nalley <david@gnsa.us> - 1.0-3
-- patched to remove offending integration tests
-
-* Thu Feb 16 2012 David Nalley <david@gnsa.us> - 1.0-2
-- removed needless arguments for setup
-- reduced description line to less than 80 chars
-- added license to -javadoc
-- removed unused source file
-- removed all update_maven_depmap references
-
-* Mon Jan 16 2012 David Nalley <david@gnsa.us> - 1.0-1 
-- Initial rpm build - spec modified from mageia's version of same
+%autochangelog