You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/04/18 20:08:48 UTC
svn commit: r1327600 - in /lucene/dev/trunk/dev-tools/maven/solr: core/pom.xml.template solrj/pom.xml.template webapp/pom.xml.template

Author: ryan
Date: Wed Apr 18 18:08:48 2012
New Revision: 1327600

URL: http://svn.apache.org/viewvc?rev=1327600&view=rev
Log:
SOLR-3358: make log4j-over-slf4j optional maven dependency

Modified:
    lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template

Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1327600&r1=1327599&r2=1327600&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Wed Apr 18 18:08:48 2012
@@ -60,12 +60,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion> <!-- log4j-over-slf4j clashes with log4j -->
-          <groupId>org.slf4j</groupId>
-          <artifactId>log4j-over-slf4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>

Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template?rev=1327600&r1=1327599&r2=1327600&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template Wed Apr 18 18:08:48 2012
@@ -77,14 +77,16 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
+      <optional>true</optional>  <!-- let the end user decide... they may be using log4j directly! -->
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template?rev=1327600&r1=1327599&r2=1327600&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template Wed Apr 18 18:08:48 2012
@@ -67,6 +67,14 @@
       <artifactId>slf4j-jdk14</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>