--- batik-1.7/build.xml.orig	2008-01-06 11:11:30.000000000 +0100
+++ batik-1.7/build.xml	2008-05-05 15:18:02.000000000 +0200
@@ -124,7 +124,6 @@
     <property name="test-resources"     value="test-resources"/>
   
     <!-- For site deployment -->
-    <property name="deploy.svn.url"     value="https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/batik"/>
     <property name="build.site-dir"     value="${site}"/>
   
     <pathconvert property="cwd">
@@ -387,7 +386,7 @@
     </zip>
   </target>
 
-  <target name="src-zip" depends="init, record-svn-revision">
+  <target name="src-zip" depends="init">
     <zip zipfile="${project}-src-${completeVersion}.zip">
       <zipfileset dir="." prefix="${project}-${completeVersion}">
         <include name="LICENSE"/>
@@ -400,7 +399,6 @@
         <include name="build.sh"/>
         <include name="build.xml"/>
         <include name="forrest.properties"/>
-        <include name="svn-revision"/>
         <include name="contrib/**"/>
         <include name="lib/**"/>
         <include name="documentation-sources/**"/>
@@ -413,7 +411,6 @@
         <include name="test-sources/**"/>
       </zipfileset>
     </zip>
-    <delete file="svn-revision" failonerror="false"/>
   </target>
 
   <target name="dist-tgz" depends="build-tgz"/>
@@ -456,7 +453,7 @@
     </tar>
   </target>
 
-  <target name="src-tgz" depends="init, record-svn-revision">
+  <target name="src-tgz" depends="init">
     <tar tarfile="${project}-src-${completeVersion}.tar.gz" compression="gzip">
       <tarfileset dir="." prefix="${project}-${completeVersion}">
         <include name="LICENSE"/>
@@ -469,7 +466,6 @@
         <include name="build.sh"/>
         <include name="build.xml"/>
         <include name="forrest.properties"/>
-        <include name="svn-revision"/>
         <include name="contrib/**"/>
         <include name="documentation-sources/**"/>
         <include name="lib/**"/>
@@ -482,7 +478,6 @@
         <include name="test-sources/**"/>
       </tarfileset>
     </tar>
-    <delete file="svn-revision" failonerror="false"/>
   </target>
 
   <target name="dmg" depends="appbundle">
@@ -491,7 +486,7 @@
     </exec>
   </target>
 
-  <target name="appbundle" depends="init, jars, determine-svn-revision">
+  <target name="appbundle" depends="init, jars">
     <mkdir dir="${app}/Contents/MacOS"/>
     <mkdir dir="${app}/Contents/Resources"/>
     <echo file="${app}/Contents/Info.plist"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -501,9 +496,9 @@
   <key>CFBundleExecutable</key>
   <string>Squiggle</string>
   <key>CFBundleVersion</key>
-  <string>${completeVersion}${svn-revision-suffix}</string>
+  <string>${completeVersion}</string>
   <key>CFBundleShortVersionString</key>
-  <string>${completeVersion}${svn-revision-suffix}</string>
+  <string>${completeVersion}</string>
   <key>CFBundleIconFile</key>
   <string>Squiggle.icns</string>
   <key>CFBundleIdentifier</key>
@@ -556,11 +551,11 @@
     </copy>
   </target>
 
-  <target name="bundle-script" depends="init, determine-svn-revision">
+  <target name="bundle-script" depends="init">
     <copy file="${src}/make-squiggle-app.sh.template"
           tofile="${build}/lib/make-squiggle-app.sh">
       <filterset>
-        <filter token="VERSION" value="${completeVersion}${svn-revision-suffix}"/>
+        <filter token="VERSION" value="${completeVersion}"/>
         <filter token="YEAR" value="${year}"/>
       </filterset>
     </copy>
@@ -576,7 +571,7 @@
        with the relevant jar target (e.g. rasterizer-jar, squiggle-jar).  The
        commonality should be factored out.
        -->
-  <target name="maven-artifacts" depends="init, determine-svn-revision, jars">
+  <target name="maven-artifacts" depends="init, jars">
     <filter token="version" value="${completeVersion}"/>
 
     <!-- batik-rasterizer application artifact -->
@@ -589,7 +584,7 @@
     <jar jarfile="${maven}/batik-rasterizer/${completeVersion}/batik-rasterizer-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG rasterizer"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main"/>
@@ -614,7 +609,7 @@
     <jar jarfile="${maven}/batik-rasterizer-ext/${completeVersion}/batik-rasterizer-ext-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG rasterizer with extensions"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
@@ -632,7 +627,7 @@
     <jar jarfile="${maven}/batik-slideshow/${completeVersion}/batik-slideshow-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG slide show tool"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/>
@@ -657,7 +652,7 @@
     <jar jarfile="${maven}/batik-squiggle/${completeVersion}/batik-squiggle-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Squiggle SVG browser"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
@@ -684,7 +679,7 @@
     <jar jarfile="${maven}/batik-squiggle-ext/${completeVersion}/batik-squiggle-ext-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Squiggle SVG browser with extensions"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
@@ -702,7 +697,7 @@
     <jar jarfile="${maven}/batik-svgpp/${completeVersion}/batik-svgpp-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik XML pretty printer"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/>
@@ -723,7 +718,7 @@
     <jar jarfile="${maven}/batik-ttf2svg/${completeVersion}/batik-ttf2svg-${completeVersion}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik TrueType to SVG Font converter"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/>
@@ -938,65 +933,6 @@
   </target>
 
 
-  <target name="record-svn-revision" depends="determine-svn-revision"
-          if="svn-revision-determined">
-    <echo message="${svn-revision-number}" file="svn-revision"/>
-  </target>
-
-  <target name="determine-svn-revision"
-          depends="determine-svn-revision-svn-info,
-                   determine-svn-revision-transform,
-                   determine-svn-revision-from-file,
-                   determine-svn-revision-set"/>
-
-  <target name="determine-svn-revision-svn-info" depends="init">
-    <dirset id="dirs" dir="${src}/${package-prefix}">
-      <include name="**"/>
-    </dirset>
-    <pathconvert refid="dirs" pathsep=" " property="svn-info-dirs"/>
-    <exec executable="svn" output="svn-info.xml"
-          resultproperty="svn-info-result" failifexecutionfails="false">
-      <arg line="info --xml . ${svn-info-dirs}"/>
-    </exec>
-    <condition property="should-transform-svn-info">
-      <equals arg1="${svn-info-result}" arg2="0"/>
-    </condition>
-  </target>
-
-  <target name="determine-svn-revision-transform" depends="init"
-          if="should-transform-svn-info">
-    <java fork="yes" classname="org.apache.xalan.xslt.Process"
-          outputproperty="svn-revision-number"
-          errorproperty="svn-revision-transform-error"
-          resultproperty="svn-revision-transform-result">
-      <classpath>
-        <path refid="libs-build-classpath"/>
-      </classpath>
-      <arg line="-in svn-info.xml -xsl ${lib}/build/svn-info-revision.xsl"/>
-    </java>
-    <condition property="svn-revision-determined">
-      <equals arg1="${svn-revision-transform-result}" arg2="0"/>
-    </condition>
-  </target>
-
-  <target name="determine-svn-revision-from-file"
-          unless="svn-revision-determined">
-    <loadfile property="svn-revision-number" srcFile="svn-revision"
-              failonerror="false"/>
-    <condition property="svn-revision-determined">
-      <not>
-        <equals arg1="${svn-revision-suffix-string}" arg2=""/>
-      </not>
-    </condition>
-  </target>
-
-  <target name="determine-svn-revision-set"
-          if="svn-revision-determined">
-    <property name="svn-revision-suffix" value="+r${svn-revision-number}"/>
-    <delete file="svn-info.xml" failonerror="false"/>
-  </target>
-
-
   <target name="compile-prepare" depends="init" unless="compile-prepare.done">
     <mkdir dir="${dest}"/>
     <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
@@ -1041,7 +977,7 @@
 
 
   <!-- Jars ............................................................... -->
-  <target name="prepare-build" depends="init, determine-svn-revision">
+  <target name="prepare-build" depends="init">
     <mkdir dir="${build}"/>
     <mkdir dir="${build}/docs"/>
     <mkdir dir="${build}/lib"/>
@@ -1089,7 +1025,7 @@
     <jar jarfile="${build}/lib/${project}-all.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik all-in-one JAR"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="${class-prefix}.apps.svgbrowser.Main"/>
@@ -1111,7 +1047,7 @@
     <jar jarfile="${build}/lib/${project}-libs.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik all-in-one minus external dependencies"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1135,7 +1071,7 @@
          manifest="${src}/${project}-bean.mf">
       <manifest>
         <attribute name="Implementation-Title" value="Batik JavaBean"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1177,7 +1113,7 @@
     <jar jarfile="${build}/lib/${project}-ext.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik external code"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1195,7 +1131,7 @@
     <jar jarfile="${build}/lib/${project}-util.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik utility library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1220,7 +1156,7 @@
     <jar jarfile="${build}/lib/${project}-awt-util.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik AWT utility library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1244,7 +1180,7 @@
     <jar jarfile="${build}/lib/${project}-codec.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik image codecs"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1273,7 +1209,7 @@
     <jar jarfile="${build}/lib/${project}-svggen.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG generator"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1292,7 +1228,7 @@
     <jar jarfile="${build}/lib/${project}-svggenfull.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG generator plus dependencies"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1316,7 +1252,7 @@
     <jar jarfile="${build}/lib/${project}-gui-util.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik GUI utility library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1336,7 +1272,7 @@
     <jar jarfile="${build}/lib/${project}-dom.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik DOM Level 3 implementation"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1364,7 +1300,7 @@
     <jar jarfile="${build}/lib/${project}-css.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik CSS engine"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1397,7 +1333,7 @@
     <jar jarfile="${build}/lib/${project}-svg-dom.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG DOM implementation"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1420,7 +1356,7 @@
     <jar jarfile="${build}/lib/${project}-gvt.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik GVT library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1440,7 +1376,7 @@
     <jar jarfile="${build}/lib/${project}-parser.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik parser library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1460,7 +1396,7 @@
     <jar jarfile="${build}/lib/${project}-script.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik script library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1481,7 +1417,7 @@
     <jar jarfile="${build}/lib/${project}-transcoder.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik transcoder"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1500,7 +1436,7 @@
     <jar jarfile="${build}/lib/${project}-xml.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik XML utility library"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1519,7 +1455,7 @@
     <jar jarfile="${build}/lib/${project}-bridge.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik bridge"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1539,7 +1475,7 @@
     <jar jarfile="${build}/lib/${project}-swing.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Swing components"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1558,7 +1494,7 @@
     <jar jarfile="${build}/lib/${project}-anim.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik animation"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1579,7 +1515,7 @@
     <jar jarfile="${build}/lib/${project}-extension.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik extensions"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1603,7 +1539,7 @@
          jarfile="${build}/${project}-svgpp.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik XML pretty printer"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1623,7 +1559,7 @@
          jarfile="${build}/${project}-slideshow.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG slide show tool"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1648,7 +1584,7 @@
          jarfile="${build}/${project}-squiggle.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Squiggle SVG browser"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1674,7 +1610,7 @@
           jarfile="${build}/extensions/${project}-squiggle-ext.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Squiggle SVG browser with extensions"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1698,7 +1634,7 @@
          jarfile="${build}/${project}-rasterizer.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG rasterizer"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1722,7 +1658,7 @@
           jarfile="${build}/extensions/${project}-rasterizer-ext.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik SVG rasterizer with extensions"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1739,7 +1675,7 @@
          jarfile="${build}/${project}-ttf2svg.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik TrueType to SVG Font converter"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1755,7 +1691,7 @@
     <jar manifest="${src}/${project}.mf" jarfile="${build}/${project}.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1770,7 +1706,7 @@
     <jar jarfile="regard.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik Regard regression testing tool"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -1794,7 +1730,7 @@
     <jar jarfile="imageCodecs.jar">
       <manifest>
         <attribute name="Implementation-Title" value="Batik image codecs"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
       </manifest>
@@ -2119,10 +2055,6 @@
   <target name="prepare-publish" depends="init">
     <mkdir dir="${site}"/>
     <mkdir dir="${forrest-build}"/>
-    <exec executable="svn" dir="${site}" output="${forrest-build}/publish.info"
-          failonerror="false">
-      <arg value="info"/>
-    </exec>
     <loadfile srcfile="${forrest-build}/publish.info" property="publish.info">
       <filterchain>
         <linecontains>
@@ -2135,44 +2067,16 @@
       </filterchain>
     </loadfile>
     <delete file="${forrest-build}/publish.info"/>
-    <condition property="publish-checkout-task" value="prepare-publish-up" else="prepare-publish-co">
-      <equals arg1="${publish.info}" arg2="${deploy.svn.url}"/>
-    </condition>
     <antcall target="${publish-checkout-task}"/>
   </target>
 
   <target name="prepare-publish-up">
-    <exec executable="svn" dir="${site}" failonerror="true">
-      <arg value="update"/>
-    </exec>
   </target>
 
   <target name="prepare-publish-co">
-    <exec executable="svn" dir="." failonerror="true">
-      <arg value="checkout"/>
-      <arg value="${deploy.svn.url}"/>
-      <arg value="${site}"/>
-    </exec>
   </target>
 
   <target name="do-publish" depends="init">
-    <property name="deploy.svn.svn-filestoadd" location="${forrest-build}/publish.toadd"/>
-    <exec executable="svn" dir="${site}" output="${deploy.svn.svn-filestoadd}"
-          failonerror="true">
-      <arg value="status"/>
-    </exec>
-    <replace file="${deploy.svn.svn-filestoadd}" token="?      " value=""/>
-    <replace file="${deploy.svn.svn-filestoadd}" token="M      " value=""/>
-    <exec executable="svn" dir="${site}" failonerror="true">
-      <arg value="add"/>
-      <arg value="--targets"/>
-      <arg value="${deploy.svn.svn-filestoadd}"/>
-    </exec>
-    <exec executable="svn" dir="${site}" failonerror="true">
-      <arg value="commit"/>
-      <arg value="-m"/>
-      <arg value="Automatic publish"/>
-    </exec>
     <delete file="${forrest-build}/publish.toadd}"/>
   </target>