From 894c745715ee9d0ae7dc0ea5c9d4c2e1a200e656 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 29 Sep 2010 13:53:28 +0200
Subject: [PATCH] Add patch for new jtidy

---
 0001-fix-for-new-jtidy.patch | 43 ++++++++++++++++++++++++++++++++++++
 maven-plugin-tools.spec      | 14 +++++++++---
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 0001-fix-for-new-jtidy.patch

diff --git a/0001-fix-for-new-jtidy.patch b/0001-fix-for-new-jtidy.patch
new file mode 100644
index 0000000..bebde49
--- /dev/null
+++ b/0001-fix-for-new-jtidy.patch
@@ -0,0 +1,43 @@
+From 5fdd641a5c85c65338ddb8c6ed3ffbfef46f62b0 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Wed, 29 Sep 2010 13:25:06 +0200
+Subject: [PATCH] fix for new jtidy
+
+---
+ maven-plugin-tools-api/pom.xml                     |    4 ++--
+ .../maven/tools/plugin/util/PluginUtils.java       |    3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
+index e05a1fc..6525863 100644
+--- a/maven-plugin-tools-api/pom.xml
++++ b/maven-plugin-tools-api/pom.xml
+@@ -83,9 +83,9 @@
+ 
+     <!-- misc -->
+     <dependency>
+-      <groupId>jtidy</groupId>
++      <groupId>net.sf.jtidy</groupId>
+       <artifactId>jtidy</artifactId>
+-      <version>4aug2000r7-dev</version>
++      <version>r938</version>
+     </dependency>
+ 
+     <!-- test -->
+diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
+index f89c036..09e25fe 100644
+--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
++++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
+@@ -265,7 +265,8 @@ public final class PluginUtils
+         tidy.setDocType( "loose" );
+         tidy.setXHTML( true );
+         tidy.setXmlOut( true );
+-        tidy.setCharEncoding( Configuration.UTF8 );
++        tidy.setInputEncoding("UTF-8");
++        tidy.setOutputEncoding("UTF-8");
+         tidy.setMakeClean( true );
+         tidy.setNumEntities( true );
+         tidy.setQuoteNbsp( false );
+-- 
+1.7.2.3
+
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index b17acb5..aa393a7 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
 Name:           maven-plugin-tools
 Version:        2.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven Plugin Tools
 
 Group:          Development/Libraries
@@ -10,6 +10,10 @@ Epoch:          0
 #svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6 maven-plugin-tools-2.6
 #tar caf maven-plugin-tools-2.6.tar.xz maven-plugin-tools-2.6/
 Source0:        %{name}-%{version}.tar.xz
+
+# this patch should be upstreamed (together with updated pom.xml
+# dependency version on jtidy 8.0)
+Patch0:         0001-fix-for-new-jtidy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -67,7 +71,7 @@ Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release}
 Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release}
 
 %description api
-The Maven Plugin Tools API provides an API to extract information from 
+The Maven Plugin Tools API provides an API to extract information from
 and generate documentation for Maven Plugins.
 
 %package beanshell
@@ -131,7 +135,8 @@ to include in the JAR. It is also used to generate Xdoc files for the Mojos as w
 plugin registry, the artifact metadata and a generic help goal.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
 rm -fr src/site/site.xml
 
 %build
@@ -259,6 +264,9 @@ rm -rf %{buildroot}
 %{_javadir}/%{name}/plugin*
 
 %changelog
+* Wed Sep 29 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.6-7
+- Add patch for new jtidy
+
 * Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.6-6
 - BR maven-site-plugin.
 - Use javadoc:aggregate for multimodule projects.