merged with excelant branch

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1073707 13f79535-47bb-0310-9956-ffa450edef68

diff --cc build.xml
index 30ed785a704ae7b83a24db8bf16515d6f1fe0ed6,50e17a6e5e33d69d7ab541301d42db8b17edcf15..072fb36823a9444d854542e521430eeb75517156
--- 1/build.xml
--- 2/build.xml
+++ b/build.xml
@@@ -906,10 -1017,14 +1016,14 @@@ under the License
  
          <zip destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.zip">
              <zipfileset dir="legal/" prefix="${zipdir}"/>
-             <zipfileset dir="${main.lib}" prefix="${zipdir}/lib" includes="*.jar"/>
+             <zipfileset dir="${main.lib}" prefix="${zipdir}/lib">
+               <include name="commons-logging-*.jar"/>
+               <include name="junit-*.jar"/>
+               <include name="log4j-*.jar"/>
+             </zipfileset>
              <zipfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib">
                <include name="dom4j-*.jar"/>
 -              <include name="geronimo-stax-*.jar"/>
 +              <include name="stax-api-*.jar"/>
                <include name="xmlbeans-*.jar"/>
              </zipfileset>
              <zipfileset dir="${dist.dir}" prefix="${zipdir}">
@@@ -930,10 -1045,14 +1044,14 @@@
                 longfile="gnu"
                 compression="gzip">
              <tarfileset dir="legal/" prefix="${zipdir}"/>
-             <tarfileset dir="${main.lib}" prefix="${zipdir}/lib" includes="*.jar"/>
+             <zipfileset dir="${main.lib}" prefix="${zipdir}/lib">
+               <include name="commons-logging-*.jar"/>
+               <include name="junit-*.jar"/>
+               <include name="log4j-*.jar"/>
+             </zipfileset>
              <tarfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib">
                <include name="dom4j-*.jar"/>
 -              <include name="geronimo-stax-*.jar"/>
 +              <include name="stax-api-*.jar"/>
                <include name="xmlbeans-*.jar"/>
              </tarfileset>
              <tarfileset dir="${build.site}" prefix="${zipdir}/docs"/>

diff --cc maven/poi-excelant.pom
index 0000000000000000000000000000000000000000,12b2b15a11a0116baa3b01c3854bd345a0af36ad..6b23e4a122040d7b383bcc6e4c9c3a4f38b52f55
mode 000000,100755..100755
--- /dev/null
--- 2/maven/poi-excelant.pom
+++ b/maven/poi-excelant.pom
@@@ -1,0 -1,73 +1,78 @@@
+ <?xml version="1.0"?>
+ <!--
+ 
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ -->
+ 
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+       <modelVersion>4.0.0</modelVersion>
+       <groupId>org.apache.poi</groupId>
+       <artifactId>poi-excelant</artifactId>
+       <version>@VERSION@</version>
+       <packaging>jar</packaging>
+       <name>Apache POI</name>
+       <url>http://poi.apache.org/</url>
+       <description>Apache POI Excel Ant Tasks</description>
+ 
+   <mailingLists>
+     <mailingList>
+       <name>POI Users List</name>
+       <subscribe>user-subscribe@poi.apache.org</subscribe>
+       <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+       <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+     </mailingList>
+     <mailingList>
+       <name>POI Developer List</name>
+       <subscribe>dev-subscribe@poi.apache.org</subscribe>
+       <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+       <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+     </mailingList>
+   </mailingLists>
+ 
+   <licenses>
+     <license>
+       <name>The Apache Software License, Version 2.0</name>
+       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+     </license>
+   </licenses>
+ 
+   <organization>
+     <name>Apache Software Foundation</name>
+     <url>http://www.apache.org/</url>
+   </organization>
+ 
+   <dependencies>
+     <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi</artifactId>
+        <version>@VERSION@</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.poi</groupId>
+       <artifactId>poi-ooxml</artifactId>
+       <version>@VERSION@</version>
+     </dependency>
++    <dependency>
++      <groupId>org.apache.ant</groupId>
++      <artifactId>ant</artifactId>
++      <version>1.8.2</version>
++      </dependency> 
+   </dependencies>
+ </project>