svn commit: r1632830 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/tools/ lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

[sa...@apache.org]

Author: sarowe
Date: Sat Oct 18 19:02:02 2014
New Revision: 1632830

URL: http://svn.apache.org/r1632830
Log:
LUCENE-6007: 'mvndeps' Ant task: exclude the 'start' configuration (only the jetty-start jar at this point) when parsing solr/example/ivy.xml for dependencies (merged trunk r1632829)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/tools/   (props changed)
    lucene/dev/branches/branch_5x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

Modified: lucene/dev/branches/branch_5x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java?rev=1632830&r1=1632829&r2=1632830&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java (original)
+++ lucene/dev/branches/branch_5x/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java Sat Oct 18 19:02:02 2014
@@ -681,7 +681,8 @@ public class GetMavenDependenciesTask ex
     String module = getModuleName(ivyXmlFile);
     log("Collecting external dependencies from: " + ivyXmlFile.getPath(), verboseLevel);
     Document document = documentBuilder.parse(ivyXmlFile);
-    String dependencyPath = "/ivy-module/dependencies/dependency[not(starts-with(@conf,'start->'))]";
+    // Exclude the 'start' configuration in solr/example/ivy.xml
+    String dependencyPath = "/ivy-module/dependencies/dependency[not(starts-with(@conf,'start'))]";
     NodeList dependencies = (NodeList)xpath.evaluate(dependencyPath, document, XPathConstants.NODESET);
     for (int depNum = 0 ; depNum < dependencies.getLength() ; ++depNum) {
       Element dependency = (Element)dependencies.item(depNum);