From 18bcf7fc8252e6b6083147fa18b730c68bd4e0ab Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Tue, 26 Nov 2013 15:55:10 +0000 Subject: [PATCH] Fix improperly named module solr-extraction -> solr-cell git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1545699 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/maven/solr/contrib/extraction/pom.xml.template | 8 ++++---- .../lucene/dependencies/GetMavenDependenciesTask.java | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dev-tools/maven/solr/contrib/extraction/pom.xml.template b/dev-tools/maven/solr/contrib/extraction/pom.xml.template index c2bb94d937c..51b1ae99692 100644 --- a/dev-tools/maven/solr/contrib/extraction/pom.xml.template +++ b/dev-tools/maven/solr/contrib/extraction/pom.xml.template @@ -58,10 +58,10 @@ solr-test-framework test -@solr-extraction.internal.dependencies@ -@solr-extraction.external.dependencies@ -@solr-extraction.internal.test.dependencies@ -@solr-extraction.external.test.dependencies@ +@solr-cell.internal.dependencies@ +@solr-cell.external.dependencies@ +@solr-cell.internal.test.dependencies@ +@solr-cell.external.test.dependencies@ ${module-path}/src/java diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java index 17c88d2074b..e4988201ec0 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java @@ -622,16 +622,13 @@ public class GetMavenDependenciesTask extends Task { /** * Convert Ant project names to artifact names: prepend "lucene-" - * to Lucene project names; and "solr-cell" -> "solr-extraction" + * to Lucene project names */ private String antProjectToArtifactName(String origModule) { String module = origModule; if ( ! origModule.startsWith("solr-")) { // lucene modules names don't have "lucene-" prepended module = "lucene-" + module; } - if (module.equals("solr-cell")) { - module = "solr-extraction"; - } return module; }