Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1142529)
+++ solr/common-build.xml	(working copy)
@@ -199,7 +199,6 @@
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/queries-contrib/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/spatial/classes/java" />
     <pathelement location="${common-solr.dir}/../modules/grouping/build/classes/java" />
-    <pathelement location="${common-solr.dir}/../modules/common/build/classes/java" />
     <pathelement location="${common-solr.dir}/../modules/queries/build/classes/java" />
   </path>
 
@@ -218,7 +217,6 @@
         <fileset dir="../lucene/contrib/queries" includes="build.xml" />
         <fileset dir="../lucene/contrib/spatial" includes="build.xml" />
         <fileset dir="../modules/grouping" includes="build.xml" />
-        <fileset dir="../modules/common" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -256,9 +254,6 @@
       <fileset dir="../modules/grouping/build">
         <include name="lucene-grouping-${version}.jar" />
       </fileset>
-      <fileset dir="../modules/common/build">
-        <include name="lucene-common-module-${version}.jar" />
-      </fileset>
       <fileset dir="../modules/queries/build">
         <include name="lucene-queries-${version}.jar" />
       </fileset>
@@ -277,7 +272,6 @@
       <fileset dir="../lucene/contrib/queries" includes="build.xml"/>
       <fileset dir="../lucene/contrib/spatial" includes="build.xml"/>
       <fileset dir="../modules/grouping" includes="build.xml"/>
-      <fileset dir="../modules/common" includes="build.xml"/>
       <fileset dir="../modules/queries" includes="build.xml"/>
     </subant>
   </target>
Index: solr/src/java/org/apache/solr/schema/BoolField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/BoolField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/BoolField.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueBool;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
@@ -28,6 +26,8 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueBool;
 import org.apache.solr.search.QParser;
 import org.apache.solr.search.function.*;
 import org.apache.lucene.analysis.Analyzer;
Index: solr/src/java/org/apache/solr/schema/TrieField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/TrieField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/TrieField.java	(working copy)
@@ -16,8 +16,6 @@
  */
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValueDate;
-import org.apache.lucene.common.mutable.MutableValueLong;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.NumericField;
@@ -35,6 +33,8 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.mutable.MutableValueDate;
+import org.apache.lucene.util.mutable.MutableValueLong;
 import org.apache.solr.analysis.*;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.response.TextResponseWriter;
Index: solr/src/java/org/apache/solr/schema/SortableDoubleField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/SortableDoubleField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/SortableDoubleField.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueDouble;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
@@ -26,6 +24,8 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueDouble;
 import org.apache.solr.search.QParser;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
Index: solr/src/java/org/apache/solr/schema/SortableLongField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/SortableLongField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/SortableLongField.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueLong;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
@@ -26,6 +24,8 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueLong;
 import org.apache.solr.search.QParser;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
Index: solr/src/java/org/apache/solr/schema/SortableFloatField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/SortableFloatField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/SortableFloatField.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueFloat;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
@@ -26,6 +24,8 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueFloat;
 import org.apache.solr.search.QParser;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
Index: solr/src/java/org/apache/solr/schema/SortableIntField.java
===================================================================
--- solr/src/java/org/apache/solr/schema/SortableIntField.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/schema/SortableIntField.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueInt;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
@@ -26,6 +24,8 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueInt;
 import org.apache.solr.search.QParser;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
Index: solr/src/java/org/apache/solr/search/Grouping.java
===================================================================
--- solr/src/java/org/apache/solr/search/Grouping.java	(revision 1142529)
+++ solr/src/java/org/apache/solr/search/Grouping.java	(working copy)
@@ -18,7 +18,6 @@
 package org.apache.solr.search;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
@@ -29,6 +28,7 @@
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.grouping.*;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SimpleOrderedMap;
Index: modules/common/NOTICE.txt (deleted)
===================================================================
Index: modules/common/LICENSE.txt (deleted)
===================================================================
Index: modules/common/src/test/ADD_TESTS_HERE.txt (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java (deleted)
===================================================================
Index: modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java (deleted)
===================================================================
Index: modules/common/src/java/overview.html (deleted)
===================================================================
Index: modules/common/build.xml (deleted)
===================================================================
Index: modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java	(working copy)
@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueFloat;
 import org.apache.lucene.search.*;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueFloat;
 
 /**
  * Represents field values as different types.
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java	(working copy)
@@ -1,9 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueDouble;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueDouble;
 
 public abstract class DoubleDocValues extends DocValues {
   protected final ValueSource vs;
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java	(working copy)
@@ -1,9 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueInt;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueInt;
 
 
 public abstract class IntDocValues extends DocValues {
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java	(working copy)
@@ -1,9 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueBool;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueBool;
 
 
 public abstract class BoolDocValues extends DocValues {
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueStr;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.ValueSourceScorer;
@@ -27,6 +25,8 @@
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueStr;
 
 import java.io.IOException;
 
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java	(working copy)
@@ -1,9 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueLong;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueLong;
 
 
 public abstract class LongDocValues extends DocValues {
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java	(working copy)
@@ -1,9 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueFloat;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueFloat;
 
 public abstract class FloatDocValues extends DocValues {
   protected final ValueSource vs;
Index: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java	(working copy)
@@ -1,10 +1,9 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueStr;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueStr;
 
 public abstract class StrDocValues extends DocValues {
   protected final ValueSource vs;
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueDouble;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
@@ -27,6 +25,8 @@
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.DoubleValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.DoubleValues;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueDouble;
 
 import java.io.IOException;
 import java.util.Map;
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java	(working copy)
@@ -17,9 +17,6 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueFloat;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
@@ -27,6 +24,8 @@
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.Weight.ScorerContext;
 import org.apache.lucene.util.ReaderUtil;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueFloat;
 
 import java.io.IOException;
 import java.util.Map;
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueLong;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
@@ -27,6 +25,8 @@
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.LongValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.LongValues;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueLong;
 
 
 import java.io.IOException;
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java	(working copy)
@@ -20,14 +20,14 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueFloat;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.FloatValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.FloatValues;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueFloat;
 
 /**
  * Obtains float field values from the {@link org.apache.lucene.search.FieldCache}
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueInt;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
@@ -26,6 +24,8 @@
 import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.util.ReaderUtil;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueInt;
 
 import java.io.IOException;
 import java.util.Map;
Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java	(revision 1142529)
+++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java	(working copy)
@@ -17,8 +17,6 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.common.mutable.MutableValue;
-import org.apache.lucene.common.mutable.MutableValueInt;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
@@ -27,6 +25,8 @@
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.IntValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.IntValues;
+import org.apache.lucene.util.mutable.MutableValue;
+import org.apache.lucene.util.mutable.MutableValueInt;
 
 import java.io.IOException;
 import java.util.Map;
Index: modules/queries/build.xml
===================================================================
--- modules/queries/build.xml	(revision 1142529)
+++ modules/queries/build.xml	(working copy)
@@ -26,22 +26,5 @@
 
   <import file="../../lucene/contrib/contrib-build.xml"/>
 
-  <module-uptodate name="common-module"
-                   module-src-name="common"
-                   property="common-module.uptodate" classpath.property="common-module.jar"/>
-
-  <path id="classpath">
-    <pathelement path="${common-module.jar}"/>
-    <path refid="base.classpath"/>
-  </path>
-
-  <target name="compile-core" depends="compile-common-module, common.compile-core"/>
-
-  <target name="compile-common-module" unless="common-module.uptodate">
-    <subant target="default">
-      <fileset dir="${common.dir}/../modules/common" includes="build.xml"/>
-    </subant>
-  </target>
-
   <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
 </project>
\ No newline at end of file
Index: modules/build.xml
===================================================================
--- modules/build.xml	(revision 1142529)
+++ modules/build.xml	(working copy)
@@ -24,7 +24,6 @@
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -39,7 +38,6 @@
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -54,7 +52,6 @@
       <subant target="compile-test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -69,7 +66,6 @@
       <subant target="javadocs" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -85,7 +81,6 @@
       <subant target="dist-maven" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -99,7 +94,6 @@
       <subant target="validate" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
@@ -115,7 +109,6 @@
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
-        <fileset dir="common" includes="build.xml" />
         <fileset dir="facet" includes="build.xml" />
         <fileset dir="grouping" includes="build.xml" />
         <fileset dir="join" includes="build.xml" />
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 import org.apache.lucene.util.BytesRef;
 
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 public class MutableValueDouble extends MutableValue {
   public double value;
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 public class MutableValueInt extends MutableValue {
   public int value;
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 public class MutableValueBool extends MutableValue {
   public boolean value;
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 import java.util.Date;
 
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 /** @lucene.internal */
 public abstract class MutableValue implements Comparable {
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 public class MutableValueLong extends MutableValue {
   public long value;
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java
===================================================================
--- lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java	(revision 0)
+++ lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java	(working copy)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.common.mutable;
+package org.apache.lucene.util.mutable;
 
 public class MutableValueFloat extends MutableValue {
   public float value;
Index: dev-tools/idea/solr/solr.iml
===================================================================
--- dev-tools/idea/solr/solr.iml	(revision 1142529)
+++ dev-tools/idea/solr/solr.iml	(working copy)
@@ -31,7 +31,6 @@
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="phonetic" />
     <orderEntry type="module" module-name="suggest" />
-    <orderEntry type="module" module-name="common" />
     <orderEntry type="module" module-name="analysis-common" />
     <orderEntry type="module" module-name="lucene" />
   </component>
Index: dev-tools/idea/.idea/modules.xml
===================================================================
--- dev-tools/idea/.idea/modules.xml	(revision 1142529)
+++ dev-tools/idea/.idea/modules.xml	(working copy)
@@ -21,7 +21,6 @@
       <module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
       <module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
       <module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
-      <module filepath="$PROJECT_DIR$/modules/common/common.iml" />
       <module filepath="$PROJECT_DIR$/modules/facet/facet.iml" />
       <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
       <module filepath="$PROJECT_DIR$/modules/join/join.iml" />
Index: dev-tools/idea/.idea/workspace.xml
===================================================================
--- dev-tools/idea/.idea/workspace.xml	(revision 1142529)
+++ dev-tools/idea/.idea/workspace.xml	(working copy)
@@ -22,13 +22,6 @@
       <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="common module" type="JUnit" factoryName="JUnit">
-      <module name="common" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/common/build" />
-      <option name="VM_PARAMETERS" value="-ea  -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
     <configuration default="false" name="common analysis module" type="JUnit" factoryName="JUnit">
       <module name="analysis-common" />
       <option name="TEST_OBJECT" value="package" />
@@ -211,37 +204,36 @@
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <list size="30">
+    <list size="29">
       <item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.common module" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.common analysis module" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
-      <item index="7" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
-      <item index="8" class="java.lang.String" itemvalue="JUnit.facet module" />
-      <item index="9" class="java.lang.String" itemvalue="JUnit.grouping module" />
-      <item index="10" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
-      <item index="11" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
-      <item index="12" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.join module" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.queries module" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
-      <item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
-      <item index="24" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
-      <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
-      <item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
-      <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
-      <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
-      <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.common analysis module" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
+      <item index="7" class="java.lang.String" itemvalue="JUnit.facet module" />
+      <item index="8" class="java.lang.String" itemvalue="JUnit.grouping module" />
+      <item index="9" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+      <item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+      <item index="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+      <item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
+      <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+      <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+      <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
     </list>
   </component>
 </project>
Index: dev-tools/idea/modules/common/common.iml (deleted)
===================================================================
Index: dev-tools/idea/modules/queries/queries.iml
===================================================================
--- dev-tools/idea/modules/queries/queries.iml	(revision 1142529)
+++ dev-tools/idea/modules/queries/queries.iml	(working copy)
@@ -13,6 +13,5 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" module-name="lucene" />
-    <orderEntry type="module" module-name="common" />
   </component>
 </module>
Index: dev-tools/maven/solr/src/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/pom.xml.template	(revision 1142529)
+++ dev-tools/maven/solr/src/pom.xml.template	(working copy)
@@ -103,11 +103,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-common-module</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queries</artifactId>
       <version>${project.version}</version>
     </dependency>
Index: dev-tools/maven/modules/common/pom.xml.template (deleted)
===================================================================
Index: dev-tools/maven/modules/queries/pom.xml.template
===================================================================
--- dev-tools/maven/modules/queries/pom.xml.template	(revision 1142529)
+++ dev-tools/maven/modules/queries/pom.xml.template	(working copy)
@@ -43,11 +43,6 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-common-module</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>