=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-10-22 16:14:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-12-29 06:38:03 +0000
@@ -30,7 +30,7 @@
                       <arg value="revno"/>
                 </exec>
                 <echo file="${project.build.outputDirectory}/build.properties"
-                  message="build.version = ${version}&#10;build.time = ${now}&#10;build.revision = ${revision}&#10;"/>
+                  message="build.version = ${project.version}&#10;build.time = ${now}&#10;build.revision = ${revision}&#10;"/>
               </tasks>
             </configuration>
             <goals>

=== modified file 'dhis-mobile/dhis-service-mobile/pom.xml'
--- dhis-mobile/dhis-service-mobile/pom.xml	2010-12-03 13:29:28 +0000
+++ dhis-mobile/dhis-service-mobile/pom.xml	2010-12-29 06:38:03 +0000
@@ -36,7 +36,7 @@
 		<dependency>
 		  <groupId>org.hisp.dhis</groupId>
 		  <artifactId>dhis-in-service-reports</artifactId>
-		  <version>${version}</version>
+		  <version>${project.version}</version>
 		</dependency>   
 	
 		<!-- Other -->

=== modified file 'dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/pom.xml'
--- dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/pom.xml	2010-10-14 10:44:34 +0000
+++ dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/pom.xml	2010-12-29 06:38:03 +0000
@@ -35,7 +35,7 @@
     <properties>
         <j2me.midlet.vendor>${project.organization.name}</j2me.midlet.vendor>
         <j2me.midlet.name>${project.name}</j2me.midlet.name>
-        <j2me.midlet.version>${version}</j2me.midlet.version>
+        <j2me.midlet.version>${project.version}</j2me.midlet.version>
         <j2me.midlet.configuration>CLDC-1.1</j2me.midlet.configuration>
         <j2me.midlet.profile>MIDP-2.0</j2me.midlet.profile>
     </properties>

=== modified file 'local/bd/dhis-web-linelisting-bd/pom.xml'
--- local/bd/dhis-web-linelisting-bd/pom.xml	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-bd/pom.xml	2010-12-29 06:38:03 +0000
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-        <version>${version}</version>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -37,12 +37,12 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-linelisting</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-dbmanager</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/bd/dhis-web-linelisting-manpower/pom.xml'
--- local/bd/dhis-web-linelisting-manpower/pom.xml	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/pom.xml	2010-12-29 06:38:03 +0000
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-        <version>${version}</version>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -37,17 +37,17 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-linelisting</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-dbmanager</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
 <!--<dependency>
 	<groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-organisationunit</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>-->
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2010-12-03 13:29:28 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -33,12 +33,12 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>   
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-      <version>${version}</version>   
+      <version>${project.version}</version>   
     </dependency>	  
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-in-services/pom.xml	2010-12-29 06:38:03 +0000
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml	2010-11-22 13:02:23 +0000
+++ local/in/dhis-web-dashboard/pom.xml	2010-12-29 06:38:03 +0000
@@ -32,18 +32,18 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-patient</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-linelisting</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-dbmanager</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 		
     <dependency>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -71,22 +71,22 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-survey</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-reports</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>	  
 	  	      
     <!-- Other -->

=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-excelimport/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>       
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -47,7 +47,7 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
+	<version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-web-leprosy/pom.xml'
--- local/in/dhis-web-leprosy/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-leprosy/pom.xml	2010-12-29 06:38:03 +0000
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.hisp.dhis</groupId>
             <artifactId>dhis-service-jdbc</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hisp.dhis</groupId>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.hisp.dhis</groupId>
             <artifactId>dhis-service-aggregationengine-default</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
     <!-- Other -->

=== modified file 'local/in/dhis-web-linelisting-in/pom.xml'
--- local/in/dhis-web-linelisting-in/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-linelisting-in/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-        <version>${version}</version>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -34,12 +34,12 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-linelisting</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-dbmanager</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
 	
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml	2010-08-30 12:04:09 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	      
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -48,7 +48,7 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
+	<version>${project.version}</version>
     </dependency>
 	
    <dependency>

=== modified file 'local/in/dhis-web-mobile/pom.xml'
--- local/in/dhis-web-mobile/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-mobile/pom.xml	2010-12-29 06:38:03 +0000
@@ -42,7 +42,7 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
+	<version>${project.version}</version>
     </dependency>
 	  
     <dependency>

=== modified file 'local/in/dhis-web-reports-in/pom.xml'
--- local/in/dhis-web-reports-in/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-reports-in/pom.xml	2010-12-29 06:38:03 +0000
@@ -28,17 +28,17 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-reports</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>   
 
     <dependency>
@@ -69,17 +69,17 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-jdbc</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-user-hibernate</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>		
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>	  
     <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>poi</groupId>

=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml	2010-11-01 11:14:31 +0000
+++ local/in/dhis-web-reports-national/pom.xml	2010-12-29 06:38:03 +0000
@@ -28,7 +28,7 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -37,7 +37,7 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -71,12 +71,12 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-      <version>${version}</version>	  
+      <version>${project.version}</version>	  
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-reports</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>	
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -85,12 +85,12 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-survey</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-web-sandbox/pom.xml'
--- local/in/dhis-web-sandbox/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-sandbox/pom.xml	2010-12-29 06:38:03 +0000
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-        <version>${version}</version>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -33,7 +33,7 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-linelisting</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/in/dhis-web-sandboxbk/pom.xml'
--- local/in/dhis-web-sandboxbk/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-sandboxbk/pom.xml	2010-12-29 06:38:03 +0000
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-jdbc</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>    
       -->    
     <dependency>
@@ -66,18 +66,18 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
+	<version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-scheduler</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
 	  
     <dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.opensymphony</groupId>
       <artifactId>webwork</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     -->
     <!-- Other -->

=== modified file 'local/in/dhis-web-survey/pom.xml'
--- local/in/dhis-web-survey/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-survey/pom.xml	2010-12-29 06:38:03 +0000
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-api</artifactId>
-        <version>${version}</version>
+        <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-survey</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -83,7 +83,7 @@
     <!--<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-webwork</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>-->
     
       <!-- Web -->
@@ -91,7 +91,7 @@
     <!--<dependency>
       <groupId>com.opensymphony</groupId>
       <artifactId>webwork</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>-->
     
     <!-- Other -->

=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml	2010-08-20 09:13:09 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml	2010-12-29 06:38:03 +0000
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons-resources</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
       <type>war</type>
     </dependency>
     
@@ -49,7 +49,7 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
     </dependency>
   
     
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.opensymphony</groupId>
       <artifactId>webwork</artifactId>
-      	  <version>${version}</version>
+      	  <version>${project.version}</version>
     </dependency>
     -->
     <!-- Other -->