Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5322: define-lucene-javadoc-url should only be called once as part of Solr's generate-maven-artifacts 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1541653 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-11-13 18:34:15 +00:00
parent 39c1cf1972
commit 587bfb38ca
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/build.xml
View File

@ -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>