From 37c91696971d6c85f41a0b74c2dd81376ee5abf2 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 16 Jun 2016 09:18:25 +0300
Subject: [PATCH] Update to upstream 1.0.1 release.

---
 .gitignore              |  1 +
 remove-failing-it.patch | 27 ---------------------------
 sources                 |  2 +-
 xml-maven-plugin.spec   | 38 ++++++++++++++++++++------------------
 4 files changed, 22 insertions(+), 46 deletions(-)
 delete mode 100644 remove-failing-it.patch

diff --git a/.gitignore b/.gitignore
index 508693a..42c64d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xml-maven-plugin-1.0-source-release.zip
+/xml-maven-plugin-1.0.1-source-release.zip
diff --git a/remove-failing-it.patch b/remove-failing-it.patch
deleted file mode 100644
index a89e9db..0000000
--- a/remove-failing-it.patch
+++ /dev/null
@@ -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.
diff --git a/sources b/sources
index 856b162..7d380ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c1ebea50fb8076421864b062a34bf21  xml-maven-plugin-1.0-source-release.zip
+8db63f5ec8224472d0c4e687b193b28c  xml-maven-plugin-1.0.1-source-release.zip
diff --git a/xml-maven-plugin.spec b/xml-maven-plugin.spec
index 013a82b..27f820c 100644
--- a/xml-maven-plugin.spec
+++ b/xml-maven-plugin.spec
@@ -1,19 +1,24 @@
 Name:          xml-maven-plugin
-Version:       1.0
-Release:       13%{?dist}
+Version:       1.0.1
+Release:       1%{?dist}
 Summary:       Maven XML Plugin
 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
+URL:           http://www.mojohaus.org/xml-maven-plugin/
+Source0:       http://repo2.maven.org/maven2/org/codehaus/mojo/xml-maven-plugin/%{version}/xml-maven-plugin-%{version}-source-release.zip
 
-BuildRequires: mojo-parent
-
-BuildRequires: apache-rat-plugin
-BuildRequires: maven-local
-BuildRequires: maven-checkstyle-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-plugin-testing-harness
+BuildRequires:  maven-local
+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(xerces:xercesImpl)
+BuildRequires:  mvn(xml-apis:xml-apis)
+BuildRequires:  mvn(xml-resolver:xml-resolver)
 
 BuildArch:     noarch
 
@@ -34,15 +39,9 @@ for d in LICENSE NOTICE ; do
   sed -i 's/\r//' $d.txt
 done
 
-rm -rf src/it/mojo-1438-validate
-
 # Add the version
 sed -i 's|stylesheet |stylesheet version="1.0" |'  src/it/it8/src/main/xsl/it8.xsl
 
-# 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
-
 %build
 %mvn_build -f
 
@@ -56,6 +55,9 @@ sed -i 's|stylesheet |stylesheet version="1.0" |'  src/it/it8/src/main/xsl/it8.x
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* 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