Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get Maven compilation working again: example->server; don't need javax.servlet:javax.servlet-api test dep in solr/core/ivy.xml, since it's already included as a compile-scope dep via solr/server/ivy.xml 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1651545 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2015-01-14 00:46:43 +00:00
parent 7d94c58d62
commit f24fa71a5d
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
View File

@ -75,7 +75,7 @@ import javax.xml.xpath.XPathFactory;
*/
public class GetMavenDependenciesTask extends Task {
private static final Pattern PROPERTY_PREFIX_FROM_IVY_XML_FILE_PATTERN = Pattern.compile
("[/\\\\](lucene|solr)[/\\\\](?:(?:contrib|(analysis)|(example))[/\\\\])?([^/\\\\]+)[/\\\\]ivy\\.xml");
("[/\\\\](lucene|solr)[/\\\\](?:(?:contrib|(analysis)|(example)|(server))[/\\\\])?([^/\\\\]+)[/\\\\]ivy\\.xml");
private static final Pattern COORDINATE_KEY_PATTERN = Pattern.compile("/([^/]+)/([^/]+)");
private static final Pattern MODULE_DEPENDENCIES_COORDINATE_KEY_PATTERN
= Pattern.compile("(.*?)(\\.test)?\\.dependencies");
@ -251,7 +251,7 @@ public class GetMavenDependenciesTask extends Task {
}
/**
* For each module that include other modules' external dependencies via
* For each module that includes other modules' external dependencies via
* including all files under their ".../lib/" dirs in their (test.)classpath,
* add the other modules' dependencies to its set of external dependencies.
*/
@ -320,6 +320,7 @@ public class GetMavenDependenciesTask extends Task {
if (globalOptionalExternalDependencies.contains(dependencyCoordinate)
|| (perModuleOptionalExternalDependencies.containsKey(module)
&& perModuleOptionalExternalDependencies.get(module).contains(dependencyCoordinate))) {
// make a copy of the dep and set optional=true
dep = new ExternalDependency(dep.groupId, dep.artifactId, dep.classifier, dep.isTestDependency, true);
}
deps.add(dep);
@ -681,7 +682,7 @@ public class GetMavenDependenciesTask extends Task {
String module = getModuleName(ivyXmlFile);
log("Collecting external dependencies from: " + ivyXmlFile.getPath(), verboseLevel);
Document document = documentBuilder.parse(ivyXmlFile);
// Exclude the 'start' configuration in solr/example/ivy.xml
// Exclude the 'start' configuration in solr/server/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) {
@ -813,12 +814,13 @@ public class GetMavenDependenciesTask extends Task {
builder.append(matcher.group(1));
if (null != matcher.group(2)) { // "lucene/analysis/..."
builder.append("-analyzers");
}
if (null != matcher.group(3)) { // "solr/example/..."
} else if (null != matcher.group(3)) { // "solr/example/..."
builder.append("-example");
} else if (null != matcher.group(4)) { // "solr/server/..."
builder.append("-server");
}
builder.append('-');
builder.append(matcher.group(4));
builder.append(matcher.group(5));
return builder.toString().replace("solr-solr-", "solr-");
}

1
solr/core/ivy.xml
View File

@ -47,7 +47,6 @@
<dependency org="log4j" name="log4j" rev="${/log4j/log4j}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}" conf="compile"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="test"/>
<dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test"/>
<dependency org="cglib" name="cglib-nodep" rev="${/cglib/cglib-nodep}" conf="test"/>
<dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test"/>

2
solr/server/ivy.xml
View File

@ -17,7 +17,7 @@
under the License.
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="example"/>
<info organisation="org.apache.solr" module="server"/>
<configurations defaultconfmapping="jetty->master;start->master;servlet->master;logging->master">
<conf name="jetty" description="jetty jars" transitive="false"/>
<conf name="start" description="jetty start jar" transitive="false"/>