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 2012/04/04 20:38:14 UTC
svn commit: r1309524 -
/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
Author: sarowe
Date: Wed Apr 4 18:38:13 2012
New Revision: 1309524
URL: http://svn.apache.org/viewvc?rev=1309524&view=rev
Log:
LUCENE-3951: fix ivy resolve invocation in the bootstrap profile in the Lucene/Solr grandfather POM to handle both the case where sysprop ivy.default.ivy.user.dir is set and where it is not
Modified:
lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1309524&r1=1309523&r2=1309524&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Wed Apr 4 18:38:13 2012
@@ -661,14 +661,32 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
+ <!--
+ ! Retrieve the patched jetty and jetty-util jars via ivy.
+ !
+ ! Don't include a property setting for ivy.default.ivy.user.dir unless
+ ! the same-named system property was given on the Maven command line.
+ -->
<execution>
+ <id>ivy.default.ivy.user.dir-is-not-set</id>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <target>
- <!-- Retrieve the patched jetty and jetty-util jars via ivy -->
+ <target unless="ivy.default.ivy.user.dir">
+ <ant antfile="solr/example/build.xml" target="resolve" inheritall="false"/>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>ivy.default.ivy.user.dir-is-set</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="ivy.default.ivy.user.dir">
<ant antfile="solr/example/build.xml" target="resolve" inheritall="false">
<property name="ivy.default.ivy.user.dir" value="${ivy.default.ivy.user.dir}"/>
</ant>