diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index 8bdcb4702d..09c4d1b8e6 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -130,14 +130,10 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <target>
-                                <tstamp>
-                                    <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
-                                </tstamp>
                                 <copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
                                     <fileset dir="${basedir}/src/" includes="**/*.xsl" />
                                     <filterset begintoken="#" endtoken="#">
                                         <filter token="axisVersion" value="${project.version}" />
-                                        <filter token="today" value=" Built on : ${build.time}" />
                                     </filterset>
                                 </copy>
                             </target>
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
index f60d7c22df..25b891da3e 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
@@ -49,7 +49,7 @@
  * <xsl:value-of select="$name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
             <xsl:if test="string-length(normalize-space(@package)) > 0">
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
index 524556c100..7703503ae8 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
@@ -46,7 +46,7 @@
  * <xsl:value-of select="$name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
             package <xsl:value-of select="@package"/>;
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
index d59c133eee..cdbf45e61f 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
@@ -27,7 +27,7 @@
  * <xsl:value-of select="$name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
         <xsl:if test="string-length(normalize-space(@package)) > 0">
@@ -72,7 +72,7 @@
  * <xsl:value-of select="$name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
         <xsl:if test="string-length(normalize-space(@package)) > 0">
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
index edc571b6d1..d079a2ca1e 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
@@ -32,7 +32,7 @@
         * <xsl:value-of select="$axis2_name"/>.h
         *
         * This file was auto-generated from WSDL
-        * by the Apache Axis2/Java version: #axisVersion# #today#
+        * by the Apache Axis2/Java version: #axisVersion#
         */
 
         #include &lt;stdio.h&gt;
@@ -89,7 +89,7 @@
         * <xsl:value-of select="$axis2_name"/>.h
         *
         * This file was auto-generated from WSDL
-        * by the Apache Axis2/Java version: #axisVersion# #today#
+        * by the Apache Axis2/Java version: #axisVersion#
         */
 
        /**
@@ -1087,7 +1087,7 @@
          * <xsl:value-of select="$axis2_name"/>.h
          *
          * This file was auto-generated from WSDL
-         * by the Apache Axis2/Java version: #axisVersion# #today#
+         * by the Apache Axis2/Java version: #axisVersion#
          */
 
         #include &lt;stdio.h&gt;
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
index d9e9d95abb..f466ae68ea 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
@@ -28,7 +28,7 @@
          * <xsl:value-of select="$axis2_name"/>.c
          *
          * This file was auto-generated from WSDL
-         * by the Apache Axis2/Java version: #axisVersion# #today#
+         * by the Apache Axis2/Java version: #axisVersion#
          */
          
         #include "<xsl:value-of select="$axis2_name"/>.h"
@@ -6617,7 +6617,7 @@
          * <xsl:value-of select="$axis2_name"/>.c
          *
          * This file was auto-generated from WSDL
-         * by the Apache Axis2/Java version: #axisVersion# #today#
+         * by the Apache Axis2/Java version: #axisVersion#
          */
 
         #include "<xsl:value-of select="$axis2_name"/>.h"
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/PlainBeanTemplate.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/PlainBeanTemplate.xsl
index 6b71441d40..a366617662 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/template/PlainBeanTemplate.xsl
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/PlainBeanTemplate.xsl
@@ -27,7 +27,7 @@
  * <xsl:value-of select="$name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
         package <xsl:value-of select="@package"/>;
@@ -54,7 +54,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
         package <xsl:value-of select="@package"/>;
diff --git a/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java b/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
index a00eaf8277..0d3653ada8 100644
--- a/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
+++ b/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
@@ -21,7 +21,7 @@
  * ClientInfo.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
 package org.apache.axis2.databinding;
diff --git a/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java b/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
index aa6886feb7..be0956afa2 100644
--- a/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
@@ -21,7 +21,7 @@
  * CreateAccountRequest.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
 package org.apache.axis2.databinding;
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 4d1bba0f2b..1df36121e5 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -197,14 +197,10 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <target>
-                                <tstamp>
-                                    <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
-                                </tstamp>
                                 <copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
                                     <fileset dir="${basedir}/src/" includes="**/*.xsl" />
                                     <filterset begintoken="#" endtoken="#">
                                         <filter token="axisVersion" value="${project.version}" />
-                                        <filter token="today" value=" Built on : ${build.time}" />
                                     </filterset>
                                 </copy>
                             </target>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
index 6be6978826..b6d72cba64 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
@@ -36,7 +36,7 @@
          * <xsl:value-of select="@name"/>.c
          *
          * This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
-         * by the Apache Axis2 version: #axisVersion# #today#
+         * by the Apache Axis2 version: #axisVersion#
          *  <xsl:value-of select="$skeletonname"/>
          */
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl
index ef27f5af19..b8db0006a4 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl
@@ -22,7 +22,7 @@
 
     <xsl:template match="/">
         <xsl:comment> This file was auto-generated from WSDL </xsl:comment>
-        <xsl:comment> by the Apache Axis2 version: #axisVersion# #today# </xsl:comment>
+        <xsl:comment> by the Apache Axis2 version: #axisVersion# </xsl:comment>
         <xsl:apply-templates/>
     </xsl:template>
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
index 983f1b4605..e969c0ca6c 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
@@ -30,7 +30,7 @@
      * <xsl:value-of select="@name"/>.h
      *
      * This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
-     * by the Apache Axis2/C version: #axisVersion# #today#
+     * by the Apache Axis2/C version: #axisVersion#
      * <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService- Header file
      */
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
index d808425783..be966c1fbe 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
@@ -29,7 +29,7 @@
      * <xsl:value-of select="@name"/>.c
      *
      * This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
-     * by the Apache Axis2/C version: #axisVersion# #today#
+     * by the Apache Axis2/C version: #axisVersion#
      * <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService
      */
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
index 751d5382c5..f6ea83d966 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
@@ -36,7 +36,7 @@
         * <xsl:value-of select="@name"/>.h
         *
         * This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
-        * by the Apache Axis2/Java version: #axisVersion# #today#
+        * by the Apache Axis2/Java version: #axisVersion#
         */
 
         #ifndef <xsl:value-of select="$caps_name"/>_H
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
index 2979b497a9..91a9b764e0 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
@@ -37,7 +37,7 @@
        * <xsl:value-of select="@name"/>.c
        *
        * This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
-       * by the Apache Axis2/Java version: #axisVersion# #today#
+       * by the Apache Axis2/Java version: #axisVersion#
        */
 
       #include "<xsl:value-of select="@name"/>.h"
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
index 981018bd42..13ebad306e 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
@@ -22,7 +22,7 @@
 
     <xsl:template match="/">
         <xsl:comment> This file was auto-generated from WSDL </xsl:comment>
-        <xsl:comment> by the Apache Axis2 version: #axisVersion# #today# </xsl:comment>
+        <xsl:comment> by the Apache Axis2 version: #axisVersion# </xsl:comment>
         <serviceGroup>
             <xsl:apply-templates/>
         </serviceGroup>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
index 7ece36b879..9e3b8b07f0 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
@@ -24,7 +24,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
     package <xsl:value-of select="@package"/>;
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/ExceptionTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/ExceptionTemplate.xsl
index 852a9e42ef..80c06a8d04 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/ExceptionTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/ExceptionTemplate.xsl
@@ -24,7 +24,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
 package <xsl:value-of select="@package"/>;
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
index 7bf7d9733d..0dad172f75 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
@@ -43,7 +43,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
         package <xsl:value-of select="$package"/>;
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
index 57af94fcaa..315f102385 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
@@ -40,7 +40,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
 
     package <xsl:value-of select="$package"/>;
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
index 4847a7adac..2ad54d991d 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
@@ -32,7 +32,7 @@ import <xsl:value-of select="@value"/>;</xsl:for-each>
  * <xsl:value-of select="@name"/>.java
  *
  * This class was auto-generated from WSDL.
- * Apache Axis2 version: #axisVersion# #today#
+ * Apache Axis2 version: #axisVersion#
  *
  */
 <xsl:for-each select="annotation">
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
index b5e3b5519c..3933da5d14 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
@@ -37,7 +37,7 @@ import javax.xml.ws.Service;<!--<xsl:for-each select="importList/import">-->
  * <xsl:value-of select="@name"/>.java
  *
  * This class was auto-generated from WSDL.
- * Apache Axis2 version: #axisVersion# #today#
+ * Apache Axis2 version: #axisVersion#
  *
  */
 <xsl:for-each select="annotation">
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl
index 537827f38e..0486c70a39 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl
@@ -27,7 +27,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This class was auto-generated from WSDL.
- * Apache Axis2 version: #axisVersion# #today#
+ * Apache Axis2 version: #axisVersion#
  */
 <xsl:for-each select="annotation">
     <xsl:variable name="annoparamcount" select="count(param)"/>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
index 06ed8c1657..687db38b9c 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
@@ -30,7 +30,7 @@ import <xsl:value-of select="@value"/>;</xsl:for-each>
  * <xsl:value-of select="@name"/>.java
  *
  * This class was auto-generated from WSDL.
- * Apache Axis2 version: #axisVersion# #today#
+ * Apache Axis2 version: #axisVersion#
  */
 <xsl:for-each select="annotation">
     <xsl:variable name="annoparamcount" select="count(param)"/>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl
index 7bf8fea25d..4f6995fbe2 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl
@@ -22,7 +22,7 @@
 
     <xsl:template match="/">
         <xsl:comment> This file was auto-generated from WSDL </xsl:comment>
-        <xsl:comment> Apache Axis2 version: #axisVersion# #today# </xsl:comment>
+        <xsl:comment> Apache Axis2 version: #axisVersion# </xsl:comment>
         <serviceGroup>
             <xsl:apply-templates/>
         </serviceGroup>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
index a677037ab5..e7edc96763 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
@@ -38,7 +38,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
         package <xsl:value-of select="@package"/>;
 
@@ -322,7 +322,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
         package <xsl:value-of select="@package"/>;
 
@@ -440,7 +440,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
         package <xsl:value-of select="@package"/>;
 
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
index c14303c435..a2caa4d48c 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
@@ -24,7 +24,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
     package <xsl:value-of select="@package"/>;
     /**
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
index d67b1420de..8a0d1e6908 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
@@ -24,7 +24,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
     package <xsl:value-of select="@package"/>;
     /**
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
index 52dce99943..12ee7b4ab0 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
@@ -35,7 +35,7 @@
  * <xsl:value-of select="@name"/>.java
  *
  * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
+ * by the Apache Axis2 version: #axisVersion#
  */
     package <xsl:value-of select="$package"/>;
 
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index 05ec5895ee..9f00930b56 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -212,11 +212,7 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <target>
-                                <tstamp>
-                                    <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
-                                </tstamp>
                                 <filter token="axisVersion" value="${project.version}" />
-                                <filter token="TODAY" value="${build.time}" />
                                 <copy toDir="${basedir}/target/classes/org/apache/axis2/i18n" overwrite="true" filtering="on" file="${basedir}/src/org/apache/axis2/i18n/resource.properties" />
                             </target>
                         </configuration>
diff --git a/modules/kernel/src/org/apache/axis2/i18n/resource.properties b/modules/kernel/src/org/apache/axis2/i18n/resource.properties
index 077925b25a..5369858a93 100644
--- a/modules/kernel/src/org/apache/axis2/i18n/resource.properties
+++ b/modules/kernel/src/org/apache/axis2/i18n/resource.properties
@@ -42,9 +42,7 @@
 # PROCESS.
 axisVersion=Apache Axis2 version: @axisVersion@
 axisVersionRaw=@axisVersion@
-axisBuiltOnRaw=@TODAY@
 axisUserAgent=Axis/@axisVersion@
-builtOn=Built on @TODAY@
 #############################################################################
 
 threadpoolshutdown=Thread pool is shut down.
diff --git a/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties b/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
index af1110ad92..115213bf69 100644
--- a/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
+++ b/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
@@ -43,9 +43,7 @@
 # PROCESS.
 axisVersion=Apache Axis2 version: #axisVersion#
 axisVersionRaw=#axisVersion#
-axisBuiltOnRaw=#today#
 axisUserAgent=Axis/#axisVersion#
-builtOn=Built on #today#
 #############################################################################
 test01=This string is a test string 01.
 faultProcessingNotSupported=User fault processing is not supported. The @WebFault faultbean is missing for {0}
diff --git a/pom.xml b/pom.xml
index c77bd16931..13a19dee04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1234,12 +1234,12 @@
                 <plugin>
                     <groupId>org.apache.axis2</groupId>
                     <artifactId>axis2-aar-maven-plugin</artifactId>
-                    <version>1.8.0</version>
+                    <version>2.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.axis2</groupId>
                     <artifactId>axis2-mar-maven-plugin</artifactId>
-                    <version>1.8.0</version>
+                    <version>2.0.0</version>
                 </plugin>
                 
                 <!-- No chicken and egg problem here because the plugin doesn't expose