From 18c22df8de8c16c80aa0d7a81495f4f6c2280fed Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Fri, 26 Apr 2013 14:53:24 +0000
Subject: [PATCH] SOLR-4768: The Solr war produced by generate-maven-artifacts
 should not contain logging jars

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1476237 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/build.xml        | 1 -
 solr/webapp/build.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/solr/build.xml b/solr/build.xml
index 0862d575d31..f72e50fbac3 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -353,7 +353,6 @@
   <target name="dist-war"
           description="Creates the Solr WAR Distribution file.">
     <ant dir="webapp" target="dist" inheritall="false">
-      <property name="exclude.from.war" value="*slf4j*,log4j-*" />
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 695a6cff29a..20ee0729730 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -20,7 +20,7 @@
 
   <import file="../common-build.xml"/>
 
-	<property name="exclude.from.war" value="" />
+  <property name="exclude.from.war" value="*slf4j*,log4j-*" />
   <property name="solr.war.suffix" value="" />
 	
   <target name="test" depends="compile-test-solr-core">