SOLR-5920: Maven config: restrict conversion of module names containing 'analysis-' to 'analyzers-' to those not preceded by 'solr-'

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1584260 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2014-04-03 05:32:07 +00:00
parent 21b6d9890e
commit b790367aa6
1 changed files with 2 additions and 2 deletions

View File

@ -152,7 +152,7 @@ public class GetMavenDependenciesTask extends Task {
}
public void setVerbose(boolean verbose) {
verboseLevel = (verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
verboseLevel = (verbose ? Project.MSG_VERBOSE : Project.MSG_INFO);
}
public void setCentralizedVersionsFile(File file) {
@ -614,7 +614,7 @@ public class GetMavenDependenciesTask extends Task {
// Pattern.compile("(lucene|solr)/build/(.*)/classes/java");
String artifact = matcher.group(2);
artifact = artifact.replace('/', '-');
artifact = artifact.replace("analysis-", "analyzers-");
artifact = artifact.replace("(?<!solr-)analysis-", "analyzers-");
if ("lucene".equals(matcher.group(1))) {
artifactId.append("lucene-");
}