svn commit: r1618282 - /lucene/dev/trunk/lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Fri Aug 15 21:39:53 2014
New Revision: 1618282

URL: http://svn.apache.org/r1618282
Log:
LUCENE-5850: Remove useless checks and properties

Modified:
    lucene/dev/trunk/lucene/common-build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1618282&r1=1618281&r2=1618282&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Aug 15 21:39:53 2014
@@ -30,7 +30,6 @@
   
   <!-- The base version of the next release (including bugfix number, e.g., x.y.z+): -->
   <property name="version.base" value="5.0.0"/>
-
   
   <!-- !!! RELEASE MANAGER: Don't change anything after this line! !!! -->
 
@@ -60,8 +59,6 @@
   
   <!--TODO: remove once Jenkins jobs are updated:--><property name="dev.version.suffix" value="SNAPSHOT"/>
 
-  <!-- The corresponding version as oal.util.Version used for matchVersion (x.y): -->
-  <property name="version.luceneMatchVersion" value="${version.base}"/>
   <!-- Suffix of the version, by default SNAPSHOT: -->
   <property name="version.suffix" value="${dev.version.suffix}"/>
   <property name="version" value="${version.base}-${version.suffix}"/>
@@ -73,15 +70,6 @@
     </condition>
   </fail>
 
-  <fail message="Invalid version.luceneMatchVersion property: ${version.luceneMatchVersion}">
-    <condition>
-      <not><and>
-        <matches pattern="^\d+\.\d+\.\d+$" casesensitive="true" string="${version.luceneMatchVersion}"/>
-        <matches pattern="^\Q${version.luceneMatchVersion}\E(\.|\-|\b).*$" casesensitive="true" string="${version}"/>
-      </and></not>
-    </condition>
-  </fail>
-
   <property name="year" value="2000-${current.year}"/>
   
   <!-- Lucene modules unfortunately don't have the "lucene-" prefix, so we add it if no prefix is given in $name: -->
@@ -143,7 +131,7 @@
   <property name="tests.verbose" value="false"/>
   <property name="tests.infostream" value="${tests.verbose}"/>
   <property name="tests.filterstacks" value="true"/>
-  <property name="tests.luceneMatchVersion" value="${version.luceneMatchVersion}"/>
+  <property name="tests.luceneMatchVersion" value="${version.base}"/>
 
   <condition property="tests.heapsize" value="768M">
     <isset property="run.clover"/>