From e1817522980287fb7c5c22eefb52457908d0c7f4 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <builder@wso2.org>
Date: Fri, 23 Oct 2015 18:16:44 +0000
Subject: [PATCH] [maven-release-plugin] prepare release v3.5.0-RC2

---
 modules/distribution/pom.xml                  | 262 ++++++--------
 modules/features/pom.xml                      |   6 +-
 modules/features/product/pom.xml              |   6 +-
 .../pom.xml                                   |   6 +-
 .../pom.xml                                   |   6 +-
 .../pom.xml                                   |   6 +-
 modules/features/service/pom.xml              |   6 +-
 modules/integration/pom.xml                   |   6 +-
 .../tests-common/admin-clients/pom.xml        |   5 +-
 .../integration-test-utils/pom.xml            |   5 +-
 modules/integration/tests-common/pom.xml      |   6 +-
 .../integration/tests-common/ui-pages/pom.xml |   6 +-
 modules/integration/tests-integration/pom.xml |   6 +-
 .../tests-integration/tests/pom.xml           |   6 +-
 .../integration/tests-ui-integration/pom.xml  |   6 +-
 .../org.wso2.stratos.dss.dashboard.ui/pom.xml |   6 +-
 modules/org.wso2.stratos.dss.login.ui/pom.xml | 248 +++++++------
 modules/p2-profile-gen/pom.xml                |  11 +-
 modules/samples/clients/pom.xml               | 338 ++++++++----------
 modules/samples/pom.xml                       |   6 +-
 modules/styles/pom.xml                        |  92 +++--
 modules/styles/product/pom.xml                |   6 +-
 modules/styles/service/pom.xml                | 226 ++++++------
 pom.xml                                       |  10 +-
 24 files changed, 590 insertions(+), 697 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 6468060..392e868 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +28,7 @@
     <artifactId>wso2dss</artifactId>
     <packaging>jar</packaging>
     <name>WSO2 Data Services Server Distribution</name>
-    <url></url>
+    <url />
     <description>WSO2 Data Services Server Distribution</description>
 
     <dependencies>
@@ -52,7 +50,8 @@
     <scm>
         <connection>scm:svn:http://svn.wso2.org/repos/wso2/trunk/solutions/data-services/</connection>
         <developerConnection>scm:svn:https://svn.wso2.org/repos/wso2/trunk/solutions/data-services/</developerConnection>
-    </scm>
+      <tag>v3.5.0-RC2</tag>
+  </scm>
 
     <build>
         <plugins>
@@ -131,67 +130,44 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                 <property name="db.dir" value="target/samples/database"/>
-                                 <property name="userid" value="wso2ds"/>
-                                 <property name="password" value="wso2ds"/>
-                                 <!--<property name="dbURL"
-                                     value="jdbc:derby:${basedir}/${db.dir}/DATA_SERV_SAMP;create=true"/>-->
-                                 <property name="dbURL"
-                                     value="jdbc:h2:file:${basedir}/${db.dir}/DATA_SERV_SAMP"/>
+                                 <property name="db.dir" value="target/samples/database" />
+                                 <property name="userid" value="wso2ds" />
+                                 <property name="password" value="wso2ds" />
+                                 <!--<property name="dbURL" value="jdbc:derby:${basedir}/${db.dir}/DATA_SERV_SAMP;create=true" />-->
+                                 <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DATA_SERV_SAMP" />
 
-                                 <sql driver="org.h2.Driver"
-                                    url="${dbURL}"
-                                    userid="${userid}" password="${password}"
-                                    autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
 
-                                  <fileset file="${basedir}/../samples/sql/h2/CreateTables.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Customers.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Employees.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Offices.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/OrderDetails.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Orders.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Payments.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/ProductLines.sql"/>
-                                  <fileset file="${basedir}/../samples/sql/h2/Products.sql"/>
+                                  <fileset file="${basedir}/../samples/sql/h2/CreateTables.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Customers.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Employees.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Offices.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/OrderDetails.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Orders.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Payments.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/ProductLines.sql" />
+                                  <fileset file="${basedir}/../samples/sql/h2/Products.sql" />
                                 </sql>
 				<!-- Sign all the jars in the distribution -->
-                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
+                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
                                 <if>
-                                <equals arg1="${profile}" arg2="signJar"/>
+                                <equals arg1="${profile}" arg2="signJar" />
                                 <then>
-					<signjar alias="wso2carbon"
-                                         keystore="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/wso2carbon.jks"
-                                         storepass="wso2carbon" lazy="true">
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins"
-                                            includes="**/*.jar"/>
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib"
-                                            includes="**/*.jar"/>
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/patches"
-                                            includes="**/*.jar"/>
-                                    <!--<fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/api"
-                                            includes="**/*.jar"/> -->
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/bin"
-                                            includes="**/*.jar"/>
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/xboot"
-                                            includes="**/*.jar"/>
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/endorsed"
-                                            includes="**/*.jar"/>
-                                    <!--<fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/core/WEB-INF/lib"
-                                            includes="**/*.jar"/> -->
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/lib/patches"
-                                            includes="**/*.jar"/>
+					<signjar alias="wso2carbon" keystore="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/wso2carbon.jks" storepass="wso2carbon" lazy="true">
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins" includes="**/*.jar" />
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib" includes="**/*.jar" />
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/patches" includes="**/*.jar" />
+                                    <!--<fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/api"
+                                            includes="**/*.jar" /> -->
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/bin" includes="**/*.jar" />
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/xboot" includes="**/*.jar" />
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/endorsed" includes="**/*.jar" />
+                                    <!--<fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/core/WEB-INF/lib"
+                                            includes="**/*.jar" /> -->
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/lib/patches" includes="**/*.jar" />
                                 </signjar>
 				</then>
 				</if>
@@ -208,21 +184,17 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                 <property name="db.dir" value="target/samples/database"/>
-                                 <property name="userid" value="wso2ds"/>
-                                 <property name="password" value="wso2ds"/>
-                                 <property name="dbURL"
-                                     value="jdbc:h2:file:${basedir}/${db.dir}/DATA_SERV_SAMP2"/>
+                                 <property name="db.dir" value="target/samples/database" />
+                                 <property name="userid" value="wso2ds" />
+                                 <property name="password" value="wso2ds" />
+                                 <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DATA_SERV_SAMP2" />
 
-                                 <sql driver="org.h2.Driver"
-                                    url="${dbURL}"
-                                    userid="${userid}" password="${password}"
-                                    autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
+                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
 
-                                  <fileset file="${basedir}/../samples/sql/h2/CreateTables2.sql"/>
+                                  <fileset file="${basedir}/../samples/sql/h2/CreateTables2.sql" />
                                 </sql>
                             </tasks>
                         </configuration>
@@ -233,7 +205,7 @@
                        <phase>clean</phase>
                        <configuration>
                            <tasks>
-                               <delete dir="src/site/xdoc"/>
+                               <delete dir="src/site/xdoc" />
                             </tasks>
                        </configuration>
                    </execution>
@@ -246,96 +218,95 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property name="tempdir" value="target/docs-temp"/>
-                                <mkdir dir="${tempdir}"/>
+                                <property name="tempdir" value="target/docs-temp" />
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="${pom.artifactId}-${product.dss.version}.zip"/>
+                                        <include name="${pom.artifactId}-${product.dss.version}.zip" />
                                     </fileset>
                                 </unzip>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false">
                                     <fileset dir="${tempdir}/${pom.artifactId}-${product.dss.version}/repository/components/">
                                     </fileset>
                                 </copy>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/bin"
-                                      overwrite="true">
-                                    <fileset dir="bin"/>
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/bin" overwrite="true">
+                                    <fileset dir="bin" />
                                 </copy>
-                                <delete file="target/${pom.artifactId}-${product.dss.version}.zip"/>
-                                <delete dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}"/>
+                                <delete file="target/${pom.artifactId}-${product.dss.version}.zip" />
+                                <delete dir="${tempdir}" />
+                                <mkdir dir="${tempdir}" />
                                 <!--<unzip dest="${tempdir}">
                                     <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/webapps/ROOT/WEB-INF/plugins/">
-                                        <include name="*.ui*.jar"/>
+                                        <include name="*.ui*.jar" />
                                     </fileset>
                                 </unzip>-->
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins">
-                                        <include name="*.ui*.jar"/>
+                                        <include name="*.ui*.jar" />
                                     </fileset>
                                 </unzip>
                                 <move todir="${tempdir}/web/" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web/">
-					<include name="*/docs/**"/>
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <exclude name="**/signin_userguide.html"/>
-					<exclude name="**/about.html"/>
-					<exclude name="**/*.html"/>
-					<exclude name="**/editarea/**"/>
-                                        <exclude name="**/codepress/**"/>
-                                        <exclude name="**/dswizard/**"/>
-                                        <exclude name="**/dashboard/**"/>
+					<include name="*/docs/**" />
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <exclude name="**/signin_userguide.html" />
+					<exclude name="**/about.html" />
+					<exclude name="**/*.html" />
+					<exclude name="**/editarea/**" />
+                                        <exclude name="**/codepress/**" />
+                                        <exclude name="**/dswizard/**" />
+                                        <exclude name="**/dashboard/**" />
                                     </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">
                                     <fileset dir="${tempdir}/web">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-					                    <exclude name="**/editarea/**"/>
-                                        <exclude name="**/codepress/**"/>
-                                        <exclude name="**/dswizard/**"/>
-                                        <exclude name="**/dashboard/**"/>
-                                        <exclude name="**/*.html"/>
-                                        <exclude name="**/*.js"/>
-                                        <exclude name="**/*.jsp"/>
-                                        <exclude name="**/*.xsl"/>
-                                        <exclude name="*.*"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+					                    <exclude name="**/editarea/**" />
+                                        <exclude name="**/codepress/**" />
+                                        <exclude name="**/dswizard/**" />
+                                        <exclude name="**/dashboard/**" />
+                                        <exclude name="**/*.html" />
+                                        <exclude name="**/*.js" />
+                                        <exclude name="**/*.jsp" />
+                                        <exclude name="**/*.xsl" />
+                                        <exclude name="*.*" />
                                     </fileset>
                                 </copy>
                                 <copy todir="src/site" overwrite="false" includeemptydirs="false">
                                     <fileset dir="../../docs">
-					                    <exclude name="**/images/**/*.*"/>
-                                        <exclude name="**/user-mgt-actdir.xml"/>
-                                        <exclude name="**/user-mgt-jdbc.xml"/>
-                                        <exclude name="**/user-mgt-ldap.xml"/>
-					                    <exclude name="**/*.html"/>
+					                    <exclude name="**/images/**/*.*" />
+                                        <exclude name="**/user-mgt-actdir.xml" />
+                                        <exclude name="**/user-mgt-jdbc.xml" />
+                                        <exclude name="**/user-mgt-ldap.xml" />
+					                    <exclude name="**/*.html" />
                                     </fileset>
 				                    <filterset>
-                                        <filter token="buildNumber" value="${buildNumber}"/>
+                                        <filter token="buildNumber" value="${buildNumber}" />
                                     </filterset>                        
                                 </copy>
                                 <copy todir="src/site" overwrite="false" includeemptydirs="false">
                                     <fileset dir="../../docs">
-                                        <include name="**/images/**/*.*"/>
-					                    <exclude name="**/user-mgt-actdir.xml"/>
-                                        <exclude name="**/user-mgt-jdbc.xml"/>
-                                        <exclude name="**/user-mgt-ldap.xml"/>
+                                        <include name="**/images/**/*.*" />
+					                    <exclude name="**/user-mgt-actdir.xml" />
+                                        <exclude name="**/user-mgt-jdbc.xml" />
+                                        <exclude name="**/user-mgt-ldap.xml" />
                                     </fileset>				    
                                 </copy>
 				                    <filterset>
-                                        <filter token="buildNumber" value="${buildNumber}"/>
+                                        <filter token="buildNumber" value="${buildNumber}" />
                                     </filterset>
 
                                 <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>
@@ -348,24 +319,15 @@
                         <configuration>
                             <tasks>
                                 <!-- commenting "GetAllRolesOfUserEnabled" property to fix IDENTITY-3489 -->
-                                <echo message="Commenting out property 'GetAllRolesOfUserEnabled' in user-mgt.xml"/>
-                                <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;!-- &lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt; --&gt;"
-                                        />
+                                <echo message="Commenting out property 'GetAllRolesOfUserEnabled' in user-mgt.xml" />
+                                <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;!-- &lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt; --&gt;" />
                                 <!-- Moving identity UI component to "Configure" UI group -->
-                                <echo message="Moving identity-related UI component to 'Configure' in the management console"/>
-                                <property name="tempdir2" value="target/identity-ui"/>
-                                <mkdir dir="${tempdir2}"/>
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar"
-                                       dest="${tempdir2}"/>
-                                <replace
-                                        file="${tempdir2}/META-INF/component.xml"
-                                        token="&lt;parent-menu&gt;identity_menu&lt;/parent-menu&gt;"
-                                        value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;"/>
-                                <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar"
-                                     basedir="${tempdir2}"/>
+                                <echo message="Moving identity-related UI component to 'Configure' in the management console" />
+                                <property name="tempdir2" value="target/identity-ui" />
+                                <mkdir dir="${tempdir2}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar" dest="${tempdir2}" />
+                                <replace file="${tempdir2}/META-INF/component.xml" token="&lt;parent-menu&gt;identity_menu&lt;/parent-menu&gt;" value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;" />
+                                <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar" basedir="${tempdir2}" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -375,16 +337,16 @@
                         <phase>install</phase>
                         <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/wso2dss-${product.dss.version}.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="target/identity-ui"/>
-                                <!--<delete dir="target/samples/database"/>-->
-                                <!--<delete dir="src"/>-->
+                                <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/wso2dss-${product.dss.version}.jar" />
+                                <delete dir="target/sources" />
+                                <delete dir="target/site" />
+                                <delete dir="target/identity-ui" />
+                                <!--<delete dir="target/samples/database" />-->
+                                <!--<delete dir="src" />-->
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 0a69559..ec25468 100755
--- a/modules/features/pom.xml
+++ b/modules/features/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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 	
diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
index 8d59f6d..e9e8583 100755
--- a/modules/features/product/pom.xml
+++ b/modules/features/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.dss</groupId>
     	<artifactId>dataservices-features-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.dss.dashboard.ui.feature/pom.xml b/modules/features/service/org.wso2.stratos.dss.dashboard.ui.feature/pom.xml
index 0f9673e..677b624 100755
--- a/modules/features/service/org.wso2.stratos.dss.dashboard.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.dss.dashboard.ui.feature/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.dss</groupId>
         <artifactId>wso2stratos-dss-features</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.dss.login.ui.feature/pom.xml b/modules/features/service/org.wso2.stratos.dss.login.ui.feature/pom.xml
index 6b5f4ce..9abccba 100755
--- a/modules/features/service/org.wso2.stratos.dss.login.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.dss.login.ui.feature/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.dss</groupId>
         <artifactId>wso2stratos-dss-features</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.dss.styles.feature/pom.xml b/modules/features/service/org.wso2.stratos.dss.styles.feature/pom.xml
index eef4038..a127582 100755
--- a/modules/features/service/org.wso2.stratos.dss.styles.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.dss.styles.feature/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.dss</groupId>
     	<artifactId>wso2stratos-dss-features</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/pom.xml b/modules/features/service/pom.xml
index 754257d..c4892b7 100755
--- a/modules/features/service/pom.xml
+++ b/modules/features/service/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.dss</groupId>
     	<artifactId>dataservices-features-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 72427ac..c1d608d 100755
--- a/modules/integration/pom.xml
+++ b/modules/integration/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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.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 8bddf51..6d5e304 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -1,10 +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.dss</groupId>
       <artifactId>dss-integration-tests-common</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.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 51e023b..57e4234 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -1,10 +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.dss</groupId>
       <artifactId>dss-integration-tests-common</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 9b0ddf7..3da044a 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/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.dss</groupId>
         <artifactId>integration</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.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 5ea279a..fbb4969 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/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.dss</groupId>
         <artifactId>dss-integration-tests-common</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index f525a33..e52dcd1 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/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.dss</groupId>
         <artifactId>integration</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/tests/pom.xml b/modules/integration/tests-integration/tests/pom.xml
index 02c6ec5..da559db 100644
--- a/modules/integration/tests-integration/tests/pom.xml
+++ b/modules/integration/tests-integration/tests/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.dss</groupId>
         <artifactId>dss-integration-tests</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml
index b661c16..07f1374 100644
--- a/modules/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/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.dss</groupId>
         <artifactId>integration</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.stratos.dss.dashboard.ui/pom.xml b/modules/org.wso2.stratos.dss.dashboard.ui/pom.xml
index b58c1a1..375fd6a 100755
--- a/modules/org.wso2.stratos.dss.dashboard.ui/pom.xml
+++ b/modules/org.wso2.stratos.dss.dashboard.ui/pom.xml
@@ -13,13 +13,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/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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.stratos.dss.login.ui/pom.xml b/modules/org.wso2.stratos.dss.login.ui/pom.xml
index d3007fc..5be3e88 100755
--- a/modules/org.wso2.stratos.dss.login.ui/pom.xml
+++ b/modules/org.wso2.stratos.dss.login.ui/pom.xml
@@ -1,125 +1,123 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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">
-    <parent>
-        <groupId>org.wso2.dss</groupId>
-        <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.stratos.dss.login.ui</artifactId>
-    <!--<version>${stratos.version}</version>-->
-    <packaging>bundle</packaging>
-    <name>WSO2 Stratos DSS - Login User Interface</name>
-
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-	    
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/generated-code/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Import-Package>
-                            javax.servlet; version=2.4,
-                            javax.servlet.http; version=2.4.0,
-                            org.apache.lucene.*,
-                            *;resolution:=optional
-                        </Import-Package>
-                        <!--<Fragment-Host>org.wso2.carbon.ui</Fragment-Host>-->
-                        <Carbon-Component>UIBundle</Carbon-Component>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>commons-logging</groupId>-->
-            <!--<artifactId>commons-logging</artifactId>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-        </dependency>       
-    </dependencies>
-</project>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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">
+    <parent>
+        <groupId>org.wso2.dss</groupId>
+        <artifactId>dataservices-parent</artifactId>
+        <version>3.5.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.stratos.dss.login.ui</artifactId>
+    <!--<version>${stratos.version}</version>-->
+    <packaging>bundle</packaging>
+    <name>WSO2 Stratos DSS - Login User Interface</name>
+
+    <build>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+	    
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/generated-code/src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Import-Package>
+                            javax.servlet; version=2.4,
+                            javax.servlet.http; version=2.4.0,
+                            org.apache.lucene.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <!--<Fragment-Host>org.wso2.carbon.ui</Fragment-Host>-->
+                        <Carbon-Component>UIBundle</Carbon-Component>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>commons-logging</groupId>-->
+            <!--<artifactId>commons-logging</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2.wso2</groupId>
+            <artifactId>axis2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+            <artifactId>axiom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.core</artifactId>
+        </dependency>       
+    </dependencies>
+</project>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index fbbda02..8324acf 100755
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -1011,9 +1009,8 @@
                         <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>
                             </tasks>
                         </configuration>
diff --git a/modules/samples/clients/pom.xml b/modules/samples/clients/pom.xml
index 1c19d9d..c0c62eb 100755
--- a/modules/samples/clients/pom.xml
+++ b/modules/samples/clients/pom.xml
@@ -1,182 +1,156 @@
-<!--
-  ~ Copyright 2005-2007 WSO2, Inc. (http://wso2.com)
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ 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">
-
-    <parent>
-	    <groupId>org.wso2.dss</groupId>
-        <artifactId>dataservices-samples-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dataservice-client-samples</artifactId>
-    <packaging>jar</packaging>
-    <name>DataServices Clients</name>
-    <description>Clients in WSO2 DataServices</description>
-
-    <build>
-       <sourceDirectory>src</sourceDirectory>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-           
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-code</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/RDBMSSample.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.rdbms_sample
-                                      -ns2p http://ws.wso2.org/dataservice/rdbms_sample1=org.wso2.carbon.dataservices.samples.types.rdbms_sample"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/DTPSampleService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.dtp_sample
-                                      -ns2p http://ws.wso2.org/dataservice/dtp_sample=org.wso2.carbon.dataservices.samples.types.dtp_sample"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/NestedQuerySample.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.nested_query_sample
-                                      -ns2p http://ws.wso2.org/dataservice/nested_query_sample=org.wso2.carbon.dataservices.samples.types.nested_query_sample"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/FileService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.file_service
-                                      -ns2p http://ws.wso2.org/dataservice/file_service=org.wso2.carbon.dataservices.samples.types.file_service"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/EventingSample.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.eventing_sample
-                                      -ns2p http://ws.wso2.org/dataservice/eventing_sample=org.wso2.carbon.dataservices.samples.types.eventing_sample"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/BatchRequestSample.wsdl -u
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.batch_request_sample
-                                      -ns2p http://ws.wso2.org/dataservice/batch_request_sample=org.wso2.carbon.dataservices.samples.types.batch_request_sample"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/CSVSampleService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.csv_sample_service
-                                      -ns2p http://ws.wso2.org/dataservice/csv_sample_service=org.wso2.carbon.dataservices.samples.types.csv_sample_service"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/ExcelSampleService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.excel_sample_service
-                                      -ns2p http://ws.wso2.org/dataservice/excel_sample_service=org.wso2.carbon.dataservices.samples.types.excel_sample_service"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/GSpreadSample.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.gspread_sample_service
-                                      -ns2p http://ws.wso2.org/dataservice/gspread_sample_service2=org.wso2.carbon.dataservices.samples.types.gspread_sample_service"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                      <arg line="-uri wsdl/SecureDataService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.secure_dataservice
-                                      -ns2p http://ws.wso2.org/dataservice/secure_dataservice=org.wso2.carbon.dataservices.samples.types.secure_dataservice"/>
-                                      <classpath refid="maven.dependency.classpath"/>
-                                      <classpath refid="maven.compile.classpath"/>
-                                      <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri wsdl/FaultDBService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.fault_dataservice
-                                      -ns2p http://ws.wso2.org/dataservice/fault_dataservice=org.wso2.carbon.dataservices.samples.types.fault_dataservice"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
-                                    <arg line="-uri wsdl/RDFSampleService.wsdl -u -uw
-                                      -o target/generated -p org.wso2.carbon.dataservices.samples.rdf_dataservice
-                                      -ns2p http://ws.wso2.org/dataservice/rdf_dataservice=org.wso2.carbon.dataservices.samples.types.rdf_dataservice"/>
-                                    <classpath refid="maven.dependency.classpath"/>
-                                    <classpath refid="maven.compile.classpath"/>
-                                    <classpath refid="maven.runtime.classpath"/>
-                                </java>
-                              </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${basedir}/target/generated/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-	    </plugin>
-
-       </plugins>
-    </build>
-
-</project>
+<!--
+  ~ Copyright 2005-2007 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ 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">
+
+    <parent>
+	    <groupId>org.wso2.dss</groupId>
+        <artifactId>dataservices-samples-parent</artifactId>
+        <version>3.5.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dataservice-client-samples</artifactId>
+    <packaging>jar</packaging>
+    <name>DataServices Clients</name>
+    <description>Clients in WSO2 DataServices</description>
+
+    <build>
+       <sourceDirectory>src</sourceDirectory>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+           
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>generate-code</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/RDBMSSample.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.rdbms_sample                                       -ns2p http://ws.wso2.org/dataservice/rdbms_sample1=org.wso2.carbon.dataservices.samples.types.rdbms_sample" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/DTPSampleService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.dtp_sample                                       -ns2p http://ws.wso2.org/dataservice/dtp_sample=org.wso2.carbon.dataservices.samples.types.dtp_sample" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/NestedQuerySample.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.nested_query_sample                                       -ns2p http://ws.wso2.org/dataservice/nested_query_sample=org.wso2.carbon.dataservices.samples.types.nested_query_sample" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/FileService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.file_service                                       -ns2p http://ws.wso2.org/dataservice/file_service=org.wso2.carbon.dataservices.samples.types.file_service" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/EventingSample.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.eventing_sample                                       -ns2p http://ws.wso2.org/dataservice/eventing_sample=org.wso2.carbon.dataservices.samples.types.eventing_sample" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/BatchRequestSample.wsdl -u -o target/generated -p org.wso2.carbon.dataservices.samples.batch_request_sample                                       -ns2p http://ws.wso2.org/dataservice/batch_request_sample=org.wso2.carbon.dataservices.samples.types.batch_request_sample" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/CSVSampleService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.csv_sample_service                                       -ns2p http://ws.wso2.org/dataservice/csv_sample_service=org.wso2.carbon.dataservices.samples.types.csv_sample_service" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/ExcelSampleService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.excel_sample_service                                       -ns2p http://ws.wso2.org/dataservice/excel_sample_service=org.wso2.carbon.dataservices.samples.types.excel_sample_service" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/GSpreadSample.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.gspread_sample_service                                       -ns2p http://ws.wso2.org/dataservice/gspread_sample_service2=org.wso2.carbon.dataservices.samples.types.gspread_sample_service" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                      <arg line="-uri wsdl/SecureDataService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.secure_dataservice                                       -ns2p http://ws.wso2.org/dataservice/secure_dataservice=org.wso2.carbon.dataservices.samples.types.secure_dataservice" />
+                                      <classpath refid="maven.dependency.classpath" />
+                                      <classpath refid="maven.compile.classpath" />
+                                      <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                    <arg line="-uri wsdl/FaultDBService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.fault_dataservice                                       -ns2p http://ws.wso2.org/dataservice/fault_dataservice=org.wso2.carbon.dataservices.samples.types.fault_dataservice" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+                                </java>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                    <arg line="-uri wsdl/RDFSampleService.wsdl -u -uw -o target/generated -p org.wso2.carbon.dataservices.samples.rdf_dataservice                                       -ns2p http://ws.wso2.org/dataservice/rdf_dataservice=org.wso2.carbon.dataservices.samples.types.rdf_dataservice" />
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+                                </java>
+                              </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/target/generated/src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+	    </plugin>
+
+       </plugins>
+    </build>
+
+</project>
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index d216674..b146c13 100755
--- 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.dss</groupId>
         <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 	
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index ea24038..be84982 100755
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -1,47 +1,45 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  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">
-
-    <parent>
-        <groupId>org.wso2.dss</groupId>
-        <artifactId>dataservices-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-	
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dataservices-styles-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 DataServices Styles Parent</name>
-    <url>http://wso2.org/projects/solutions/data-services/java</url>
-    <description>WSO2 Data Services Server Styles Parent</description>
-
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <modules>
-        <module>product</module>
-        <module>service</module>
-    </modules>
-</project>
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  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">
+
+    <parent>
+        <groupId>org.wso2.dss</groupId>
+        <artifactId>dataservices-parent</artifactId>
+        <version>3.5.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+	
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dataservices-styles-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 DataServices Styles Parent</name>
+    <url>http://wso2.org/projects/solutions/data-services/java</url>
+    <description>WSO2 Data Services Server Styles Parent</description>
+
+    <licenses>
+        <license>
+            <name>Apache License Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <modules>
+        <module>product</module>
+        <module>service</module>
+    </modules>
+</project>
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index d518342..4bf05df 100755
--- 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.dss</groupId>
         <artifactId>dataservices-styles-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/service/pom.xml b/modules/styles/service/pom.xml
index 4f6662e..4817f18 100755
--- a/modules/styles/service/pom.xml
+++ b/modules/styles/service/pom.xml
@@ -1,114 +1,112 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  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">
-
-    <parent>
-        <groupId>org.wso2.dss</groupId>
-        <artifactId>dataservices-styles-parent</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.stratos.dss.styles</artifactId>
-    <!--<version>${stratos.version}</version>-->
-    <packaging>bundle</packaging>
-    <name>WSO2 Stratos DSS - UI styles</name>
-    <url>http://wso2.org</url>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${product.dss.version}</Bundle-Version>
-                        <Import-Package>
-                            org.osgi.framework,
-                            org.osgi.service.http,
-                            org.wso2.carbon.ui,
-                            javax.servlet.*;version="2.4",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Fragment-Host>org.wso2.carbon.ui</Fragment-Host>
-                        <!--<Carbon-Component>UIBundle</Carbon-Component>-->
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.http.servlet</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.http.helper</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>javax.servlet.jsp</artifactId>
-        </dependency>
-    </dependencies>
-</project>
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  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">
+
+    <parent>
+        <groupId>org.wso2.dss</groupId>
+        <artifactId>dataservices-styles-parent</artifactId>
+        <version>3.5.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.stratos.dss.styles</artifactId>
+    <!--<version>${stratos.version}</version>-->
+    <packaging>bundle</packaging>
+    <name>WSO2 Stratos DSS - UI styles</name>
+    <url>http://wso2.org</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${product.dss.version}</Bundle-Version>
+                        <Import-Package>
+                            org.osgi.framework,
+                            org.osgi.service.http,
+                            org.wso2.carbon.ui,
+                            javax.servlet.*;version="2.4",
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Fragment-Host>org.wso2.carbon.ui</Fragment-Host>
+                        <!--<Carbon-Component>UIBundle</Carbon-Component>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.ui</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.main</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.http.helper</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>javax.servlet.jsp</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index c22dc9b..996a5b1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,7 @@
  ~ 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</groupId>
@@ -29,7 +27,7 @@
     <groupId>org.wso2.dss</groupId>
     <artifactId>dataservices-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.5.0</version>
     <name>WSO2 DataServices Parent</name>
     <url>http://wso2.org/projects/solutions/data-services/java</url>
     <description>WSO2 Data Services Server</description>
@@ -45,7 +43,7 @@
         <url>https://github.com/wso2/product-dss.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-dss.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-dss.git</connection>
-        <tag>HEAD</tag>
+        <tag>v3.5.0-RC2</tag>
     </scm>
 
 
@@ -603,7 +601,7 @@
     </issueManagement>
 
     <properties>
-        <product.dss.version>3.5.0-SNAPSHOT</product.dss.version>
+        <product.dss.version>3.5.0</product.dss.version>
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.commons.ndatasource.version>4.5.0</carbon.commons.ndatasource.version>
         <carbon.commons.ntask.version>4.4.3</carbon.commons.ntask.version> <!-- todo check and remove this - rajith -->