lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1541654 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/build.xml
Date Wed, 13 Nov 2013 18:38:16 GMT
Author: sarowe
Date: Wed Nov 13 18:38:16 2013
New Revision: 1541654

URL: http://svn.apache.org/r1541654
Log:
LUCENE-5322: define-lucene-javadoc-url should only be called once as part of Solr's  generate-maven-artifacts
(merged trunk r1541653)

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

Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1541654&r1=1541653&r2=1541654&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Wed Nov 13 18:38:16 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>
  



Mime
View raw message