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 19:41:09 UTC

svn commit: r1309499 - in /lucene/dev/branches/branch_3x/dev-tools/maven: README.maven pom.xml.template

Author: sarowe
Date: Wed Apr  4 17:41:08 2012
New Revision: 1309499

URL: http://svn.apache.org/viewvc?rev=1309499&view=rev
Log:
LUCENE-3951: Include ivy resolve invocation to download the patched jetty test dependencies in the bootstrap profile in the Lucene/Solr grandfather POM

Modified:
    lucene/dev/branches/branch_3x/dev-tools/maven/README.maven
    lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/README.maven?rev=1309499&r1=1309498&r2=1309499&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/README.maven Wed Apr  4 17:41:08 2012
@@ -73,7 +73,11 @@ D. How to use Maven to build Lucene/Solr
 
          svn update
          ant get-maven-poms
-         mvn -N -Pbootstrap install
+         mvn -N -Pbootstrap install [ -Divy.default.ivy.user.dir=... ]
+
+         If your ivy user directory is not in the default location, you can
+         specify it via -Divy.default.ivy.user.dir=... -- otherwise you don't
+         need to give this property setting.
 
    The details, followed by some example Maven commands:
 
@@ -105,7 +109,11 @@ D. How to use Maven to build Lucene/Solr
       are not available from public Maven repositories (a.k.a. "non-mavenized
       dependencies"):
 
-         mvn -N -Pbootstrap install
+         mvn -N -Pbootstrap install [ -Divy.default.ivy.user.dir=... ]
+
+         If your ivy user directory is not in the default location, you can
+         specify it via -Divy.default.ivy.user.dir=... -- otherwise you don't
+         need to give this property setting.
 
       Note that you will need to do this whenever changes to the non-Mavenized
       dependencies are committed.  It's a good idea to follow every

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=1309499&r1=1309498&r2=1309499&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 17:41:08 2012
@@ -417,7 +417,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.6</version>
+          <version>1.7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -659,6 +659,33 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>install</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Retrieve the patched jetty and jetty-util jars via ivy -->
+                    <ant antfile="solr/example/build.xml" target="resolve" inheritall="false">
+                      <property name="ivy.default.ivy.user.dir" value="${ivy.default.ivy.user.dir}"/>
+                    </ant>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.ivy</groupId>
+                <artifactId>ivy</artifactId>
+                <version>2.2.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-install-plugin</artifactId>
             <executions>
               <execution>