Index: dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(revision 1087373)
+++ dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(working copy)
@@ -104,8 +104,8 @@
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
-    <outputDirectory>${build-directory}/extras/classes</outputDirectory>
-    <testOutputDirectory>${build-directory}/extras/test-classes</testOutputDirectory>
+    <outputDirectory>${build-directory}/classes</outputDirectory>
+    <testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
     <sourceDirectory>main/java</sourceDirectory>
     <testSourceDirectory>test/java</testSourceDirectory>
     <testResources>
Index: dev-tools/maven/solr/src/solrj/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/solrj/pom.xml.template	(revision 1087373)
+++ dev-tools/maven/solr/src/solrj/pom.xml.template	(working copy)
@@ -96,7 +96,7 @@
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
-    <outputDirectory>${build-directory}</outputDirectory>
+    <outputDirectory>${build-directory}/classes</outputDirectory>
     <sourceDirectory>.</sourceDirectory>
     <testResources/>
     <plugins>