svn commit: r1623427 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Mon Sep  8 16:09:22 2014
New Revision: 1623427

URL: http://svn.apache.org/r1623427
Log:
Merged revision(s) 1623426 from lucene/dev/trunk:
fix undefined propretym remove non-used property

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1623427&r1=1623426&r2=1623427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Mon Sep  8 16:09:22 2014
@@ -36,7 +36,6 @@
 
   <property name="dev-tools.dir" location="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" location="${common.dir}/tools/prettify"/>
-  <property name="maven.build.dir" location="${build.dir}/maven"/>
   <property name="license.dir" location="${common.dir}/licenses"/>
 
   <tstamp>
@@ -137,8 +136,6 @@
 
   <property name="tests.heapdump.args" value=""/>
 
-  <property name="tests.workDir" location="${build.dir}/test"/>
-
   <!-- Override these in your local properties to your desire. -->
   <!-- Show simple class names (no package) in test suites. -->
   <property name="tests.useSimpleNames" value="false" />
@@ -232,6 +229,7 @@
   <property name="m2.repository.id" value="local"/>
   <property name="m2.credentials.prompt" value="true"/>
 
+  <property name="tests.workDir" location="${build.dir}/test"/>
   <property name="junit.output.dir" location="${build.dir}/test"/>
   <property name="junit.reports" location="${build.dir}/test/reports"/>