SOLR-4768: The Solr war produced by generate-maven-artifacts should not contain logging jars (merged trunk r1476237)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_3@1476353 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/build.xml b/solr/build.xml
index 3b73da7..ad4e65f 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 695a6cf..20ee072 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">
