svn commit: r1692573 - in /lucene/dev/branches/branch_5x: ./ build.xml

[us...@apache.org]

Author: uschindler
Date: Fri Jul 24 20:03:29 2015
New Revision: 1692573

URL: http://svn.apache.org/r1692573
Log:
Merged revision(s) 1692572 from lucene/dev/trunk:
LUCENE-6693: Add one more parameter-pass-through #4

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/build.xml

Modified: lucene/dev/branches/branch_5x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/build.xml?rev=1692573&r1=1692572&r2=1692573&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/build.xml (original)
+++ lucene/dev/branches/branch_5x/build.xml Fri Jul 24 20:03:29 2015
@@ -448,7 +448,7 @@ File | Project Structure | Platform Sett
   </target>
 
   <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it (pass '-DsmokeTestRelease.java8=/path/to/jdk1.8.0' to additionally test with Java 8)"
-    depends="clean,resolve-groovy,-nightly-smoke-java8params">
+    depends="clean,resolve-groovy,resolve-pegdown,install-maven-tasks,-nightly-smoke-java8params">
     <fail message="To run nightly smoke, the JDK must be exactly Java 1.7, was: ${java.specification.version}">
       <condition>
         <not><equals arg1="${java.specification.version}" arg2="1.7"/></not>
@@ -463,7 +463,8 @@ File | Project Structure | Platform Sett
       <fileset dir="solr" includes="build.xml" />
       <!-- pass ${version.base} here to emulate a real release, without appendix like "-SNAPSHOT": -->
       <property name="version" value="${version.base}" />
-    </subant>
+      <propertyset refid="uptodate.and.compiled.properties"/>
+   </subant>
     <mkdir dir="${smokeTestRelease.dir}"/>
     <copy todir="${smokeTestRelease.dir}/lucene">
       <fileset dir="lucene/dist"/>