You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/08/19 13:23:44 UTC
svn commit: r1696560 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/common-build.xml solr/ solr/server/ solr/server/build.xml
Author: markrmiller
Date: Wed Aug 19 11:23:44 2015
New Revision: 1696560
URL: http://svn.apache.org/r1696560
Log:
SOLR-7945: Make server/build.xml ivy:retrieve tasks respect ivy.sync property.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/server/build.xml
Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1696560&r1=1696559&r2=1696560&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Wed Aug 19 11:23:44 2015
@@ -81,6 +81,8 @@
<property name="ivy.bootstrap.version" value="2.3.0" />
<property name="ivy.default.configuration" value="*"/>
+
+ <!-- Running ant targets in parralel may require this set to false because ivy:retrieve tasks may race with resolve -->
<property name="ivy.sync" value="true"/>
<property name="ivy.resolution-cache.dir" location="${common.build.dir}/ivy-resolution-cache"/>
Modified: lucene/dev/branches/branch_5x/solr/server/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/build.xml?rev=1696560&r1=1696559&r2=1696560&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/build.xml Wed Aug 19 11:23:44 2015
@@ -40,9 +40,9 @@
<sequential>
<!-- jetty libs in lib/ -->
<ivy:retrieve conf="jetty,servlet" type="jar" log="download-only" symlink="${ivy.symlink}"
- pattern="lib/[artifact]-[revision].[ext]" sync="true"/>
+ pattern="lib/[artifact]-[revision].[ext]" sync="${ivy.sync}"/>
<ivy:retrieve conf="logging" type="jar,bundle" log="download-only" symlink="${ivy.symlink}"
- pattern="lib/ext/[artifact]-[revision].[ext]" sync="true"/>
+ pattern="lib/ext/[artifact]-[revision].[ext]" sync="${ivy.sync}"/>
<!-- start.jar - we don't use sync=true here, we don't own the dir, but
it's one jar with a constant name and we don't need it -->
<ivy:retrieve conf="start" type="jar" log="download-only" symlink="${ivy.symlink}"