83c37e
diff --git a/common_build.xml b/common_build.xml
83c37e
index 239bfed..657d512 100644
83c37e
--- a/common_build.xml
83c37e
+++ b/common_build.xml
83c37e
@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE
83c37e
   
83c37e
             value="${build.cache.dir}/cobertura"
83c37e
             description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" />
83c37e
-  
83c37e
-            value="${build.cache.dir}/ant-contrib"
83c37e
-            description="Directory where the Ant-Contrib jar (and dependencies) is placed after it is auto-downloaded by the build" />
83c37e
   
83c37e
             value="${build.cache.dir}/pentaho"
83c37e
             description="Directory where the Pentaho ant tasks jar (and dependencies) is placed after it is auto-downloaded by the build" />
83c37e
@@ -325,68 +322,6 @@ TYPICAL TARGET SEQUENCE
83c37e
   </path>
83c37e
 
83c37e
 
83c37e
-  
83c37e
-	    install-antcontrib
83c37e
-	    
83c37e
-	    (Fetches and) installs ant-contrib tasks.
83c37e
-	    ====================================================================-->
83c37e
-  
83c37e
-          depends="antcontrib.download-check">
83c37e
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
83c37e
-      <classpath>
83c37e
-        <fileset dir="${antcontrib.build.cache.dir}">
83c37e
-          <include name="*.jar" />
83c37e
-        </fileset>
83c37e
-      </classpath>
83c37e
-    </taskdef>
83c37e
-  </target>
83c37e
-
83c37e
-
83c37e
-  
83c37e
-	    antcontrib.download-check
83c37e
-	    
83c37e
-	    Fetches ant-contrib from sourceforge if it is not already present
83c37e
-	    ====================================================================-->
83c37e
-  <target name="antcontrib.download-check">
83c37e
-    <condition property="antcontrib.available">
83c37e
-      <and>
83c37e
-        <available file="${antcontrib.build.cache.dir}" />
83c37e
-        <available classname="net.sf.antcontrib.logic.IfTask">
83c37e
-          <classpath>
83c37e
-            <fileset dir="${antcontrib.build.cache.dir}">
83c37e
-              <include name="*.jar" />
83c37e
-            </fileset>
83c37e
-          </classpath>
83c37e
-        </available>
83c37e
-      </and>
83c37e
-    </condition>
83c37e
-    <antcall target="antcontrib.download" />
83c37e
-  </target>
83c37e
-
83c37e
-
83c37e
-  
83c37e
-	    antcontrib.download
83c37e
-	    
83c37e
-	    Fetches ant-contrib from sourceforge
83c37e
-	    ====================================================================-->
83c37e
-  <target name="antcontrib.download" unless="antcontrib.available">
83c37e
-    <mkdir dir="${tmp.build.cache.dir}" />
83c37e
-    
83c37e
-         dest="${tmp.build.cache.dir}/antcontrib.zip"
83c37e
-         usetimestamp="true" />
83c37e
-    <unzip src="${tmp.build.cache.dir}/antcontrib.zip" dest="${tmp.build.cache.dir}">
83c37e
-      <patternset>
83c37e
-        <include name="**/*.jar" />
83c37e
-      </patternset>
83c37e
-    </unzip>
83c37e
-    <copy todir="${antcontrib.build.cache.dir}">
83c37e
-      <fileset dir="${tmp.build.cache.dir}/ant-contrib">
83c37e
-        <include name="**/*.jar" />
83c37e
-      </fileset>
83c37e
-    </copy>
83c37e
-  </target>
83c37e
-
83c37e
-
83c37e
   
83c37e
 	    init
83c37e
 	    
83c37e
@@ -445,7 +380,7 @@ TYPICAL TARGET SEQUENCE
83c37e
     (Fetches and) installs the SVN ANT for use by this ant script
83c37e
     ====================================================================-->
83c37e
   
83c37e
-          depends="install-antcontrib, svnant.download-check">
83c37e
+          depends="svnant.download-check">
83c37e
     <if>
83c37e
       <istrue value="${svnant.isinstalled}" />
83c37e
       <then>
83c37e
@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE
83c37e
   </target>
83c37e
 
83c37e
 
83c37e
-  
83c37e
-        set-build.id
83c37e
-    
83c37e
-        Sets a property build.id to the either "development" or the svn revision
83c37e
-        if in release mode
83c37e
-        ====================================================================-->
83c37e
-  <target name="set-build.id" unless="build.id" depends="install-antcontrib">
83c37e
-    <if>
83c37e
-      <istrue value="${release}" />
83c37e
-      <then>
83c37e
-        <antcallback target="svn-revision" return="svn.revision" />
83c37e
-        <property name="build.id" value="${svn.revision}" />
83c37e
-      </then>
83c37e
-      <else>
83c37e
-        <property name="build.id" value="development" />
83c37e
-      </else>
83c37e
-    </if>
83c37e
-  </target>
83c37e
-
83c37e
-  
83c37e
-       version-properties: common Ant driven version file generation.  Projects that produce
83c37e
-       a package or packages should run this target.  Projects that produce
83c37e
-       jars only should NOT.
83c37e
-   ===================================================================================-->
83c37e
-  <target name="version-properties" depends="set-build.id">
83c37e
-    <tstamp>
83c37e
-      <format property="build.time" pattern="yyyy/MM/dd hh:mm aa"/>
83c37e
-    </tstamp>
83c37e
-    
83c37e
-              file="version.properties" comment="Release Build version info">
83c37e
-      <entry key="release.major.number" value="${release.major.number}" />
83c37e
-      <entry key="release.minor.number" value="${release.minor.number}" />
83c37e
-      <entry key="release.milestone.number" value="${release.milestone.number}" />
83c37e
-      <entry key="release.candidate.token" value="${release.candidate.token}" />
83c37e
-      <entry key="impl.vendor" value="${impl.vendor}" />
83c37e
-      <entry key="impl.version" value="${release.major.number}.${release.minor.number}.${release.milestone.number}.${build.id}" />
83c37e
-      <entry key="impl.title" value="${impl.title}" />
83c37e
-      <entry key="buildDate" value="${build.time}"/>
83c37e
-      <entry key="svn.revision" value="${build.id}"/>
83c37e
-      <entry key="release.build.number" default="0" type="int" operation="+" value="1" pattern="0000"/>
83c37e
-    </propertyfile>
83c37e
-    <property file="${basedir}/version.properties"/>
83c37e
-  </target>
83c37e
-
83c37e
-
83c37e
   
83c37e
 	    install-ivy
83c37e
 	    
83c37e
 	    (Fetches and) installs the IVY jar for use by this ant script
83c37e
 	    ====================================================================-->
83c37e
   
83c37e
-          depends="install-antcontrib,ivy.download-check">
83c37e
+          depends="ivy.download-check">
83c37e
     <if>
83c37e
       <istrue value="${ivy.isinstalled}" />
83c37e
       <then>
83c37e
@@ -602,7 +492,7 @@ TYPICAL TARGET SEQUENCE
83c37e
 	    Verifies that there are no SNAPSHOT dependencies defined in the ivy xml.
83c37e
 	    If there are SNAPSHOTS, fail the release build.
83c37e
 	    ====================================================================-->
83c37e
-  <target name="ivy.check-releasable" depends="install-ivy, install-antcontrib">
83c37e
+  <target name="ivy.check-releasable" depends="install-ivy">
83c37e
     <if>
83c37e
       <istrue value="${release}" />
83c37e
       <then>
83c37e
@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE
83c37e
 	    Publishes the jar file for this project to a Maven2 repository.
83c37e
 	    ====================================================================-->
83c37e
   
83c37e
-          depends="install-antcontrib,create-pom,ivy.deliver">
83c37e
+          depends="create-pom,ivy.deliver">
83c37e
     <antcall target="maven-publish-dependencies">
83c37e
       <param name="publish.groupId" value="${ivy.artifact.group}" />
83c37e
       <param name="publish.artifactId" value="${ivy.artifact.id}" />
83c37e
@@ -1038,12 +928,11 @@ TYPICAL TARGET SEQUENCE
83c37e
 	      - compile.pre      : anything needed to prep for compile
83c37e
 	      - compile.compile  : the actual compilation step
83c37e
 	      - compile.src_copy : copying the source into the bin directory
83c37e
-	      - compile.res_copy : copying the resources into the bin directory
83c37e
 	      - compile.lic_copy : copying the license information into the bin directory
83c37e
 	      - compile.post     : anything needed after the compile is done 
83c37e
 	    ====================================================================-->
83c37e
   
83c37e
-          depends="init, compile.pre, compile.compile, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post"
83c37e
+          depends="init, compile.pre, compile.compile, compile.src_copy, compile.lic_copy, compile.post"
83c37e
           description="Performs all the steps to prepare the bin directory with a complete compilation" />
83c37e
 
83c37e
 
83c37e
@@ -1074,37 +963,6 @@ TYPICAL TARGET SEQUENCE
83c37e
     </javac>
83c37e
   </target>
83c37e
 
83c37e
-
83c37e
-  
83c37e
-	    compile.res_copy
83c37e
-	    
83c37e
-	    Copies any needed resources into the classes directory.  Will not
83c37e
-	    duplicate copying of resources from src tree (handled by compile.src_copy
83c37e
-	    if jar.include.source is set.
83c37e
-	    ====================================================================-->
83c37e
-  <target name="compile.res_copy" depends="install-antcontrib">
83c37e
-    <if>
83c37e
-      <available file="${res.dir}" />
83c37e
-      <then>
83c37e
-        <copy todir="${classes.dir}">
83c37e
-          <fileset dir="${res.dir}" />
83c37e
-        </copy>
83c37e
-      </then>
83c37e
-    </if>
83c37e
-
83c37e
-    <if>
83c37e
-      <not>
83c37e
-        <isset property="jar.include.source" />
83c37e
-      </not>
83c37e
-      <then>
83c37e
-        <copy todir="${classes.dir}" flatten="false">
83c37e
-          <fileset dir="${src.dir}" excludes="**/*.java" />
83c37e
-        </copy>
83c37e
-      </then>
83c37e
-    </if>
83c37e
-  </target>
83c37e
-
83c37e
-
83c37e
   
83c37e
 	    compile.src_copy
83c37e
 	    
83c37e
@@ -1151,7 +1009,7 @@ TYPICAL TARGET SEQUENCE
83c37e
 	    
83c37e
 	    Creates a jar file from the bin directory
83c37e
 	    ====================================================================-->
83c37e
-  <target name="jar" depends="compile,set-build.id,generate.manifest" description="Jars up the bin directory after a compile">
83c37e
+  <target name="jar" depends="compile,generate.manifest" description="Jars up the bin directory after a compile">
83c37e
     <jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}">
83c37e
       <fileset dir="${classes.dir}" />
83c37e
     </jar>
83c37e
@@ -1164,7 +1022,7 @@ TYPICAL TARGET SEQUENCE
83c37e
 	    Creates a new manifest file if one is not specified, or updates
83c37e
 	    an existing manifest file if one is specified.
83c37e
 	    ====================================================================-->
83c37e
-  <target name="generate.manifest" depends="init,set-build.id">
83c37e
+  <target name="generate.manifest" depends="init">
83c37e
     <delete file="${dist.manifest.file}" />
83c37e
     <touch file="${dist.manifest.file}" />
83c37e
     <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
83c37e
@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE
83c37e
     </dot-classpath>
83c37e
   </target>
83c37e
 
83c37e
-</project>
83c37e
\ No newline at end of file
83c37e
+</project>