diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 9d1bbba3f2..5656fd841f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -14,13 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -28,7 +27,7 @@
     <artifactId>wso2is</artifactId>
     <packaging>jar</packaging>
     <name>Identity Server</name>
-    <url></url>
+    <url />
     <description>Identity Server: Distribution</description>
 
     <dependencies>
@@ -61,8 +60,7 @@
               <version>${carbon.version}</version> </dependency> <dependency>
               <groupId>org.wso2.carbon</groupId>
               <artifactId>com.wso2.carbon.multitenancy.theme.mgt</artifactId>
-              <version>${carbon.version}</version > </dependency
-          -->
+              <version>${carbon.version}</version > </dependency -->
 
     </dependencies>
 
@@ -107,170 +105,79 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property name="tempdir" value="target/docs-temp"/>
-                                <property name="registryPolicyHandler"
-                                          value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator}       &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator}           &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator}       &lt;/filter&gt;${line.separator}   &lt;/handler&gt;${line.separator}${line.separator}   &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"/>
+                                <property name="tempdir" value="target/docs-temp" />
+                                <property name="registryPolicyHandler" value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator}       &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator}           &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator}       &lt;/filter&gt;${line.separator}   &lt;/handler&gt;${line.separator}${line.separator}   &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;" />
 
-                                <property name="xss-kernel-token"
-                                          value="&lt;XSSPreventionConfig&gt;${line.separator}            &lt;Enabled&gt;true&lt;/Enabled&gt;${line.separator}            &lt;Rule&gt;allow&lt;/Rule&gt;${line.separator}            &lt;Patterns&gt;${line.separator}                &lt;!--Pattern&gt;&lt;/Pattern--&gt;${line.separator}            &lt;/Patterns&gt;${line.separator}        &lt;/XSSPreventionConfig&gt;"/>
+                                <property name="xss-kernel-token" value="&lt;XSSPreventionConfig&gt;${line.separator}            &lt;Enabled&gt;true&lt;/Enabled&gt;${line.separator}            &lt;Rule&gt;allow&lt;/Rule&gt;${line.separator}            &lt;Patterns&gt;${line.separator}                &lt;!--Pattern&gt;&lt;/Pattern--&gt;${line.separator}            &lt;/Patterns&gt;${line.separator}        &lt;/XSSPreventionConfig&gt;" />
 
-                                <property name="xss-is-token" value=""/>
+                                <property name="xss-is-token" value="" />
 
-                                <property name="sso-idp-config-default"
-                                          value="&lt;!--ServiceProvider&gt;&lt;/ServiceProvider--&gt;"/>
+                                <property name="sso-idp-config-default" value="&lt;!--ServiceProvider&gt;&lt;/ServiceProvider--&gt;" />
 
-                                <property name="sso-idp-config-replace"
-                                          value="&lt;ServiceProvider&gt;${line.separator}      &lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;${line.separator}      &lt;AssertionConsumerServiceURLs&gt;${line.separator}        &lt;AssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;${line.separator}      &lt;/AssertionConsumerServiceURLs&gt;${line.separator}      &lt;DefaultAssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;${line.separator}      &lt;SignResponse&gt;true&lt;/SignResponse&gt;${line.separator}      &lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;${line.separator}      &lt;AudiencesList&gt;${line.separator}        &lt;Audience&gt;carbonServer&lt;/Audience&gt;${line.separator}      &lt;/AudiencesList&gt;${line.separator}    &lt;/ServiceProvider&gt;"/>
+                                <property name="sso-idp-config-replace" value="&lt;ServiceProvider&gt;${line.separator}      &lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;${line.separator}      &lt;AssertionConsumerServiceURLs&gt;${line.separator}        &lt;AssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;${line.separator}      &lt;/AssertionConsumerServiceURLs&gt;${line.separator}      &lt;DefaultAssertionConsumerServiceURL&gt;${carbon.protocol}://${carbon.host}:${carbon.management.port}/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;${line.separator}      &lt;SignResponse&gt;true&lt;/SignResponse&gt;${line.separator}      &lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;${line.separator}      &lt;AudiencesList&gt;${line.separator}        &lt;Audience&gt;carbonServer&lt;/Audience&gt;${line.separator}      &lt;/AudiencesList&gt;${line.separator}    &lt;/ServiceProvider&gt;" />
 
-                                <mkdir dir="${tempdir}"/>
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2is-${project.version}.zip"/>
+                                        <include name="wso2is-${project.version}.zip" />
                                     </fileset>
                                 </unzip>
 
                                 <!--unzip src="wso2is-${project.version}.zip" dest="${tempdir}">
                                 </unzip-->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="${product.name}" value="WSO2 Identity Server"/>
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml"
-                                        token="&lt;Context crossContext=&quot;true&quot;&gt;"
-                                        value="&lt;Context crossContext=&quot;true&quot; useHttpOnly=&quot;true&quot;&gt;"/>
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/catalina-server.xml"
-                                        token="clientAuth=&quot;false&quot;"
-                                        value="clientAuth=&quot;want&quot;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;ServerURL&gt;https://${carbon.local.ip}"
-                                        value="&lt;ServerURL&gt;https://localhost"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--MgtHostName&gt;mgt.wso2.org&lt;/MgtHostName--&gt;"
-                                        value="&lt;MgtHostName&gt;localhost&lt;/MgtHostName&gt;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;"
-                                        value="&lt;HostName&gt;localhost&lt;/HostName&gt;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--LdapServer&gt;"
-                                        value="&lt;LdapServer&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;/LdapServer--&gt;"
-                                        value="&lt;/LdapServer&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--TokenStoreClassName&gt;"
-                                        value="&lt;TokenStoreClassName&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;/TokenStoreClassName--&gt;"
-                                        value="&lt;/TokenStoreClassName&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="${xss-kernel-token}"
-                                        value="${xss-is-token}"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="${product.name}" value="WSO2 Identity Server" />
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml" token="&lt;Context crossContext=&quot;true&quot;&gt;" value="&lt;Context crossContext=&quot;true&quot; useHttpOnly=&quot;true&quot;&gt;" />
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/catalina-server.xml" token="clientAuth=&quot;false&quot;" value="clientAuth=&quot;want&quot;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;ServerURL&gt;https://${carbon.local.ip}" value="&lt;ServerURL&gt;https://localhost" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--MgtHostName&gt;mgt.wso2.org&lt;/MgtHostName--&gt;" value="&lt;MgtHostName&gt;localhost&lt;/MgtHostName&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;" value="&lt;HostName&gt;localhost&lt;/HostName&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--LdapServer&gt;" value="&lt;LdapServer&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;/LdapServer--&gt;" value="&lt;/LdapServer&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--TokenStoreClassName&gt;" value="&lt;TokenStoreClassName&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;/TokenStoreClassName--&gt;" value="&lt;/TokenStoreClassName&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="${xss-kernel-token}" value="${xss-is-token}" />
 
                                 <!-- Update log4j.properties file with Identity related log files -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR"
-                                        value="log4j.logger.net.sf.ehcache=ERROR${line.separator}
-#log4j.logger.org.wso2.carbon.user.core=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.sso.saml=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.application=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.application.authentication.framework=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.oauth2=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.scim=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.idp.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.provisioning=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.user.account.association=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.user.profile.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.security=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.sso.agent=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.core=DEBUG"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender"
-                                        value="log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout"
-                                        value="log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n"
-                                        value="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n${line.separator}log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]${line.separator}log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR" value="log4j.logger.net.sf.ehcache=ERROR${line.separator} #log4j.logger.org.wso2.carbon.user.core=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.sso.saml=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.application=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.application.authentication.framework=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.oauth2=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.scim=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.idp.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.provisioning=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.user.account.association=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.user.profile.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.security=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.sso.agent=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.core=DEBUG" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender" value="log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout" value="log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n" value="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n${line.separator}log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]${line.separator}log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace" />
 
                                 <!-- Comment all active UserStoreManagers -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;UserStoreManager"
-                                        value="&lt;!--UserStoreManager"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;/UserStoreManager&gt;"
-                                        value="&lt;/UserStoreManager--&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;!--ISUserStoreManager"
-                                        value="&lt;UserStoreManager"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;/ISUserStoreManager--&gt;"
-                                        value="&lt;/UserStoreManager&gt;"/>
-
-                               <replace
-                                       file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                       token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;"
-                                       value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;UserStoreManager" value="&lt;!--UserStoreManager" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;/UserStoreManager&gt;" value="&lt;/UserStoreManager--&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;!--ISUserStoreManager" value="&lt;UserStoreManager" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;/ISUserStoreManager--&gt;" value="&lt;/UserStoreManager&gt;" />
+
+                               <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
 
                                 <!-- turn off IsBulkImportSupported -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;Property name=&quot;IsBulkImportSupported&quot;&gt;true&lt;/Property&gt;"
-                                        value="&lt;Property name=&quot;IsBulkImportSupported&quot;&gt;false&lt;/Property&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="${sso-idp-config-default}"
-                                        value="${sso-idp-config-replace}"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml"
-                                        token="&lt;!--Authenticator name=&quot;MutualSSLAuthenticator&quot; disabled=&quot;false&quot;&gt;"
-                                        value="&lt;Authenticator name=&quot;MutualSSLAuthenticator&quot;&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml"
-                                        token="&lt;/Authenticator--&gt;"
-                                        value="&lt;/Authenticator&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;IsBulkImportSupported&quot;&gt;true&lt;/Property&gt;" value="&lt;Property name=&quot;IsBulkImportSupported&quot;&gt;false&lt;/Property&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="${sso-idp-config-default}" value="${sso-idp-config-replace}" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml" token="&lt;!--Authenticator name=&quot;MutualSSLAuthenticator&quot; disabled=&quot;false&quot;&gt;" value="&lt;Authenticator name=&quot;MutualSSLAuthenticator&quot;&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml" token="&lt;/Authenticator--&gt;" value="&lt;/Authenticator&gt;" />
 
                                 <unzip dest="${tempdir}/shindig">
                                     <fileset dir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps">
-                                        <include name="shindig.war"/>
+                                        <include name="shindig.war" />
                                     </fileset>
                                 </unzip>
 
-                                <delete file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/shindig.war"/>
-                                <delete file="${tempdir}/shindig/WEB-INF/web.xml"/>
+                                <delete file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/shindig.war" />
+                                <delete file="${tempdir}/shindig/WEB-INF/web.xml" />
 
                                 <copy todir="${tempdir}/shindig/WEB-INF" overwrite="false">
                                     <fileset dir="conf/shindig">
@@ -282,88 +189,67 @@
 
                                 <!-- Add org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler to IS -->
 
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml"
-                                        token="&lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"
-                                        value="${registryPolicyHandler}"/>
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml" token="&lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;" value="${registryPolicyHandler}" />
 
                                 <!-- Enable KDC for IS -->
 
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${tempdir}/wso2is-${project.version}/repository/components/">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false">
+                                    <fileset dir="${tempdir}/wso2is-${project.version}/repository/components/">
                                     </fileset>
                                 </copy>
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/client/modules"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${tempdir}/wso2is-${project.version}/repository/deployment/client/modules">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/client/modules" overwrite="false">
+                                    <fileset dir="${tempdir}/wso2is-${project.version}/repository/deployment/client/modules">
                                     </fileset>
                                 </copy>
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity" overwrite="false">
+                                    <fileset dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
                                     </fileset>
                                 </copy>
 
                                 <path id="h2.classpath">
-                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.compile.classpath" />
                                 </path>
-                                <echo
-                                        message="########### Create Identity Database ##############"/>
-                                <sql
-                                        driver="org.h2.Driver"
-                                        url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB"
-                                        userid="wso2carbon" password="wso2carbon" autocommit="true"
-                                        onerror="continue">
+                                <echo message="########### Create Identity Database ##############" />
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
-                                        <path refid="h2.classpath"/>
+                                        <path refid="h2.classpath" />
                                     </classpath>
-                                    <fileset
-                                            file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql"/>
+                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />
                                 </sql>
-                                <echo
-                                        message="##################### END ########################"/>
+                                <echo message="##################### END ########################" />
 
-                                <delete file="target/wso2is-${project.version}.zip"/>
-                                <delete dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}"/>
+                                <delete file="target/wso2is-${project.version}.zip" />
+                                <delete dir="${tempdir}" />
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
-                                        <include name="*.ui*.jar"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
+                                        <include name="*.ui*.jar" />
                                     </fileset>
                                 </unzip>
                                 <move todir="${tempdir}/web/" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web/">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <include name="**/*.html"/>
-                                        <exclude name="**/editarea/**"/>
-                                        <exclude name="**/codepress/**"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <include name="**/*.html" />
+                                        <exclude name="**/editarea/**" />
+                                        <exclude name="**/codepress/**" />
                                     </fileset>
-                                    <mapper type="glob" from="*.html" to="*.xml"/>
+                                    <mapper type="glob" from="*.html" to="*.xml" />
                                 </move>
-                                <copy todir="src/site/xdoc" overwrite="false"
-                                      includeemptydirs="false">
+                                <copy todir="src/site/xdoc" overwrite="false" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <exclude name="**/gadget/**"/>
-                                        <exclude name="**/*.html"/>
-                                        <exclude name="**/*.js"/>
-                                        <exclude name="**/*.jsp"/>
-                                        <exclude name="**/*.xsl"/>
-                                        <exclude name="*.*"/>
-                                        <exclude name="**/template.xml"/>
-                                        <exclude name="**/codepress.xml"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <exclude name="**/gadget/**" />
+                                        <exclude name="**/*.html" />
+                                        <exclude name="**/*.js" />
+                                        <exclude name="**/*.jsp" />
+                                        <exclude name="**/*.xsl" />
+                                        <exclude name="*.*" />
+                                        <exclude name="**/template.xml" />
+                                        <exclude name="**/codepress.xml" />
                                     </fileset>
                                 </copy>
                                 <copy todir="src/site" overwrite="false" includeemptydirs="false">
@@ -372,22 +258,22 @@
                                 </copy>
                                 <copy todir="src/site" overwrite="true" includeemptydirs="false">
                                     <fileset dir="../documentation/src/site">
-                                        <exclude name="**/images/*.*"/>
-                                        <exclude name="**/user-mgt-actdir.xml"/>
-                                        <exclude name="**/user-mgt-jdbc.xml"/>
-                                        <exclude name="**/user-mgt-ldap.xml"/>
-                                        <exclude name="**/user-mgt-ldap-read-write.xml"/>
+                                        <exclude name="**/images/*.*" />
+                                        <exclude name="**/user-mgt-actdir.xml" />
+                                        <exclude name="**/user-mgt-jdbc.xml" />
+                                        <exclude name="**/user-mgt-ldap.xml" />
+                                        <exclude name="**/user-mgt-ldap-read-write.xml" />
                                     </fileset>
                                     <filterset>
-                                        <filter token="buildNumber" value="${buildNumber}"/>
+                                        <filter token="buildNumber" value="${buildNumber}" />
                                     </filterset>
                                 </copy>
                                 <copy todir="target/site/" overwrite="false" includeemptydirs="false">
                                     <fileset dir="src/site/xdoc/">
-                                        <include name="**/images/*.*"/>
+                                        <include name="**/images/*.*" />
                                     </fileset>
                                 </copy>
-                                <delete dir="${tempdir}"/>
+                                <delete dir="${tempdir}" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -399,14 +285,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete file="target/wso2is-${project.version}.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="src/site"/>
+                                <delete dir="target/archive-tmp" />
+                                <delete dir="target/dependency-maven-plugin-markers" />
+                                <delete dir="target/maven-archiver" />
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+                                <delete file="target/wso2is-${project.version}.jar" />
+                                <delete dir="target/sources" />
+                                <delete dir="target/site" />
+                                <delete dir="src/site" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index 509e0a55d1..0a28f14156 100644
--- a/modules/features/org.wso2.identity.styles.feature/pom.xml
+++ b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -15,13 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
index 677141fbc9..8909a349c0 100644
--- a/modules/features/org.wso2.identity.ui.feature/pom.xml
+++ b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -15,14 +15,12 @@
  ~ limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
index 78eeb362c4..81b6bcf9e9 100644
--- a/modules/features/org.wso2.identity.utils.feature/pom.xml
+++ b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -15,13 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index d03fc3c11b..03107912b5 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -12,13 +12,12 @@
 		limitations under the License.
 	-->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index cb6444c000..2015026a28 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index 31fcdf536e..be48089812 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 544eaf32c7..83fe8b1ec7 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 163eb5f25b..f1814cffe5 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index 37715e86e4..87b27e0c1a 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index d636113192..84bd556117 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
index 844ac333fd..4fb66504c0 100644
--- a/modules/integration/tests-integration/tests-backend/pom.xml
+++ b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -14,13 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -248,8 +246,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml"
-                                     target="clear-slf4j-libs"/>
+                                <ant antfile="src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml" target="clear-slf4j-libs" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -261,18 +258,12 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-smartconsumerwithclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-smartconsumerwithoutclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-dumbconsumerwithclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-dumbconsumerwithoutclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/oauth/oauth-app-build.xml"
-                                     target="default"/>
-                                <ant antfile="src/test/resources/artifacts/IS/passivests/sts-app-build.xml"
-                                     target="default"/>
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-smartconsumerwithclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-smartconsumerwithoutclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-dumbconsumerwithclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-dumbconsumerwithoutclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/oauth/oauth-app-build.xml" target="default" />
+                                <ant antfile="src/test/resources/artifacts/IS/passivests/sts-app-build.xml" target="default" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -284,8 +275,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/saml/saml-app-build.xml"
-                                     target="saml-tenant-signingdisabled"/>
+                                <ant antfile="src/test/resources/artifacts/IS/saml/saml-app-build.xml" target="saml-tenant-signingdisabled" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml b/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
index adcb7085a4..a99bad39d3 100644
--- a/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
+++ b/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 4a6e8e8573..99af64f9a9 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -14,13 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -1763,14 +1762,10 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="false" value="true"
-                                         dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
-                                    <include name="**/bundles.info"/>
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
+                                    <include name="**/bundles.info" />
                                 </replace>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml"
-                                        token="&lt;Context&gt;"
-                                        value="&lt;Context crossContext=&quot;true&quot;&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml" token="&lt;Context&gt;" value="&lt;Context crossContext=&quot;true&quot;&gt;" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/samples/identity-mgt/info-recovery-sample/pom.xml b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
index 5a29d49b7c..1d1f2dac36 100644
--- a/modules/samples/identity-mgt/info-recovery-sample/pom.xml
+++ b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
@@ -17,14 +17,12 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-info-recovery</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/identity-mgt/pom.xml b/modules/samples/identity-mgt/pom.xml
index 3a817d75ae..8a75754df7 100644
--- a/modules/samples/identity-mgt/pom.xml
+++ b/modules/samples/identity-mgt/pom.xml
@@ -16,14 +16,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
index 02b779b055..57409ab0e4 100644
--- a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
+++ b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
@@ -10,13 +10,12 @@
 	License for the specific language governing permissions and ~ limitations 
 	under the License. -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth10a</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/oauth/pom.xml b/modules/samples/oauth/pom.xml
index d053e7b6e5..e7c7004f71 100644
--- a/modules/samples/oauth/pom.xml
+++ b/modules/samples/oauth/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/custom-grant/pom.xml b/modules/samples/oauth2/custom-grant/pom.xml
index bb53313ed9..7347467b04 100644
--- a/modules/samples/oauth2/custom-grant/pom.xml
+++ b/modules/samples/oauth2/custom-grant/pom.xml
@@ -16,14 +16,12 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/playground2/pom.xml b/modules/samples/oauth2/playground2/pom.xml
index 9081b12066..57cd3dacd9 100755
--- a/modules/samples/oauth2/playground2/pom.xml
+++ b/modules/samples/oauth2/playground2/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/pom.xml b/modules/samples/oauth2/pom.xml
index 2ac8545a2a..fe87687473 100644
--- a/modules/samples/oauth2/pom.xml
+++ b/modules/samples/oauth2/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
index 8ed0a106ff..d37732167f 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
index 504d774851..1dfacb67e0 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/pom.xml b/modules/samples/passive-sts/passive-sts-client/pom.xml
index a36b5e1024..2abb78db64 100644
--- a/modules/samples/passive-sts/passive-sts-client/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-passivests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/pom.xml b/modules/samples/passive-sts/pom.xml
index 92d9108a29..e235b57276 100644
--- a/modules/samples/passive-sts/pom.xml
+++ b/modules/samples/passive-sts/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index b716e053bf..1d3ea52c8e 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/pom.xml b/modules/samples/scim/pom.xml
index 99c52d0cb7..cf12b53fc9 100644
--- a/modules/samples/scim/pom.xml
+++ b/modules/samples/scim/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/scim-provisioning/pom.xml b/modules/samples/scim/scim-provisioning/pom.xml
index 6918c11008..9f2a500d8b 100644
--- a/modules/samples/scim/scim-provisioning/pom.xml
+++ b/modules/samples/scim/scim-provisioning/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-scim</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/pom.xml b/modules/samples/sso/pom.xml
index c5e4feba96..2daad86471 100644
--- a/modules/samples/sso/pom.xml
+++ b/modules/samples/sso/pom.xml
@@ -15,15 +15,13 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/sso-agent-sample/pom.xml b/modules/samples/sso/sso-agent-sample/pom.xml
index c48a095ef3..ce83804dc1 100644
--- a/modules/samples/sso/sso-agent-sample/pom.xml
+++ b/modules/samples/sso/sso-agent-sample/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sso</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/pom.xml b/modules/samples/sts/pom.xml
index ef503b9caf..2ebeb06b13 100644
--- a/modules/samples/sts/pom.xml
+++ b/modules/samples/sts/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/sts-client/pom.xml b/modules/samples/sts/sts-client/pom.xml
index 15ab6eb8f3..43941dd18a 100644
--- a/modules/samples/sts/sts-client/pom.xml
+++ b/modules/samples/sts/sts-client/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sts</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/pom.xml b/modules/samples/user-mgt/pom.xml
index df3dbb34d4..7ded060f43 100644
--- a/modules/samples/user-mgt/pom.xml
+++ b/modules/samples/user-mgt/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/remote-user-mgt/pom.xml b/modules/samples/user-mgt/remote-user-mgt/pom.xml
index 5bb0dfb4fa..ef0aeec9cb 100644
--- a/modules/samples/user-mgt/remote-user-mgt/pom.xml
+++ b/modules/samples/user-mgt/remote-user-mgt/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-usermgt</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/pom.xml b/modules/samples/xacml/pom.xml
index bcf1c7750e..93da98e1c7 100644
--- a/modules/samples/xacml/pom.xml
+++ b/modules/samples/xacml/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index ff552c770b..9d2f16616f 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 7a6f5566a6..9430f1fa2b 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-styles-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 76a16a2b26..6fa5f0e37c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2</groupId>
@@ -29,7 +28,7 @@
     <artifactId>identity-server-parent</artifactId>
     <packaging>pom</packaging>
     <description>WSO2 Identity Server</description>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0</version>
     <name>WSO2 Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
@@ -1281,7 +1280,7 @@
         <url>https://github.com/wso2/product-is.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-is.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-is.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.1.0-rc2</tag>
     </scm>