Index: solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java	(working copy)
@@ -18,8 +18,8 @@
  */
 
 import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.GroupParams;
Index: solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java	(working copy)
@@ -23,8 +23,8 @@
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.UnicodeUtil;
Index: solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java	(working copy)
@@ -19,11 +19,11 @@
 
 import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.grouping.GroupDocs;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.search.grouping.SearchGroup;
 import org.apache.lucene.search.grouping.term.TermAllGroupsCollector;
 import org.apache.lucene.search.grouping.term.TermSecondPassGroupingCollector;
-import org.apache.lucene.search.grouping.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.schema.SchemaField;
 import org.apache.solr.search.grouping.Command;
Index: solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java	(working copy)
@@ -20,8 +20,8 @@
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
Index: solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java	(working copy)
@@ -18,8 +18,8 @@
  */
 
 import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.util.NamedList;
Index: solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java	(working copy)
@@ -18,8 +18,8 @@
  */
 
 import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.handler.component.ResponseBuilder;
Index: solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
===================================================================
--- solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java	(working copy)
@@ -18,8 +18,8 @@
  */
 
 import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.util.NamedList;
Index: solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
===================================================================
--- solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java	(working copy)
@@ -20,7 +20,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.grouping.SearchGroup;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
Index: solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
===================================================================
--- solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java	(revision 1327509)
+++ solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java	(working copy)
@@ -24,9 +24,7 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.*;
-import org.apache.lucene.search.grouping.GroupDocs;
 import org.apache.lucene.search.grouping.SearchGroup;
-import org.apache.lucene.search.grouping.TopGroups;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.ReaderUtil;
Index: lucene/core/src/java/org/apache/lucene/search/TopGroups.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/TopGroups.java	(working copy)
+++ lucene/core/src/java/org/apache/lucene/search/TopGroups.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.grouping;
+package org.apache.lucene.search;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/core/src/java/org/apache/lucene/search/GroupDocs.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/GroupDocs.java	(working copy)
+++ lucene/core/src/java/org/apache/lucene/search/GroupDocs.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.grouping;
+package org.apache.lucene.search;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
===================================================================
--- lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java	(revision 1327509)
+++ lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java	(working copy)
@@ -22,8 +22,8 @@
 import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.*;
 
Index: lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
===================================================================
--- lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java	(revision 1327509)
+++ lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java	(working copy)
@@ -35,7 +35,7 @@
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Scorer.ChildScorer;
 import org.apache.lucene.search.Weight;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.FixedBitSet;
Index: lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
===================================================================
--- lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java	(revision 1327509)
+++ lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java	(working copy)
@@ -21,8 +21,8 @@
 import org.apache.lucene.index.IndexWriter; // javadocs
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.Scorer.ChildScorer;
-import org.apache.lucene.search.grouping.GroupDocs;
-import org.apache.lucene.search.grouping.TopGroups;
+import org.apache.lucene.search.GroupDocs;
+import org.apache.lucene.search.TopGroups;
 import org.apache.lucene.util.ArrayUtil;
 
 import java.io.IOException;
Index: lucene/join/build.xml
===================================================================
--- lucene/join/build.xml	(revision 1327509)
+++ lucene/join/build.xml	(working copy)
@@ -6,15 +6,4 @@
 
   <import file="../module-build.xml"/>
 
-  <path id="classpath">
-    <pathelement path="${grouping.jar}"/>
-    <path refid="base.classpath"/>
-  </path>
-
-  <path id="run.classpath">
-    <path refid="classpath"/>
-    <pathelement location="${build.dir}/classes/java"/>
-  </path>
-
-  <target name="init" depends="module-build.init,jar-grouping"/>
 </project>
Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java (deleted)
===================================================================
Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java (deleted)
===================================================================
Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
===================================================================
--- lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java	(revision 1327509)
+++ lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java	(working copy)
@@ -24,7 +24,7 @@
 import org.apache.lucene.search.grouping.AbstractSecondPassGroupingCollector;
 import org.apache.lucene.search.grouping.SearchGroup;
 import org.apache.lucene.util.mutable.MutableValue;
-import org.apache.lucene.search.grouping.TopGroups; //javadoc
+import org.apache.lucene.search.TopGroups; //javadoc
 
 import java.io.IOException;
 import java.util.Collection;
Index: dev-tools/maven/lucene/join/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/join/pom.xml.template	(revision 1327509)
+++ dev-tools/maven/lucene/join/pom.xml.template	(working copy)
@@ -59,11 +59,6 @@
       <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-grouping</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>