Index: lucene/analysis/build.xml
===================================================================
--- lucene/analysis/build.xml	(revision 1427856)
+++ lucene/analysis/build.xml	(working copy)
@@ -36,7 +36,7 @@
     <attribute name="target" />
     <sequential>
       <subant target="@{target}" inheritall="false" failonerror="true">
-         <propertyset refid="uptodate.and.compiled.properties"/>
+        <propertyset refid="uptodate.and.compiled.properties"/>
         <fileset dir="${analyzers.dir}" includes="*/build.xml" />
       </subant>
     </sequential>
@@ -46,6 +46,7 @@
     <propertyref regex=".*\.uptodate$$"/>
     <propertyref regex=".*\.compiled$$"/>
     <propertyref regex=".*\.loaded$$"/>
+    <propertyref name="maven.version.glob"/>
   </propertyset>
 
   <target name="common">
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1427856)
+++ lucene/build.xml	(working copy)
@@ -483,7 +483,7 @@
     </sequential>
   </target>
 	
-  <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
+  <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks, -define-maven-version-glob">
     <sequential>
       <subant target="-validate-maven-dependencies" failonerror="true" inheritall="false">
         <propertyset refid="uptodate.and.compiled.properties"/>
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1427856)
+++ lucene/common-build.xml	(working copy)
@@ -246,6 +246,7 @@
     <propertyref regex=".*\.uptodate$$"/>
     <propertyref regex=".*\.compiled$$"/>
     <propertyref regex=".*\.loaded$$"/>
+    <propertyref name="maven.version.glob"/>
     <propertyref name="lucene.javadoc.url"/><!-- for Solr -->
   </propertyset>
 
@@ -1349,8 +1350,14 @@
       </m2-deploy>
     </sequential>
   </target>
+  
+  <target name="-define-maven-version-glob" depends="resolve-groovy" unless="maven.version.glob">
+    <script language="groovy" classpathref="groovy.classpath"><![CDATA[
+      project.setProperty('maven.version.glob', (project.getProperty('version') =~ /\-SNAPSHOT/).replaceFirst("-*"));
+    ]]></script>
+  </target>
 
-  <target name="-validate-maven-dependencies">
+  <target name="-validate-maven-dependencies" depends="-define-maven-version-glob">
     <property name="top.level.dir" location="${common.dir}/.."/>
     <pathconvert property="pom.xml">
       <mapper>
@@ -1363,7 +1370,7 @@
     </pathconvert>
     <m2-validate-dependencies pom.xml="${pom.xml}" licenseDirectory="${license.dir}">
       <excludes>
-        <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
+        <rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>
       </excludes>
     </m2-validate-dependencies>
   </target>
Index: solr/build.xml
===================================================================
--- solr/build.xml	(revision 1427856)
+++ solr/build.xml	(working copy)
@@ -589,7 +589,7 @@
     </subant>
   </target>
  
-  <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
+  <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks, -define-maven-version-glob">
     <sequential>
       <subant target="-validate-maven-dependencies" failonerror="true" inheritall="false">
         <propertyset refid="uptodate.and.compiled.properties"/>
Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1427856)
+++ solr/common-build.xml	(working copy)
@@ -306,7 +306,7 @@
   <target name="dist-maven-src-java"
           depends="filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom, dist-maven-common-src-java"/>
 
-  <target name="-validate-maven-dependencies">
+  <target name="-validate-maven-dependencies" depends="-define-maven-version-glob">
     <property name="top.level.dir" location="${common.dir}/.."/>
     <pathconvert property="pom.xml">
       <mapper>
@@ -325,8 +325,8 @@
       </additional-filters>
       <excludes>
         <rsel:or>
-          <rsel:name name="**/lucene-*.jar" handledirsep="true"/>
-          <rsel:name name="**/solr-*.jar" handledirsep="true"/>
+          <rsel:name name="**/lucene-*-${maven.version.glob}.jar" handledirsep="true"/>
+          <rsel:name name="**/solr-*-${maven.version.glob}.jar" handledirsep="true"/>
           <!-- TODO: figure out what is going on here with servlet-apis -->
           <rsel:name name="**/*servlet*.jar" handledirsep="true"/>
         </rsel:or>