Index: lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
===================================================================
--- lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java	(revision 1334840)
+++ lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java	(working copy)
@@ -18,16 +18,12 @@
  */
 
 import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldComparator;
 import org.apache.lucene.search.FieldComparatorSource;
-import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.SortField;
-import org.apache.lucene.util.Bits;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.IdentityHashMap;
 import java.util.Map;
 
@@ -38,7 +34,7 @@
  *
  *
  */
-public abstract class ValueSource implements Serializable {
+public abstract class ValueSource {
 
   /**
    * Gets the values for this reader and the context that was previously
Index: lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java	(revision 1334840)
+++ lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java	(working copy)
@@ -67,11 +67,6 @@
       if (count > BooleanQuery.getMaxClauseCount())
         throw new BooleanQuery.TooManyClauses();
     }
-    
-    // Make sure we are still a singleton even after deserializing
-    protected Object readResolve() {
-      return SCORING_BOOLEAN_QUERY_REWRITE;
-    }    
   };
   
   /** Like {@link #SCORING_BOOLEAN_QUERY_REWRITE} except
@@ -96,11 +91,6 @@
       result.setBoost(query.getBoost());
       return result;
     }
-
-    // Make sure we are still a singleton even after deserializing
-    protected Object readResolve() {
-      return CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
-    }
   };
 
   /** This method is called after every new term to check if the number of max clauses
Index: lucene/core/src/java/org/apache/lucene/search/FieldCache.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/FieldCache.java	(revision 1334840)
+++ lucene/core/src/java/org/apache/lucene/search/FieldCache.java	(working copy)
@@ -125,9 +125,6 @@
       // directly from byte[]
       return Byte.parseByte(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_BYTE_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_BYTE_PARSER"; 
@@ -143,9 +140,6 @@
       // directly from byte[]
       return Short.parseShort(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_SHORT_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_SHORT_PARSER"; 
@@ -161,9 +155,6 @@
       // directly from byte[]
       return Integer.parseInt(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_INT_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_INT_PARSER"; 
@@ -179,9 +170,6 @@
       // directly from byte[]
       return Float.parseFloat(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_FLOAT_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_FLOAT_PARSER"; 
@@ -197,9 +185,6 @@
       // directly from byte[]
       return Long.parseLong(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_LONG_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_LONG_PARSER"; 
@@ -215,9 +200,6 @@
       // directly from byte[]
       return Double.parseDouble(term.utf8ToString());
     }
-    protected Object readResolve() {
-      return DEFAULT_DOUBLE_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_DOUBLE_PARSER"; 
@@ -234,9 +216,6 @@
         throw new FieldCacheImpl.StopFillCacheException();
       return NumericUtils.prefixCodedToInt(term);
     }
-    protected Object readResolve() {
-      return NUMERIC_UTILS_INT_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_INT_PARSER"; 
@@ -253,9 +232,6 @@
         throw new FieldCacheImpl.StopFillCacheException();
       return NumericUtils.sortableIntToFloat(NumericUtils.prefixCodedToInt(term));
     }
-    protected Object readResolve() {
-      return NUMERIC_UTILS_FLOAT_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_FLOAT_PARSER"; 
@@ -272,9 +248,6 @@
         throw new FieldCacheImpl.StopFillCacheException();
       return NumericUtils.prefixCodedToLong(term);
     }
-    protected Object readResolve() {
-      return NUMERIC_UTILS_LONG_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_LONG_PARSER"; 
@@ -291,9 +264,6 @@
         throw new FieldCacheImpl.StopFillCacheException();
       return NumericUtils.sortableLongToDouble(NumericUtils.prefixCodedToLong(term));
     }
-    protected Object readResolve() {
-      return NUMERIC_UTILS_DOUBLE_PARSER;
-    }
     @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_DOUBLE_PARSER"; 
Index: lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java	(revision 1334840)
+++ lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java	(working copy)
@@ -173,11 +173,6 @@
     public SpanQuery rewrite(IndexReader reader, MultiTermQuery query) throws IOException {
       return delegate.rewrite(reader, query);
     }
-
-    // Make sure we are still a singleton even after deserializing
-    protected Object readResolve() {
-      return SCORING_SPAN_QUERY_REWRITE;
-    }
   };
   
   /**
Index: lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
===================================================================
--- lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java	(revision 1334840)
+++ lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java	(working copy)
@@ -146,11 +146,6 @@
    * actual machine crash.
    */
   private static class CrashingException extends RuntimeException {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-
     public CrashingException(String msg) {
       super(msg);
     }