--- ant/api.xml.sav	2006-07-28 10:08:43.000000000 +0200
+++ ant/api.xml	2007-05-29 15:30:54.000000000 +0200
@@ -25,7 +25,7 @@
     </target>
    
     <path id="api.class.path">
-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
+        <pathelement location="${preqs}/xml-commons-jaxp-1.3-apis.jar"/>
     </path>
 
     <target name="API.compile" depends="init">
--- ant/jm.xml.sav	2006-07-28 10:08:43.000000000 +0200
+++ ant/jm.xml	2007-05-29 15:31:58.000000000 +0200
@@ -34,7 +34,7 @@
       <pathelement location="${dist}/jaxmejs-${version}.jar"/>
       <pathelement location="${dist}/jaxmexs-${version}.jar"/>
       <pathelement location="${preqs}/ant.jar"/>
-      <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
+      <pathelement location="${preqs}/xml-commons-jaxp-1.3-apis.jar"/>
       <pathelement location="${preqs}/beaver.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
     </path>
--- ant/pm.xml.sav	2006-07-28 10:08:43.000000000 +0200
+++ ant/pm.xml	2007-05-29 15:33:05.000000000 +0200
@@ -37,11 +37,11 @@
         <pathelement location="${dist}/jaxmexs-${version}.jar"/>
         <pathelement location="${dist}/jaxme2-${version}.jar"/>
         <pathelement location="${preqs}/beaver.jar"/>   
-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+        <pathelement location="${preqs}/hsqldb.jar"/>
         <pathelement location="${preqs}/ant.jar"/>
-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
-        <pathelement location="${preqs}/xercesImpl.jar"/>
-        <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
+        <pathelement location="${preqs}/xml-commons-jaxp-1.3-apis.jar"/>
+        <pathelement location="${preqs}/xerces-j2.jar"/>
+        <pathelement location="${preqs}/xmldb-api.jar"/>
         <!-- These aren't in the CVS and aren't necessary for the build -->
         <pathelement location="${preqs}/TaminoAPI4J.jar"/>
         <pathelement location="${preqs}/TaminoJCA.jar"/>
--- ant/xs.xml.sav	2006-07-28 10:08:43.000000000 +0200
+++ ant/xs.xml	2007-05-29 15:33:33.000000000 +0200
@@ -23,7 +23,7 @@
     <property name="src.xs" location="${basedir}/src/xs"/>
 
     <path id="xs.class.path">
-        <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
+        <pathelement location="${preqs}/xml-commons-jaxp-1.3-apis.jar"/>
         <pathelement location="${preqs}/junit.jar"/>
         <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
     </path>
@@ -48,7 +48,7 @@
         <path id="xs.test.path">
             <path refid="xs.class.path"/>
             <pathelement location="${dist}/jaxmexs-${version}.jar"/>
-            <pathelement location="${preqs}/xercesImpl.jar"/>
+            <pathelement location="${preqs}/xerces-j2.jar"/>
         </path>
         <runtests reportsdir="${build.xs.reports}" classpathref="xs.test.path">
             <tests>
--- ant/js.xml.sav	2006-08-23 09:17:28.000000000 +0200
+++ ant/js.xml	2007-05-29 15:34:18.000000000 +0200
@@ -35,8 +35,8 @@
     <property name="src.js" location="${basedir}/src/js"/>
 
     <path id="js.class.path">
-      <pathelement location="${preqs}/log4j-1.2.8.jar"/>
-      <pathelement location="${preqs}/ant-1.5.4.jar"/>
+      <pathelement location="${preqs}/log4j.jar"/>
+      <pathelement location="${preqs}/ant.jar"/>
       <pathelement location="${preqs}/junit.jar"/>
       <pathelement location="${preqs}/antlr.jar"/>
       <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
@@ -44,7 +44,7 @@
 
     <path id="js.test.path">
         <path refid="js.class.path"/>
-        <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
+        <pathelement location="${preqs}/hsqldb.jar"/>
         <pathelement location="${dist}/jaxmejs-${version}.jar"/>
         <pathelement location="${build.js.test.classes}"/>
     </path>
@@ -132,6 +132,7 @@
     </target>
 
     <target name="JS.generate.version" depends="JS.generate.db">
+        
         <versionGenerator
                    driver="${jdbc.driver}"
                       url="${jdbc.url}"