You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/10/10 14:42:43 UTC
lucene-solr:jira/http2: Fix base-deps resolve task
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 b60fdc1a0 -> a224098a1
Fix base-deps resolve task
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a224098a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a224098a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a224098a
Branch: refs/heads/jira/http2
Commit: a224098a1a431f89a6c113f26257f133d1511844
Parents: b60fdc1
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 10 21:42:31 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 10 21:42:31 2018 +0700
----------------------------------------------------------------------
solr/build.xml | 6 +++---
solr/common-build.xml | 10 +++++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a224098a/solr/build.xml
----------------------------------------------------------------------
diff --git a/solr/build.xml b/solr/build.xml
index 53972eb..e174efa 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -635,12 +635,12 @@
<target name="resolve" depends="resolve-example,resolve-server">
<sequential>
- <ant dir="core" target="resolve" inheritall="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
<ant dir="base-deps" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
+ <ant dir="core" target="resolve" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
<ant dir="solrj" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a224098a/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index e8dfef4..e3dc22c 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -240,7 +240,7 @@
<solr-jarify/>
</target>
- <target name="compile-core" depends="prep-lucene-jars,resolve-example,resolve-server,common.compile-core"/>
+ <target name="compile-core" depends="prep-lucene-jars,resolve-base-deps,resolve-example,resolve-server,common.compile-core"/>
<target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
<target name="dist" depends="jar-core">
@@ -473,6 +473,14 @@
<property name="server.libs.uptodate" value="true"/>
</target>
+ <!-- resolve dependencies in the server directory (relied upon by compile/tests) -->
+ <target name="resolve-base-deps" unless="base.deps.libs.uptodate">
+ <ant dir="${common-solr.dir}/base-deps" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="base.deps.libs.uptodate" value="true"/>
+ </target>
+
<macrodef name="contrib-crawl">
<attribute name="target" default=""/>
<attribute name="failonerror" default="true"/>