--- build.xml	2010-02-07 17:59:19.000000000 +0100
+++ build.xml-gil	2011-02-28 01:28:17.000000000 +0100
@@ -37,7 +37,7 @@
       <property name="user-propfile" value="${user.home}/build.properties"/>
       <property file="${user-propfile}"/>
 
-      <property name="commons-pool.jar" value="${basedir}/../pool/dist/commons-pool.jar"/>
+      <property name="commons-pool.jar" value="${basedir}/pool/dist/commons-pool.jar"/>
 
       <!-- command line classpath, if any -->
       <property name="cp" value=""/>
@@ -230,22 +230,23 @@
 
    <target name="build-jar" depends="compile">
       <mkdir dir="${dist.dir}"/>
-      <jar jarfile="${dist.jar}">
-         <fileset dir="${build.classes.dir}"/>
+      <jar jarfile="${dist.jar}"
+           compress="true"
+           index="false" 
+           manifest="${build.classes.dir}/META-INF/MANIFEST.MF" 
+           excludes="**/*.html">
+          <fileset dir="${build.classes.dir}">
+             <include name="org/apache/commons/dbcp/**"/>
+             <include name="META-INF/LICENSE.txt"/>
+             <include name="META-INF/NOTICE.txt"/>
+             <include name="META-INF/maven/commons-dbcp/commons-dbcp/pom.properties"/>
+             <include name="META-INF/maven/commons-dbcp/commons-dbcp/pom.xml"/>
+          </fileset>
          <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
-         <manifest>
-            <attribute name="Built-By" value="${user.name}"/>
-            <attribute name="Package" value="${package}"/>
-            <attribute name="Extension-Name" value="${name}"/>
-            <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
-            <attribute name="Specification-Title" value="${title}"/>
-            <attribute name="Implementation-Version" value="${version}"/>
-            <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
-         </manifest>
       </jar>
    </target>
 
-   <target name="build" depends="clean,build-jar,javadoc">
+   <target name="build" depends="build-jar,javadoc">
       <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/>
       <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/>
       <copy todir="${dist.dir}" file="${basedir}/README.txt"/>