From dd5dfe2ceb9655165a1553926dadb23d50c2a8cf Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 2 Jun 2004 12:09:45 +0000
Subject: [PATCH] Xalan2Executor doesn't need Xalan-J 2

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276502 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW  | 4 ++++
 build.xml | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 19a542ee9..444cedc53 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -37,6 +37,10 @@ Changes that could break older environments:
 * The import task used the canonical version of a file path. This
   has been changed to use the absolute path. Bugzilla 28505.
 
+* ant-xalan2.jar has been removed since the only class contained in it
+  didn't depend on Xalan-J 2 at all.  Its sole dependency has always
+  been TraX and so it has been merged into ant-trax.jar.
+
 Fixed bugs:
 -----------
 
diff --git a/build.xml b/build.xml
index 509e9f5bb..783bcb47b 100644
--- a/build.xml
+++ b/build.xml
@@ -172,6 +172,7 @@
   <!-- depends on external libraries -->
   <selector id="needs.trax">
     <or>
+      <filename name="${optional.package}/junit/Xalan2Executor*"/>
       <filename name="${optional.package}/TraXLiaison*"/>
       <filename name="${optional.package}/sitraka/**"/>
       <filename name="${optional.package}/metamata/MMetrics*"/>
@@ -187,10 +188,6 @@
     </or>
   </selector>
 
-  <selector id="needs.xalan2">
-    <filename name="${optional.package}/junit/Xalan2Executor*"/>
-  </selector>
-
   <selector id="needs.xslp">
     <filename name="${optional.package}/XslpLiaison*"/>
   </selector>
@@ -642,7 +639,6 @@
 
             <selector refid="needs.trax" unless="trax.present"/>
             <selector refid="needs.xalan1" unless="xalan.present"/>
-            <selector refid="needs.xalan2" unless="xalan2.present"/>
             <selector refid="needs.xslp" unless="xslp.present"/>
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
             <selector refid="needs.junit" unless="junit.present"/>
@@ -820,7 +816,6 @@
           <or>
             <selector refid="needs.trax"/>
             <selector refid="needs.xalan1"/>
-            <selector refid="needs.xalan2"/>
             <selector refid="needs.xslp"/>
             <selector refid="needs.apache-resolver"/>
             <selector refid="needs.junit"/>
@@ -868,7 +863,6 @@
 
     <optional-jar dep="trax"/>
     <optional-jar dep="xalan1"/>
-    <optional-jar dep="xalan2"/>
     <optional-jar dep="xslp"/>
     <optional-jar dep="apache-resolver"/>
     <optional-jar dep="junit"/>