Index: lucene/NOTICE.txt
===================================================================
--- lucene/NOTICE.txt	(revision 1307156)
+++ lucene/NOTICE.txt	(working copy)
@@ -57,7 +57,7 @@
 Includes software from other Apache Software Foundation projects,
 including, but not limited to:
  - Commons Compress (contrib/benchmark/lib/commons-compress-1.0.jar)
- - Xerces (contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
+ - Xerces (contrib/benchmark/lib/xercesImpl-2.9.1.jar)
 
 The SmartChineseAnalyzer source code (under contrib/analyzers) was
 provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
Index: lucene/contrib/benchmark/build.xml
===================================================================
--- lucene/contrib/benchmark/build.xml	(revision 1307156)
+++ lucene/contrib/benchmark/build.xml	(working copy)
@@ -234,11 +234,6 @@
 		     />
     </target>
 
-  <target name="dist-maven" depends="common.dist-maven">
-    <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
-                                 jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
-  </target>
-
     <target name="compile-test" depends="contrib-build.compile-test">
        <!-- copy .alg files as resources for testing -->
        <copy todir="${build.dir}/classes/test/conf">
Index: lucene/contrib/benchmark/CHANGES.txt
===================================================================
--- lucene/contrib/benchmark/CHANGES.txt	(revision 1307156)
+++ lucene/contrib/benchmark/CHANGES.txt	(working copy)
@@ -5,6 +5,11 @@
 For more information on past and future Lucene versions, please see:
 http://s.apache.org/luceneversions
 
+3/29/2012
+ LUCENE-3937: Workaround the XERCES-J bug by avoiding the broken UTF-8 decoding
+ in the v2.9.1 release.  Replaced the XERCESJ-1247-patched jar with the v2.9.1
+ release jar.  (Uwe Schindler, Robert Muir, Mike McCandless)
+
 2/15/2011
   LUCENE-3768: fix typos in .alg files, and add test that all .alg files in conf/
   can be parsed.  (Sami Siren via Robert Muir)
Index: lucene/tools/custom-tasks.xml
===================================================================
--- lucene/tools/custom-tasks.xml	(revision 1307156)
+++ lucene/tools/custom-tasks.xml	(working copy)
@@ -44,8 +44,7 @@
 
             <!-- Non-typical version patterns. -->
             <additional-filters />
-            <replaceregex pattern="/xercesImpl([^/]+)$" replace="/xercesImpl" flags="gi" />
-    
+
             <!-- Typical version patterns. -->
             <replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
           </filtermapper>
Index: dev-tools/eclipse/dot.classpath
===================================================================
--- dev-tools/eclipse/dot.classpath	(revision 1307156)
+++ dev-tools/eclipse/dot.classpath	(working copy)
@@ -94,7 +94,7 @@
 	<classpathentry kind="lib" path="lucene/lib/junit-4.10.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-compress-1.2.jar"/>
-	<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
+	<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/icu/lib/icu4j-4_8_1_1.jar"/>
 	<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
Index: dev-tools/maven/pom.xml.template
===================================================================
--- dev-tools/maven/pom.xml.template	(revision 1307156)
+++ dev-tools/maven/pom.xml.template	(working copy)
@@ -413,6 +413,11 @@
         <artifactId>servlet-api</artifactId>
         <version>2.4</version>
       </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.9.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -667,20 +672,6 @@
             <artifactId>maven-install-plugin</artifactId>
             <executions>
               <execution>
-                <id>install-xercesImpl</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>lucene-xercesImpl</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>lucene/contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
-                </configuration>  
-              </execution>
-              <execution>
                 <id>install-solr-commons-csv</id>
                 <phase>install</phase>
                 <goals>
Index: dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/contrib/benchmark/pom.xml.template	(revision 1307156)
+++ dev-tools/maven/lucene/contrib/benchmark/pom.xml.template	(working copy)
@@ -79,11 +79,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-xercesImpl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
        <groupId>com.ibm.icu</groupId>
        <artifactId>icu4j</artifactId>
     </dependency>
@@ -91,6 +86,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
Index: solr/NOTICE.txt
===================================================================
--- solr/NOTICE.txt	(revision 1307156)
+++ solr/NOTICE.txt	(working copy)
@@ -79,7 +79,6 @@
  - Commons Compress (lib/commons-compress-1.0.jar)
  - Commons Digester (lib/commons-digester-1.7.jar)
  - Commons Logging (lib/commons-logging-1.0.4.jar)
- - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
  - Apache Commons
 
 The snowball stemmers in