Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1421411 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2012-12-13 18:12:23 +00:00
parent acbe23061b
commit 68974170ae
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -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
----------------------

17
solr/build.xml
View File

@ -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>