Index: lucene/analysis/build.xml
===================================================================
--- lucene/analysis/build.xml	(revision 1380912)
+++ lucene/analysis/build.xml	(working copy)
@@ -103,10 +103,14 @@
 
   <target name="build-artifacts-and-tests" depends="default,compile-test" />
 
-  <target name="dist-maven" depends="default,javadocs">
+  <target name="dist-maven">
     <forall-analyzers target="dist-maven"/>
   </target>  	
 
+  <target name="validate-maven-dependencies">
+    <forall-analyzers target="validate-maven-dependencies"/>
+  </target>  	
+
   <target name="javadocs">
     <forall-analyzers target="javadocs"/>
   </target>  	
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1380912)
+++ lucene/build.xml	(working copy)
@@ -432,12 +432,7 @@
 
   </target>
 
-
-  <!-- TODO: these dependencies are bogus: we only
-       call this from prepare-release so it shouldn't require
-       'package' and 'javadocs' again -->
-  <target name="generate-maven-artifacts"
-          depends="install-maven-tasks, filter-pom-templates, package, javadocs">
+  <target name="generate-maven-artifacts">
     <sequential>
       <subant target="dist-maven" failonerror="true" inheritall="false">
         <propertyset refid="uptodate.and.compiled.properties"/>
@@ -449,6 +444,18 @@
     </sequential>
   </target>
 	
+  <target name="validate-maven-dependencies" depends="generate-maven-artifacts">
+    <sequential>
+      <subant target="validate-maven-dependencies" failonerror="true" inheritall="false">
+        <propertyset refid="uptodate.and.compiled.properties"/>
+        <fileset dir="${common.dir}/core" includes="build.xml"/>
+        <fileset dir="${common.dir}/test-framework" includes="build.xml"/>
+      </subant>
+      
+      <modules-crawl target="validate-maven-dependencies"/>
+    </sequential>
+  </target>
+	
   <!-- ================================================================== -->
   <!-- support for signing the artifacts using gpg                        -->
   <!-- ================================================================== -->
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1380912)
+++ lucene/common-build.xml	(working copy)
@@ -19,7 +19,8 @@
 
 <project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant" 
                        xmlns:ivy="antlib:org.apache.ivy.ant"
-                       xmlns:junit4="antlib:com.carrotsearch.junit4">
+                       xmlns:junit4="antlib:com.carrotsearch.junit4"
+                       xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
   <description>
     This file is designed for importing into a main build file, and not intended
     for standalone use.
@@ -29,6 +30,7 @@
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${common.dir}/tools/prettify"/>
   <property name="maven.build.dir" value="${build.dir}/maven"/>
+  <property name="license.dir" value="${common.dir}/licenses"/>
 
   <!-- Give user a chance to override without editing this file
       (and without typing -D each time it compiles it -->
@@ -172,6 +174,7 @@
   <property name="maven.dist.dir" location="${dist.dir}/maven"/>
   <makeurl file="${maven.dist.dir}" property="m2.repository.url" validate="false"/>
   <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
+  <property name="m2.repository.id" value="local"/>
 
   <property name="jflex.home" location="${common.dir}"/>
 
@@ -448,6 +451,39 @@
     </sequential>
   </macrodef>
 	
+  <!-- validate maven dependencies -->
+  <macrodef name="m2-validate-dependencies">
+      <attribute name="pom.xml"/>
+      <attribute name="licenseDirectory"/>
+      <element name="excludes" optional="true"/>
+      <element name="additional-filters" optional="true"/>
+    <sequential>
+      <artifact:dependencies filesetId="maven.fileset" useScope="test" type="jar">
+        <artifact:pom file="@{pom.xml}"/>
+        <remoteRepository id="apache.snapshots" url="${m2.repository.url}">
+          <snapshots enabled="true" updatePolicy="always"/>
+          <releases enabled="false"/>
+        </remoteRepository>
+      </artifact:dependencies>
+      <licenses licenseDirectory="@{licenseDirectory}">
+        <restrict>
+          <fileset refid="maven.fileset"/>
+          <rsel:not>
+            <excludes/>
+          </rsel:not>
+        </restrict>
+        <licenseMapper>
+          <chainedmapper>
+            <filtermapper refid="license-mapper-defaults"/>
+            <filtermapper>
+              <additional-filters/>
+            </filtermapper>
+          </chainedmapper>
+        </licenseMapper>
+      </licenses>
+    </sequential>
+  </macrodef>
+
   <macrodef name="build-manifest" description="Builds a manifest file">
   	<attribute name="title"/>
     <attribute name="implementation.title"/>
@@ -1183,6 +1219,24 @@
     </sequential>
   </target>
 
+  <target name="validate-maven-dependencies" depends="filter-pom-templates, install-maven-tasks, compile-tools, load-custom-tasks">
+    <property name="top.level.dir" location="${common.dir}/.."/>
+    <pathconvert property="pom.xml">
+      <mapper>
+        <chainedmapper>
+          <globmapper from="${top.level.dir}*" to="${filtered.pom.templates.dir}*"/>
+          <globmapper from="*build.xml" to="*pom.xml"/>
+        </chainedmapper>
+      </mapper>
+      <path location="${ant.file}"/>
+    </pathconvert>
+    <m2-validate-dependencies pom.xml="${pom.xml}" licenseDirectory="${license.dir}">
+      <excludes>
+        <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
+      </excludes>
+    </m2-validate-dependencies>
+  </target>
+
   <target name="filter-pom-templates" unless="filtered.pom.templates.uptodate">
     <mkdir dir="${filtered.pom.templates.dir}"/>
     <copy todir="${common.dir}/build/poms" overwrite="true">
Index: lucene/tools/custom-tasks.xml
===================================================================
--- lucene/tools/custom-tasks.xml	(revision 1380912)
+++ lucene/tools/custom-tasks.xml	(working copy)
@@ -16,6 +16,23 @@
     <property name="custom-tasks.loaded" value="true"/>
   </target>
 
+  <filtermapper id="license-mapper-defaults">
+    <!-- Normalize input paths. -->
+    <replacestring from="\" to="/" />
+    <replaceregex pattern="\.jar$" replace="" flags="gi" />
+    
+    <!-- Some typical snapshot/minimalized JAR suffixes. -->
+    <replaceregex pattern="-min$" replace="" flags="gi" />
+    <replaceregex pattern="SNAPSHOT$" replace="" flags="gi" />
+
+    <!-- Typical version patterns. -->
+    <replaceregex pattern="\.rc[0-9]+" replace="" flags="gi" />
+    <replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
+
+    <!-- git hashcode pattern: its always 40 chars right? -->
+    <replaceregex pattern="\-[a-z0-9]{40,40}$" replace="" flags="gi" />
+  </filtermapper>
+
   <macrodef name="license-check-macro">
     <attribute name="dir" />
     <attribute name="licensedir" />
@@ -38,25 +55,13 @@
         </fileset>
 
         <licenseMapper>
-          <filtermapper id="license-mapper-defaults">
-            <!-- Normalize input paths. -->
-            <replacestring from="\" to="/" />
-            <replaceregex pattern="\.jar$" replace="" flags="gi" />
-    
-            <!-- Some typical snapshot/minimalized JAR suffixes. -->
-            <replaceregex pattern="-min$" replace="" flags="gi" />
-            <replaceregex pattern="SNAPSHOT$" replace="" flags="gi" />
-
-            <!-- Non-typical version patterns. -->
-            <additional-filters />
-
-            <!-- Typical version patterns. -->
-            <replaceregex pattern="\.rc[0-9]+" replace="" flags="gi" />
-            <replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
-
-            <!-- git hashcode pattern: its always 40 chars right? -->
-            <replaceregex pattern="\-[a-z0-9]{40,40}$" replace="" flags="gi" />
-          </filtermapper>
+          <chainedmapper>
+            <filtermapper refid="license-mapper-defaults"/>
+            <filtermapper>
+              <!-- Non-typical version patterns. -->
+              <additional-filters />
+            </filtermapper>
+          </chainedmapper>
         </licenseMapper>
       </licenses>
     </sequential>
Index: solr/build.xml
===================================================================
--- solr/build.xml	(revision 1380912)
+++ solr/build.xml	(working copy)
@@ -183,7 +183,6 @@
       </additional-excludes>
       <additional-filters>
         <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
-        <replaceregex pattern="apache-solr-commons-csv-([^/]+)$" replace="apache-solr-commons-csv" flags="gi" />
         <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
         <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
       </additional-filters>
@@ -535,7 +534,7 @@
     <check-broken-links dir="build/docs"/>
   </target>
  
-  <target name="generate-maven-artifacts" depends="install-maven-tasks">
+  <target name="generate-maven-artifacts">
     <sequential>
       <subant target="dist-maven" inheritall="false" >
         <propertyset refid="uptodate.and.compiled.properties"/>
@@ -548,7 +547,19 @@
     </sequential>
   </target>
  
- 
+  <target name="validate-maven-dependencies" depends="generate-maven-artifacts">
+    <sequential>
+      <subant target="validate-maven-dependencies" failonerror="true" inheritall="false">
+        <propertyset refid="uptodate.and.compiled.properties"/>
+        <fileset dir="core" includes="build.xml"/>
+        <fileset dir="solrj" includes="build.xml"/>
+        <fileset dir="test-framework" includes="build.xml"/>
+        <fileset dir="webapp" includes="build.xml"/>
+      </subant>
+      <contrib-crawl target="validate-maven-dependencies"/>
+    </sequential>
+  </target>
+	 
   <!-- ========================================================================= -->
   <!-- ========================= COMMITTERS' HELPERS =========================== -->
   <!-- ========================================================================= -->
Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1380912)
+++ solr/common-build.xml	(working copy)
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<project name="common-solr" default="default">
+<project name="common-solr" default="default" xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
   <description>
     This file is designed for importing into a main build file, and not intended
     for standalone use.
@@ -50,6 +50,7 @@
   <property name="tests.cleanthreads.sysprop" value="perClass"/>
 
   <property name="changes.target.dir" value="${dest}/docs/changes"/>
+  <property name="license.dir" value="${common-solr.dir}/licenses"/>
 
   <import file="${common-solr.dir}/../lucene/module-build.xml"/>
 
@@ -276,6 +277,34 @@
   <target name="dist-maven"
           depends="filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom, dist-maven-common"/>
 
+  <target name="validate-maven-dependencies" depends="filter-pom-templates, install-maven-tasks, compile-tools,load-custom-tasks">
+    <property name="top.level.dir" location="${common.dir}/.."/>
+    <pathconvert property="pom.xml">
+      <mapper>
+        <chainedmapper>
+          <globmapper from="${top.level.dir}*" to="${filtered.pom.templates.dir}*"/>
+          <globmapper from="*build.xml" to="*pom.xml"/>
+        </chainedmapper>
+      </mapper>
+      <path location="${ant.file}"/>
+    </pathconvert>
+    <m2-validate-dependencies pom.xml="${pom.xml}" licenseDirectory="${license.dir}">
+      <additional-filters>
+        <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
+        <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
+        <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
+      </additional-filters>
+      <excludes>
+        <rsel:or>
+          <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
+          <rsel:name name="**/solr-*.jar" handledirsep="true"/>
+          <!-- nocommit -->
+          <rsel:name name="**/*servlet*.jar" handledirsep="true"/>
+        </rsel:or>
+      </excludes>
+    </m2-validate-dependencies>
+  </target>
+
   <!-- Solr core targets -->
   <target name="compile-solr-core" description="Compile Solr core." unless="solr.core.compiled">
     <ant dir="${common-solr.dir}/core" target="compile-core" inheritAll="false">