From 75a5bde690af5281cf1370fafbab8d654d46a264 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 26 Dec 2010 22:31:10 +0000
Subject: [PATCH] LUCENE-2833: upgrade contrib/ant's tidy jar

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1052974 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/contrib/CHANGES.txt               |  2 +
 lucene/contrib/ant/build.xml             |  2 +-
 lucene/contrib/ant/lib/JTIDY-LICENSE.txt | 53 ++++++++++++++++++++++++
 lucene/contrib/ant/lib/Tidy.jar          |  2 -
 lucene/contrib/ant/lib/jtidy-r938.jar    |  2 +
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 lucene/contrib/ant/lib/JTIDY-LICENSE.txt
 delete mode 100644 lucene/contrib/ant/lib/Tidy.jar
 create mode 100644 lucene/contrib/ant/lib/jtidy-r938.jar

diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index 15dc57af7d2..fb58977fb7c 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -287,6 +287,8 @@ Build
 
  * LUCENE-2797: Upgrade contrib/icu's ICU jar file to ICU 4.6  
    (Robert Muir)
+
+ * LUCENE-2833: Upgrade contrib/ant's jtidy jar file to r938 (Robert Muir)
    
 Optimizations
 
diff --git a/lucene/contrib/ant/build.xml b/lucene/contrib/ant/build.xml
index 529fb016ad1..6fb63aac7e0 100644
--- a/lucene/contrib/ant/build.xml
+++ b/lucene/contrib/ant/build.xml
@@ -25,7 +25,7 @@
 
   <path id="additional.dependencies">
     <!-- TODO: make ${tidy.jar} property -->
-    <pathelement location="lib/Tidy.jar"/>
+    <fileset dir="lib" includes="jtidy-*.jar"/>
   </path>
 
   <pathconvert property="project.classpath"
diff --git a/lucene/contrib/ant/lib/JTIDY-LICENSE.txt b/lucene/contrib/ant/lib/JTIDY-LICENSE.txt
new file mode 100644
index 00000000000..25cbfea5d39
--- /dev/null
+++ b/lucene/contrib/ant/lib/JTIDY-LICENSE.txt
@@ -0,0 +1,53 @@
+/**
+*  Java HTML Tidy - JTidy
+*  HTML parser and pretty printer
+*
+*  Copyright (c) 1998-2000 World Wide Web Consortium (Massachusetts
+*  Institute of Technology, Institut National de Recherche en
+*  Informatique et en Automatique, Keio University). All Rights
+*  Reserved.
+*
+*  Contributing Author(s):
+*
+*     Dave Raggett <dsr@w3.org>
+*     Andy Quick <ac.quick@sympatico.ca> (translation to Java)
+*     Gary L Peskin <garyp@firstech.com> (Java development)
+*     Sami Lempinen <sami@lempinen.net> (release management)
+*     Fabrizio Giustina <fgiust at users.sourceforge.net>
+*
+*  The contributing author(s) would like to thank all those who
+*  helped with testing, bug fixes, and patience.  This wouldn't
+*  have been possible without all of you.
+*
+*  COPYRIGHT NOTICE:
+* 
+*  This software and documentation is provided "as is," and
+*  the copyright holders and contributing author(s) make no
+*  representations or warranties, express or implied, including
+*  but not limited to, warranties of merchantability or fitness
+*  for any particular purpose or that the use of the software or
+*  documentation will not infringe any third party patents,
+*  copyrights, trademarks or other rights. 
+*
+*  The copyright holders and contributing author(s) will not be
+*  liable for any direct, indirect, special or consequential damages
+*  arising out of any use of the software or documentation, even if
+*  advised of the possibility of such damage.
+*
+*  Permission is hereby granted to use, copy, modify, and distribute
+*  this source code, or portions hereof, documentation and executables,
+*  for any purpose, without fee, subject to the following restrictions:
+*
+*  1. The origin of this source code must not be misrepresented.
+*  2. Altered versions must be plainly marked as such and must
+*     not be misrepresented as being the original source.
+*  3. This Copyright notice may not be removed or altered from any
+*     source or altered source distribution.
+* 
+*  The copyright holders and contributing author(s) specifically
+*  permit, without fee, and encourage the use of this source code
+*  as a component for supporting the Hypertext Markup Language in
+*  commercial products. If you use this source code in a product,
+*  acknowledgment is not required but would be appreciated.
+*
+*/
diff --git a/lucene/contrib/ant/lib/Tidy.jar b/lucene/contrib/ant/lib/Tidy.jar
deleted file mode 100644
index 365974c6986..00000000000
--- a/lucene/contrib/ant/lib/Tidy.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[af4eed0506b53f17a4d22e4f1630ee03cb7991e5] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lucene/contrib/ant/lib/jtidy-r938.jar b/lucene/contrib/ant/lib/jtidy-r938.jar
new file mode 100644
index 00000000000..6931b0db378
--- /dev/null
+++ b/lucene/contrib/ant/lib/jtidy-r938.jar
@@ -0,0 +1,2 @@
+AnyObjectId[efde902f3e9b180ee7bed0e849b4be8d6c15aaff] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file