bodewig 2004/06/02 05:10:59
Modified: . Tag: ANT_16_BRANCH WHATSNEW build.xml
Log:
merge
Revision Changes Path
No revision
No revision
1.503.2.94 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.93
retrieving revision 1.503.2.94
diff -u -r1.503.2.93 -r1.503.2.94
--- WHATSNEW 31 May 2004 08:24:30 -0000 1.503.2.93
+++ WHATSNEW 2 Jun 2004 12:10:58 -0000 1.503.2.94
@@ -7,6 +7,10 @@
* 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:
-----------
1.392.2.29 +1 -7 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.28
retrieving revision 1.392.2.29
diff -u -r1.392.2.28 -r1.392.2.29
--- build.xml 25 May 2004 11:37:02 -0000 1.392.2.28
+++ build.xml 2 Jun 2004 12:10:59 -0000 1.392.2.29
@@ -171,6 +171,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*"/>
@@ -186,10 +187,6 @@
</or>
</selector>
- <selector id="needs.xalan2">
- <filename name="${optional.package}/junit/Xalan2Executor*"/>
- </selector>
-
<selector id="needs.xslp">
<filename name="${optional.package}/XslpLiaison*"/>
</selector>
@@ -641,7 +638,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"/>
@@ -819,7 +815,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"/>
@@ -867,7 +862,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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
