diff --git a/core/pom.xml b/core/pom.xml index 81b6498a8d7..8782a9ee95e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -44,10 +44,44 @@ - org.elasticsearch - elasticsearch-lucene - ${elasticsearch.version} - pom + org.apache.lucene + lucene-core + + + org.apache.lucene + lucene-backward-codecs + + + org.apache.lucene + lucene-analyzers-common + + + org.apache.lucene + lucene-queries + + + org.apache.lucene + lucene-memory + + + org.apache.lucene + lucene-highlighter + + + org.apache.lucene + lucene-queryparser + + + org.apache.lucene + lucene-suggest + + + org.apache.lucene + lucene-join + + + org.apache.lucene + lucene-spatial org.apache.lucene diff --git a/distribution/shaded/pom.xml b/distribution/shaded/pom.xml index 2302d1db2a6..7024504a7ec 100644 --- a/distribution/shaded/pom.xml +++ b/distribution/shaded/pom.xml @@ -77,7 +77,6 @@ ${project.build.directory}/dependency-reduced-pom.xml - org.elasticsearch:elasticsearch-lucene org.apache.lucene:* com.spatial4j:* diff --git a/lucene/pom.xml b/lucene/pom.xml deleted file mode 100644 index c2e4b8975d1..00000000000 --- a/lucene/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - elasticsearch-parent - org.elasticsearch - 2.0.0-SNAPSHOT - - 4.0.0 - - elasticsearch-lucene - Lucene dependencies for elasticsearch - pom - - - true - - - - - org.apache.lucene - lucene-core - - - org.apache.lucene - lucene-backward-codecs - - - org.apache.lucene - lucene-analyzers-common - - - org.apache.lucene - lucene-queries - - - org.apache.lucene - lucene-memory - - - org.apache.lucene - lucene-highlighter - - - org.apache.lucene - lucene-queryparser - - - org.apache.lucene - lucene-suggest - - - org.apache.lucene - lucene-join - - - org.apache.lucene - lucene-spatial - - - diff --git a/pom.xml b/pom.xml index 8fc826bc7e5..a66f5ba5b43 100644 --- a/pom.xml +++ b/pom.xml @@ -1487,7 +1487,6 @@ org.eclipse.jdt.ui.text.custom_code_templates= dev-tools rest-api-spec - lucene core distribution plugins diff --git a/qa/smoke-test-shaded/pom.xml b/qa/smoke-test-shaded/pom.xml index d0bb0ede85f..711259e6dba 100644 --- a/qa/smoke-test-shaded/pom.xml +++ b/qa/smoke-test-shaded/pom.xml @@ -24,18 +24,6 @@ org.elasticsearch.distribution.shaded elasticsearch ${elasticsearch.version} - - - org.elasticsearch - elasticsearch - - - - - org.elasticsearch - elasticsearch-lucene - ${elasticsearch.version} - pom org.hamcrest