You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/12/13 19:12:24 UTC
svn commit: r1421411 - in /lucene/dev/trunk/solr: CHANGES.txt build.xml
Author: hossman
Date: Thu Dec 13 18:12:23 2012
New Revision: 1421411
URL: http://svn.apache.org/viewvc?rev=1421411&view=rev
Log:
SOLR-3918: Fixed the 'dist-war-excl-slf4j' ant target to exclude all slf4j jars, so that the resulting war is usable as is provided the servlet container includes the correct slf4j api and impl jars.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/build.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1421411&r1=1421410&r2=1421411&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Dec 13 18:12:23 2012
@@ -350,6 +350,11 @@ Bug Fixes
* SOLR-4178: ReplicationHandler should abort any current pulls and wait for
it's executor to stop during core close. (Mark Miller)
+* SOLR-3918: Fixed the 'dist-war-excl-slf4j' ant target to exclude all
+ slf4j jars, so that the resulting war is usable as is provided the servlet
+ container includes the correct slf4j api and impl jars.
+ (Shawn Heisey, hossman)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1421411&r1=1421410&r2=1421411&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Thu Dec 13 18:12:23 2012
@@ -315,7 +315,18 @@
<target name="dist"
description="Creates the Solr distribution files."
- depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, dist-war" />
+ depends="-dist-common, dist-war" />
+
+ <target name="dist-excl-slf4j"
+ description="Creates the Solr distribution files without slf4j API or bindings."
+ depends="-dist-common, dist-war-excl-slf4j" />
+
+ <target name="-dist-common"
+ depends="dist-solrj, dist-core, dist-test-framework, dist-contrib">
+ <!-- Targets common to dist and dist-excl-slf4j.
+ Only usable as a dependency
+ -->
+ </target>
<target name="dist-test-framework" depends="init-dist"
description="Creates the Solr test-framework JAR.">
@@ -338,10 +349,10 @@
</target>
<target name="dist-war-excl-slf4j"
- description="Creates a Solr WAR Distribution file, excluding slf4j bindings.">
+ description="Creates a Solr WAR Distribution file, excluding slf4j API and bindings.">
<ant dir="webapp" target="dist" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
- <property name="exclude.from.war" value="*over-slf4j*,slf4j-jdk14*,log4j-*" />
+ <property name="exclude.from.war" value="*slf4j*,log4j-*" />
<property name="solr.war.suffix" value="-excl-slf4j" />
</ant>
</target>