From 33c3778360032888474f29b1ebeda950cc214bc3 Mon Sep 17 00:00:00 2001
From: Shawn Heisey <elyograg@apache.org>
Date: Thu, 28 Mar 2013 21:24:29 +0000
Subject: [PATCH] SOLR-4651: remove dist-excl-slf4j build target

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1462306 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt |  6 ++++++
 solr/build.xml   | 13 +------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5d6754ccd56..1ba8799a597 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -64,6 +64,10 @@ Upgrading from Solr 4.2.0
   folder with those necessary for the logging impl you would like. For more 
   details, see the Slf4j documentation.
 
+* SOLR-4651: The dist-excl-slf4j build target no longer exists.  SOLR-3706
+  eliminated the dist-war-excl-slf4j target and made dist-excl-slf4j
+  redundant.
+
 Detailed Change List
 ----------------------
 
@@ -134,6 +138,8 @@ Other Changes
   
 * SOLR-3706: Ship setup to log with log4j. (ryan, Mark Miller)
 
+* SOLR-4651: Remove dist-excl-slf4j build target. (Shawn Heisey)
+
 ==================  4.2.1 ==================
 
 Versions of Major Components
diff --git a/solr/build.xml b/solr/build.xml
index 6f3748bc1e3..74049d5bebf 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -338,18 +338,7 @@
   
   <target name="dist"
           description="Creates the Solr distribution files."
-          depends="-dist-common, dist-war" />
- 
-  <target name="dist-excl-slf4j"
-          description="Creates the Solr distribution files without slf4j API or bindings."
-          depends="-dist-common" />
- 
-  <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>
+          depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, dist-war" />
  
   <target name="dist-test-framework" depends="init-dist"
           description="Creates the Solr test-framework JAR.">