You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/04/26 16:55:46 UTC
svn commit: r1476239 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/build.xml solr/webapp/ solr/webapp/build.xml
Author: sarowe
Date: Fri Apr 26 14:55:44 2013
New Revision: 1476239
URL: http://svn.apache.org/r1476239
Log:
SOLR-4768: The Solr war produced by generate-maven-artifacts should not contain logging jars (merged trunk r1476237)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1476239&r1=1476238&r2=1476239&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Fri Apr 26 14:55:44 2013
@@ -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>
Modified: lucene/dev/branches/branch_4x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/build.xml?rev=1476239&r1=1476238&r2=1476239&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/build.xml Fri Apr 26 14:55:44 2013
@@ -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">