You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/11/13 19:34:16 UTC
svn commit: r1541653 - /lucene/dev/trunk/solr/build.xml
Author: sarowe
Date: Wed Nov 13 18:34:15 2013
New Revision: 1541653
URL: http://svn.apache.org/r1541653
Log:
LUCENE-5322: define-lucene-javadoc-url should only be called once as part of Solr's generate-maven-artifacts
Modified:
lucene/dev/trunk/solr/build.xml
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1541653&r1=1541652&r2=1541653&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Wed Nov 13 18:34:15 2013
@@ -568,10 +568,12 @@
<contrib-crawl target="-ecj-javadoc-lint"/>
</target>
- <target name="-dist-maven" depends="install-maven-tasks">
+ <!-- define-lucene-javadoc-url is *not* a useless dependencies. Do not remove! -->
+ <target name="-dist-maven" depends="install-maven-tasks,define-lucene-javadoc-url">
<sequential>
<m2-deploy pom.xml="${filtered.pom.templates.dir}/solr/pom.xml"/> <!-- Solr parent POM -->
<subant target="-dist-maven" 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"/>
@@ -581,12 +583,13 @@
</sequential>
</target>
- <!-- define-lucene-javadoc-url is *not* a useless dependencies. Do not remove! -->
- <target name="generate-maven-artifacts" depends="define-lucene-javadoc-url,-unpack-solr-tgz">
+ <target name="generate-maven-artifacts" depends="-unpack-solr-tgz">
<sequential>
<ant dir=".." target="resolve" inheritall="false"/>
<antcall target="-filter-pom-templates" inheritall="false"/>
- <antcall target="-dist-maven" inheritall="false"/>
+ <antcall target="-dist-maven" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </antcall>
</sequential>
</target>