From: James Moger <james.moger@gitblit.com>
Date: Fri, 3 May 2013 23:03:40 +0000 (-0400)
Subject: Restore web.xml version stamping
X-Git-Tag: v1.3.0~160
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9985ed23ae251c1d024a223f9ea8372b75a122f2;p=gitblit.git

Restore web.xml version stamping
---

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