Restore web.xml version stamping

diff --git a/build.xml b/build.xml
index 33555299f9c2f0deff05e65589e92c0135bdc6f8..485e9813de7e9d8be8f545ac5658c0c0806c3c25 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -267,7 +267,9 @@
                <prepareDataDirectory toDir="${webinf}/data" />\r
 \r
                <!-- Build the WAR web.xml from the prototype web.xml -->\r
-               <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />\r
+               <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">\r
+                       <replace token="@gb.version@" value="${project.version}" />\r
+               </mx:webxml>\r
 \r
                <!-- Gitblit jar -->\r
                <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">\r
@@ -377,8 +379,10 @@
                <!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->\r
                <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->\r
                <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"\r
-               propertiesFile="${project.distrib.dir}/data/gitblit.properties"\r
-               skip="server.*" />\r
+                       propertiesFile="${project.distrib.dir}/data/gitblit.properties"\r
+                       skip="server.*">\r
+                       <replace token="@gb.version@" value="${project.version}" />\r
+               </mx:webxml>\r
 \r
                <!-- Gitblit classes -->\r
                <mx:genjar destfile="${webinf}/lib/gitblit.jar" includeresources="false" excludeclasspathjars="true">\r