From 967ca29f765716c7f2f1b116de43d33ef084ae30 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 18 Apr 2012 18:08:48 +0000 Subject: [PATCH] SOLR-3358: make log4j-over-slf4j optional maven dependency git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327600 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/maven/solr/core/pom.xml.template | 6 ------ dev-tools/maven/solr/solrj/pom.xml.template | 10 ++++++---- dev-tools/maven/solr/webapp/pom.xml.template | 8 ++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev-tools/maven/solr/core/pom.xml.template b/dev-tools/maven/solr/core/pom.xml.template index 16d50923c59..c3273c98441 100644 --- a/dev-tools/maven/solr/core/pom.xml.template +++ b/dev-tools/maven/solr/core/pom.xml.template @@ -60,12 +60,6 @@ ${project.groupId} solr-solrj ${project.version} - - - org.slf4j - log4j-over-slf4j - - org.apache.lucene diff --git a/dev-tools/maven/solr/solrj/pom.xml.template b/dev-tools/maven/solr/solrj/pom.xml.template index 9066e341b83..81a4231abbd 100644 --- a/dev-tools/maven/solr/solrj/pom.xml.template +++ b/dev-tools/maven/solr/solrj/pom.xml.template @@ -77,14 +77,16 @@ org.slf4j log4j-over-slf4j - - - org.apache.httpcomponents - httpmime + true org.slf4j jcl-over-slf4j + true + + + org.apache.httpcomponents + httpmime commons-io diff --git a/dev-tools/maven/solr/webapp/pom.xml.template b/dev-tools/maven/solr/webapp/pom.xml.template index f6c82f643c9..7af6a9d17b6 100644 --- a/dev-tools/maven/solr/webapp/pom.xml.template +++ b/dev-tools/maven/solr/webapp/pom.xml.template @@ -67,6 +67,14 @@ slf4j-jdk14 runtime + + org.slf4j + log4j-over-slf4j + + + org.slf4j + jcl-over-slf4j + ${build-directory}