From 1d81f7f3d04bf1476041e526a774691b3c143f7d Mon Sep 17 00:00:00 2001
From: WSO2 Builder <builder@wso2.org>
Date: Tue, 23 Aug 2016 11:21:07 +0000
Subject: [PATCH] [maven-release-plugin] prepare release v3.6.0-RC1

---
 modules/distribution/pom.xml                  | 380 +++++++-----------
 modules/features/pom.xml                      |   2 +-
 .../org.wso2.bps.processtools.feature/pom.xml |   2 +-
 .../pom.xml                                   |   2 +-
 .../org.wso2.bps.styles.feature/pom.xml       |   2 +-
 modules/features/product/pom.xml              |   2 +-
 .../pom.xml                                   |   2 +-
 modules/features/service/pom.xml              |   4 +-
 modules/integration/pom.xml                   |   2 +-
 .../tests-common/admin-clients/pom.xml        |   2 +-
 .../integration-test-utils/pom.xml            |   2 +-
 .../integration/tests-common/ui-pages/pom.xml |   2 +-
 .../tests-integration/bpel/pom.xml            |   2 +-
 .../tests-integration/bpmn/pom.xml            |   2 +-
 .../tests-integration/humantasks/pom.xml      |   2 +-
 .../tests-integration/reports/pom.xml         |   2 +-
 .../taskcoordination/pom.xml                  |   2 +-
 .../integration/tests-patches/bpel/pom.xml    |   2 +-
 .../pom.xml                                   |   4 +-
 modules/p2-profile-gen/pom.xml                |   2 +-
 modules/samples/pom.xml                       |   2 +-
 .../product/bpel-eventlistener/pom.xml        |   2 +-
 .../product/bpel-logger-extension/pom.xml     |   2 +-
 .../product/bpel-property-reader/pom.xml      |   2 +-
 .../samples/product/bpmn-sample-jars/pom.xml  |   2 +-
 .../product/humantask-eventlistener/pom.xml   |   2 +-
 .../product/humantask-ui-webapp/pom.xml       |   2 +-
 modules/samples/product/pom.xml               |   2 +-
 modules/samples/product/process-tools/pom.xml |   2 +-
 modules/samples/product/sample-client/pom.xml |   2 +-
 modules/samples/product/sample-utils/pom.xml  |   2 +-
 modules/services/CreditRatingService/pom.xml  |   2 +-
 modules/services/UserService/pom.xml          |   2 +-
 modules/services/pom.xml                      |   2 +-
 modules/styles/pom.xml                        |   2 +-
 modules/styles/product/pom.xml                |   2 +-
 pom.xml                                       |   9 +-
 37 files changed, 185 insertions(+), 278 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 962bd33d..73bba161 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -15,18 +15,17 @@
  ~ 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.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2bps</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
     <name>WSO2 BPS - Distribution</name>
     <description>WSO2 Business Process Server Distribution</description>
@@ -253,53 +252,50 @@
                         </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="${project.artifactId}-${project.version}.zip"/>
+                                        <include name="${project.artifactId}-${project.version}.zip" />
                                     </fileset>
                                 </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
-                                      overwrite="true">
-                                    <fileset
-                                            dir="${tempdir}/${project.artifactId}-${project.version}/repository/components">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
+                                    <fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components">
                                     </fileset>
                                 </copy>
-                                <delete file="target/${project.artifactId}-${project.version}.zip"/>
-                                <delete dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}"/>
+                                <delete file="target/${project.artifactId}-${project.version}.zip" />
+                                <delete dir="${tempdir}" />
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
-                                        <include name="*.ui*.jar"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
+                                        <include name="*.ui*.jar" />
                                     </fileset>
                                 </unzip>
                                 <move todir="${tempdir}/web/" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web/">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <include name="**/*.html"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <include name="**/*.html" />
                                     </fileset>
-                                    <mapper type="glob" from="*.html" to="*.xml"/>
+                                    <mapper type="glob" from="*.html" to="*.xml" />
                                 </move>
-                                <mkdir dir="src/site/xdoc"/>
+                                <mkdir dir="src/site/xdoc" />
                                 <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="**/*.html"/>
-                                        <exclude name="**/*.js"/>
-                                        <exclude name="**/*.jsp"/>
-                                        <exclude name="**/*.xsl"/>
-                                        <exclude name="**/codepress.xml"/>
-                                        <exclude name="**/template.xml"/>
-                                        <exclude name="*.*"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <exclude name="**/*.html" />
+                                        <exclude name="**/*.js" />
+                                        <exclude name="**/*.jsp" />
+                                        <exclude name="**/*.xsl" />
+                                        <exclude name="**/codepress.xml" />
+                                        <exclude name="**/template.xml" />
+                                        <exclude name="*.*" />
                                     </fileset>
                                 </copy>
-                                <delete dir="${tempdir}"/>
+                                <delete dir="${tempdir}" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -311,170 +307,98 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <echo message="######## Creating BPEL / HumanTask Archives. #########"/>
-                                <property name="tempdir" value="target/samples"/>
-                                <property name="bpelSampleDir" value="target/samples/bpel"/>
-                                <property name="humantaskSampleDir" value="target/samples/humantask"/>
-                                <property name="bpmnSampleDir" value="target/samples/bpmn"/>
-                                <mkdir dir="${tempdir}"/>
-                                <mkdir dir="${bpelSampleDir}"/>
-                                <mkdir dir="${humantaskSampleDir}"/>
-                                <mkdir dir="${bpmnSampleDir}"/>
-                                <zip destfile="target/samples/bpel/CustomerInfo.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CustomerInfo"/>
-                                <zip destfile="target/samples/bpel/LoanProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/LoanProcess"/>
-                                <zip destfile="target/samples/bpel/LoanService.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/LoanService"/>
-                                <zip destfile="target/samples/bpel/AttachmentHandlingProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AttachmentHandlingProcess"/>
-                                <zip destfile="target/samples/bpel/CreditRating.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CreditRating"/>
-                                <zip destfile="target/samples/bpel/CleanUpSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CleanUpSample"/>
-                                <zip destfile="target/samples/bpel/FlexibleAssign.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/FlexibleAssign"/>
-                                <zip destfile="target/samples/bpel/helloHeaderSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/helloHeaderSample"/>
-                                <zip destfile="target/samples/bpel/HelloWorld2.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/HelloWorld2"/>
-                                <zip destfile="target/samples/bpel/MyRoleMexTestProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/MyRoleMexTestProcess"/>
-                                <zip destfile="target/samples/bpel/RPCClientProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RPCClientProcess"/>
-                                <zip destfile="target/samples/bpel/RPCServiceProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RPCServiceProcess"/>
-                                <zip destfile="target/samples/bpel/FlightReservationProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleCompensationHandlers/FlightReservationProcess/"/>
-                                <zip destfile="target/samples/bpel/SampleEventHandler.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleEventHandlers"/>
-                                <zip destfile="target/samples/bpel/AdderProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/AdderProcess/"/>
-                                <zip destfile="target/samples/bpel/DivisionProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/DivisionProcess/"/>
-                                <zip destfile="target/samples/bpel/FaultHandlingSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/FaultHandlingSample/"/>
-                                <zip destfile="target/samples/bpel/Async-Client.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Client/"/>
-                                <zip destfile="target/samples/bpel/Async-Server.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Server/"/>
-                                <zip destfile="target/samples/bpel/SecurePartnerBPEL.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SecurePartnerBPEL"/>
-                                <zip destfile="target/samples/bpel/Alarm.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/Alarm"/>
-                                <zip destfile="target/samples/bpel/AssignActivity.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AssignActivity"/>
-                                <zip destfile="target/samples/bpel/AssignDate.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AssignDate"/>
-                                <zip destfile="target/samples/bpel/CombineUrl.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CombineUrl"/>
-                                <zip destfile="target/samples/bpel/ComposeUrl.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ComposeUrl"/>
-                                <zip destfile="target/samples/bpel/CorrelationUnique.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CorrelationUnique"/>
-                                <zip destfile="target/samples/bpel/CorrelationWithAttribute.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CorrelationWithAttribute"/>
-                                <zip destfile="target/samples/bpel/E4XDirect.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/E4XDirect"/>
-                                <zip destfile="target/samples/bpel/ExpandTemplate.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ExpandTemplate"/>
-                                <zip destfile="target/samples/bpel/FlowLinks.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/FlowLinks"/>
-                                <zip destfile="target/samples/bpel/ForEach.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ForEach"/>
-                                <zip destfile="target/samples/bpel/IfCondition.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/IfCondition"/>
-                                <zip destfile="target/samples/bpel/IgnoreMissingFromData.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/IgnoreMissingFromData"/>
-                                <zip destfile="target/samples/bpel/PickOneWay.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/PickOneWay"/>
-                                <zip destfile="target/samples/bpel/ProcessProperties.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ProcessProperties"/>
-                                <zip destfile="target/samples/bpel/PubSubInProc.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/PubSubInProc"/>
-                                <zip destfile="target/samples/bpel/RepeatUntil.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RepeatUntil"/>
-                                <zip destfile="target/samples/bpel/RESTProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RESTProcess"/>
-                                <zip destfile="target/samples/bpel/Split.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/Split"/>
-                                <zip destfile="target/samples/bpel/ThrowCatchFaultHandling.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ThrowCatchFaultHandling"/>
-                                <zip destfile="target/samples/bpel/While.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/While"/>
-                                <zip destfile="target/samples/bpel/XslTransform.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/XslTransform"/>
-                                <zip destfile="target/samples/bpel/ClaimsApprovalProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ClaimsApprovalProcess"/>
-                                <zip destfile="target/samples/bpel/DynPartner.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/DynPartner"/>
-                                <zip destfile="target/samples/bpel/XMLAttributeProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/XMLAttributeProcess"/>
-                                <zip destfile="target/samples/bpel/Async-Server.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Server"/>
-                                <zip destfile="target/samples/bpel/Async-Client.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Client"/>
-                                <zip destfile="target/samples/bpel/SecuredWithServiceDescriptorProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SecuredWithServiceDescriptorProcess"/>
-                                <zip destfile="target/samples/bpel/KPISample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/KPISample"/>
-                                <zip destfile="target/samples/bpel/AdminServiceInvokeSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AdminServiceInvokeSample"/>
-                                <zip destfile="target/samples/bpel/AbstractHeaderSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AbstractHeaderSample"/>
-                                <zip destfile="target/samples/bpel/SoapHeaderBasedCorrelationSample.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SoapHeaderBasedCorrelation"/>
-                                <zip destfile="target/samples/bpel/UserRestProcess.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/UserRestProcess"/>
+                                <echo message="######## Creating BPEL / HumanTask Archives. #########" />
+                                <property name="tempdir" value="target/samples" />
+                                <property name="bpelSampleDir" value="target/samples/bpel" />
+                                <property name="humantaskSampleDir" value="target/samples/humantask" />
+                                <property name="bpmnSampleDir" value="target/samples/bpmn" />
+                                <mkdir dir="${tempdir}" />
+                                <mkdir dir="${bpelSampleDir}" />
+                                <mkdir dir="${humantaskSampleDir}" />
+                                <mkdir dir="${bpmnSampleDir}" />
+                                <zip destfile="target/samples/bpel/CustomerInfo.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CustomerInfo" />
+                                <zip destfile="target/samples/bpel/LoanProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/LoanProcess" />
+                                <zip destfile="target/samples/bpel/LoanService.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/LoanService" />
+                                <zip destfile="target/samples/bpel/AttachmentHandlingProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AttachmentHandlingProcess" />
+                                <zip destfile="target/samples/bpel/CreditRating.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CreditRating" />
+                                <zip destfile="target/samples/bpel/CleanUpSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CleanUpSample" />
+                                <zip destfile="target/samples/bpel/FlexibleAssign.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/FlexibleAssign" />
+                                <zip destfile="target/samples/bpel/helloHeaderSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/helloHeaderSample" />
+                                <zip destfile="target/samples/bpel/HelloWorld2.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/HelloWorld2" />
+                                <zip destfile="target/samples/bpel/MyRoleMexTestProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/MyRoleMexTestProcess" />
+                                <zip destfile="target/samples/bpel/RPCClientProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RPCClientProcess" />
+                                <zip destfile="target/samples/bpel/RPCServiceProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RPCServiceProcess" />
+                                <zip destfile="target/samples/bpel/FlightReservationProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleCompensationHandlers/FlightReservationProcess/" />
+                                <zip destfile="target/samples/bpel/SampleEventHandler.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleEventHandlers" />
+                                <zip destfile="target/samples/bpel/AdderProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/AdderProcess/" />
+                                <zip destfile="target/samples/bpel/DivisionProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/DivisionProcess/" />
+                                <zip destfile="target/samples/bpel/FaultHandlingSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleFaultHandler/FaultHandlingSample/" />
+                                <zip destfile="target/samples/bpel/Async-Client.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Client/" />
+                                <zip destfile="target/samples/bpel/Async-Server.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Server/" />
+                                <zip destfile="target/samples/bpel/SecurePartnerBPEL.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SecurePartnerBPEL" />
+                                <zip destfile="target/samples/bpel/Alarm.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/Alarm" />
+                                <zip destfile="target/samples/bpel/AssignActivity.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AssignActivity" />
+                                <zip destfile="target/samples/bpel/AssignDate.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AssignDate" />
+                                <zip destfile="target/samples/bpel/CombineUrl.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CombineUrl" />
+                                <zip destfile="target/samples/bpel/ComposeUrl.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ComposeUrl" />
+                                <zip destfile="target/samples/bpel/CorrelationUnique.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CorrelationUnique" />
+                                <zip destfile="target/samples/bpel/CorrelationWithAttribute.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/CorrelationWithAttribute" />
+                                <zip destfile="target/samples/bpel/E4XDirect.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/E4XDirect" />
+                                <zip destfile="target/samples/bpel/ExpandTemplate.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ExpandTemplate" />
+                                <zip destfile="target/samples/bpel/FlowLinks.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/FlowLinks" />
+                                <zip destfile="target/samples/bpel/ForEach.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ForEach" />
+                                <zip destfile="target/samples/bpel/IfCondition.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/IfCondition" />
+                                <zip destfile="target/samples/bpel/IgnoreMissingFromData.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/IgnoreMissingFromData" />
+                                <zip destfile="target/samples/bpel/PickOneWay.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/PickOneWay" />
+                                <zip destfile="target/samples/bpel/ProcessProperties.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ProcessProperties" />
+                                <zip destfile="target/samples/bpel/PubSubInProc.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/PubSubInProc" />
+                                <zip destfile="target/samples/bpel/RepeatUntil.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RepeatUntil" />
+                                <zip destfile="target/samples/bpel/RESTProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/RESTProcess" />
+                                <zip destfile="target/samples/bpel/Split.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/Split" />
+                                <zip destfile="target/samples/bpel/ThrowCatchFaultHandling.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ThrowCatchFaultHandling" />
+                                <zip destfile="target/samples/bpel/While.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/While" />
+                                <zip destfile="target/samples/bpel/XslTransform.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/XslTransform" />
+                                <zip destfile="target/samples/bpel/ClaimsApprovalProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/ClaimsApprovalProcess" />
+                                <zip destfile="target/samples/bpel/DynPartner.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/DynPartner" />
+                                <zip destfile="target/samples/bpel/XMLAttributeProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/XMLAttributeProcess" />
+                                <zip destfile="target/samples/bpel/Async-Server.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Server" />
+                                <zip destfile="target/samples/bpel/Async-Client.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SampleAsynchronousProcess/Async-Client" />
+                                <zip destfile="target/samples/bpel/SecuredWithServiceDescriptorProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SecuredWithServiceDescriptorProcess" />
+                                <zip destfile="target/samples/bpel/KPISample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/KPISample" />
+                                <zip destfile="target/samples/bpel/AdminServiceInvokeSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AdminServiceInvokeSample" />
+                                <zip destfile="target/samples/bpel/AbstractHeaderSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/AbstractHeaderSample" />
+                                <zip destfile="target/samples/bpel/SoapHeaderBasedCorrelationSample.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/SoapHeaderBasedCorrelation" />
+                                <zip destfile="target/samples/bpel/UserRestProcess.zip" basedir="${basedir}/../samples/product/src/main/resources/bpel/2.0/UserRestProcess" />
                                 <!--  Copying Human Tasks Sample -->
 
-                                <zip destfile="target/samples/humantask/ClaimsApprovalTask.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTask"/>
-                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithHTRenderings.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithHTRenderings"/>
-                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithMultipleDomains.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithMultipleDomains"/>
-                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithDeadline.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithDeadline"/>
-                                <zip destfile="target/samples/humantask/HTWithServiceDescriptorANDUnifiedEndpoint.zip"
-                                     basedir="${basedir}/../samples/product/src/main/resources/humantask/HTWithServiceDescriptorANDUnifiedEndpoint"/>
+                                <zip destfile="target/samples/humantask/ClaimsApprovalTask.zip" basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTask" />
+                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithHTRenderings.zip" basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithHTRenderings" />
+                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithMultipleDomains.zip" basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithMultipleDomains" />
+                                <zip destfile="target/samples/humantask/ClaimsApprovalTaskWithDeadline.zip" basedir="${basedir}/../samples/product/src/main/resources/humantask/ClaimsApprovalTaskWithDeadline" />
+                                <zip destfile="target/samples/humantask/HTWithServiceDescriptorANDUnifiedEndpoint.zip" basedir="${basedir}/../samples/product/src/main/resources/humantask/HTWithServiceDescriptorANDUnifiedEndpoint" />
 
                                 <!--  Copying BPMN sample -->
                                 <!-- copy compiled jars of Service tasks target-->
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
                                     <fileset dir="${basedir}/../samples/product/bpmn-sample-jars/target">
-                                        <include name="**/*.jar"/>
+                                        <include name="**/*.jar" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="target/samples/bpmn/SimpleCalculator.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/SimpleCalculator"/>
-                                <zip destfile="target/samples/bpmn/HelloWorld.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/HelloWorld"/>
-                                <zip destfile="target/samples/bpmn/OrderDeliveryProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/OrderDeliveryProcess"/>
-                                <zip destfile="target/samples/bpmn/LoanApprovalProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/LoanApprovalProcess"/>
-                                <zip destfile="target/samples/bpmn/OrderApprovalProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/OrderApprovalProcess"/>
-                                <zip destfile="target/samples/bpmn/TrainTicketValidationProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/TrainTicketValidationProcess"/>
-                                <zip destfile="target/samples/bpmn/VacationRequestProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/VacationRequestProcess"/>
-                                <zip destfile="target/samples/bpmn/CreditApprovalProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/CreditApprovalProcess"/>
-                                <zip destfile="target/samples/bpmn/PizzaOrderProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/PizzaOrderProcess"/>
-                                <zip destfile="target/samples/bpmn/BuyProduct.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/BuyProduct"/>
-                                <zip destfile="target/samples/bpmn/UserTaskCreatorProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/UserTaskCreatorProcess"/>
-                                <zip destfile="target/samples/bpmn/XMLVariableTypeUsageProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/XMLVariableTypeUsageProcess"/>
-                                <zip destfile="target/samples/bpmn/JSONVariableTypeUsageProcess.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/JSONVariableTypeUsageProcess"/>
-                                <zip destfile="target/samples/bpmn/RestClient.bar"
-                                     basedir="${basedir}/../samples/product/src/main/resources/bpmn/RestClient"/>
+                                <zip destfile="target/samples/bpmn/SimpleCalculator.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/SimpleCalculator" />
+                                <zip destfile="target/samples/bpmn/HelloWorld.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/HelloWorld" />
+                                <zip destfile="target/samples/bpmn/OrderDeliveryProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/OrderDeliveryProcess" />
+                                <zip destfile="target/samples/bpmn/LoanApprovalProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/LoanApprovalProcess" />
+                                <zip destfile="target/samples/bpmn/OrderApprovalProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/OrderApprovalProcess" />
+                                <zip destfile="target/samples/bpmn/TrainTicketValidationProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/TrainTicketValidationProcess" />
+                                <zip destfile="target/samples/bpmn/VacationRequestProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/VacationRequestProcess" />
+                                <zip destfile="target/samples/bpmn/CreditApprovalProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/CreditApprovalProcess" />
+                                <zip destfile="target/samples/bpmn/PizzaOrderProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/PizzaOrderProcess" />
+                                <zip destfile="target/samples/bpmn/BuyProduct.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/BuyProduct" />
+                                <zip destfile="target/samples/bpmn/UserTaskCreatorProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/UserTaskCreatorProcess" />
+                                <zip destfile="target/samples/bpmn/XMLVariableTypeUsageProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/XMLVariableTypeUsageProcess" />
+                                <zip destfile="target/samples/bpmn/JSONVariableTypeUsageProcess.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/JSONVariableTypeUsageProcess" />
+                                <zip destfile="target/samples/bpmn/RestClient.bar" basedir="${basedir}/../samples/product/src/main/resources/bpmn/RestClient" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -485,41 +409,25 @@
                             <tasks>
                                 <!-- commenting "GetAllRolesOfUserEnabled" property to fix
                               https://wso2.org/jira/browse/IDENTITY-3489 -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;"
-                                        value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
                                 <!-- Move IS UI to configure menu -->
-                                <property name="tempdir2" value="target/identity-ui"/>
-                                <property name="tempdir3" value="target/identity-user-store"/>
-                                <mkdir dir="${tempdir2}"/>
-                                <mkdir dir="${tempdir3}"/>
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.user.mgt.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.user.mgt.ui_${carbon.identity.version}.jar"
-                                     basedir="${tempdir2}"/>
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${carbon.identity.version}.jar"
-                                       dest="${tempdir3}"/>
-                                <replace file="${tempdir3}/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.user.store.configuration.ui_${carbon.identity.version}.jar"
-                                     basedir="${tempdir3}"/>
-                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-bridge.properties"
-                                        append="true" fixlastline="true">org.restlet.level=SEVERE
+                                <property name="tempdir2" value="target/identity-ui" />
+                                <property name="tempdir3" value="target/identity-user-store" />
+                                <mkdir dir="${tempdir2}" />
+                                <mkdir dir="${tempdir3}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.user.mgt.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.user.mgt.ui_${carbon.identity.version}.jar" basedir="${tempdir2}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${carbon.identity.version}.jar" dest="${tempdir3}" />
+                                <replace file="${tempdir3}/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.user.store.configuration.ui_${carbon.identity.version}.jar" basedir="${tempdir3}" />
+                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-bridge.properties" append="true" fixlastline="true">org.restlet.level=SEVERE
                                 </concat>
-                                <delete dir="${tempdir3}"/>
-                                <delete dir="${tempdir2}"/>
+                                <delete dir="${tempdir3}" />
+                                <delete dir="${tempdir2}" />
                                 <!-- Adding Default Hostname as localhost -->
-                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                         token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;"
-                                         value="&lt;HostName&gt;localhost&lt;/HostName&gt;"/>
-                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
-                                         token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*"
-                                         value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.TenantServices=^%servletContext%/t/.*/services/.*$${line.separator}org.owasp.csrfguard.unprotected.AttachmentServices=%servletContext%/fileupload/attachment-mgt${line.separator}org.owasp.csrfguard.unprotected.TenantAttachmentServices=^%servletContext%/t/.*/fileupload/attachment-mgt$" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;" value="&lt;HostName&gt;localhost&lt;/HostName&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*" value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.TenantServices=^%servletContext%/t/.*/services/.*$${line.separator}org.owasp.csrfguard.unprotected.AttachmentServices=%servletContext%/fileupload/attachment-mgt${line.separator}org.owasp.csrfguard.unprotected.TenantAttachmentServices=^%servletContext%/t/.*/fileupload/attachment-mgt$" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -532,22 +440,22 @@
                         <phase>install</phase>
                         <configuration>
                             <tasks>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-shared-archive-resources"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/samples"/>
-                                <delete dir="target/classes"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete file="target/${project.artifactId}-${project.version}.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="target/identity-ui"/>
-                                <delete dir="target/database"/>
-                                <delete dir="target/bpmn-explorer"/>
-                                <delete dir="target/humantask-explorer"/>
-                                <delete file="target/bpmn.war"/>
-                                <delete dir="src/site"/>
+                                <delete dir="target/archive-tmp" />
+                                <delete dir="target/dependency-maven-plugin-markers" />
+                                <delete dir="target/maven-shared-archive-resources" />
+                                <delete dir="target/maven-archiver" />
+                                <delete dir="target/samples" />
+                                <delete dir="target/classes" />
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+                                <delete file="target/${project.artifactId}-${project.version}.jar" />
+                                <delete dir="target/sources" />
+                                <delete dir="target/site" />
+                                <delete dir="target/identity-ui" />
+                                <delete dir="target/database" />
+                                <delete dir="target/bpmn-explorer" />
+                                <delete dir="target/humantask-explorer" />
+                                <delete file="target/bpmn.war" />
+                                <delete dir="src/site" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index fdb718f2..9d03e93e 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/product/org.wso2.bps.processtools.feature/pom.xml b/modules/features/product/org.wso2.bps.processtools.feature/pom.xml
index 9c9b96e0..01655b78 100644
--- a/modules/features/product/org.wso2.bps.processtools.feature/pom.xml
+++ b/modules/features/product/org.wso2.bps.processtools.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>bps-features</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/features/product/org.wso2.bps.samples.utils.feature/pom.xml b/modules/features/product/org.wso2.bps.samples.utils.feature/pom.xml
index 45d14184..85fd9f94 100644
--- a/modules/features/product/org.wso2.bps.samples.utils.feature/pom.xml
+++ b/modules/features/product/org.wso2.bps.samples.utils.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>bps-features</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/features/product/org.wso2.bps.styles.feature/pom.xml b/modules/features/product/org.wso2.bps.styles.feature/pom.xml
index 79fe3fba..def44cfd 100644
--- a/modules/features/product/org.wso2.bps.styles.feature/pom.xml
+++ b/modules/features/product/org.wso2.bps.styles.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>bps-features</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
index 57fc87b4..098cbdca 100644
--- a/modules/features/product/pom.xml
+++ b/modules/features/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-features-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.bps.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/service/org.wso2.bps.multitenancy.dashboard.ui.feature/pom.xml
index 3464241f..87320340 100644
--- a/modules/features/service/org.wso2.bps.multitenancy.dashboard.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.bps.multitenancy.dashboard.ui.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-multitenancy-features</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/pom.xml b/modules/features/service/pom.xml
index 99b97619..1c1c334b 100644
--- a/modules/features/service/pom.xml
+++ b/modules/features/service/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
     	<artifactId>wso2bps-features-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2bps-multitenancy-features</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>pom</packaging>
     <name>WSO2 BPS - Tenant Dashboard Features Aggregator Module</name>
     <url>http://wso2.org</url>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 66c3af7f..3071a51a 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.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 b0825423..14da4792 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.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 0f68d3e4..35169446 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.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 5eac650a..c3f15541 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/bpel/pom.xml b/modules/integration/tests-integration/bpel/pom.xml
index ad4e4b61..a5423b0b 100644
--- a/modules/integration/tests-integration/bpel/pom.xml
+++ b/modules/integration/tests-integration/bpel/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/bpmn/pom.xml b/modules/integration/tests-integration/bpmn/pom.xml
index a48185e5..ff9ba183 100644
--- a/modules/integration/tests-integration/bpmn/pom.xml
+++ b/modules/integration/tests-integration/bpmn/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/humantasks/pom.xml b/modules/integration/tests-integration/humantasks/pom.xml
index 2428e898..805537be 100644
--- a/modules/integration/tests-integration/humantasks/pom.xml
+++ b/modules/integration/tests-integration/humantasks/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/reports/pom.xml b/modules/integration/tests-integration/reports/pom.xml
index 743ca229..448f9317 100644
--- a/modules/integration/tests-integration/reports/pom.xml
+++ b/modules/integration/tests-integration/reports/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/taskcoordination/pom.xml b/modules/integration/tests-integration/taskcoordination/pom.xml
index 1c96e5e5..59747360 100644
--- a/modules/integration/tests-integration/taskcoordination/pom.xml
+++ b/modules/integration/tests-integration/taskcoordination/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-patches/bpel/pom.xml b/modules/integration/tests-patches/bpel/pom.xml
index b8f9d5f9..41a183d1 100644
--- a/modules/integration/tests-patches/bpel/pom.xml
+++ b/modules/integration/tests-patches/bpel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-integration</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.bps.multitenancy.dashboard.ui/pom.xml b/modules/org.wso2.bps.multitenancy.dashboard.ui/pom.xml
index e3912380..167d7188 100644
--- a/modules/org.wso2.bps.multitenancy.dashboard.ui/pom.xml
+++ b/modules/org.wso2.bps.multitenancy.dashboard.ui/pom.xml
@@ -17,13 +17,13 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.bps.multitenancy.dashboard.ui</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>bundle</packaging>
     <name>WSO2 BPS - Tenant Dashboard UI</name>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 31d24ae4..6a91c224 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 5b9baecf..116d5a15 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/bpel-eventlistener/pom.xml b/modules/samples/product/bpel-eventlistener/pom.xml
index e1747fef..e4f04222 100644
--- a/modules/samples/product/bpel-eventlistener/pom.xml
+++ b/modules/samples/product/bpel-eventlistener/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/bpel-logger-extension/pom.xml b/modules/samples/product/bpel-logger-extension/pom.xml
index 3362cf59..a61e880b 100644
--- a/modules/samples/product/bpel-logger-extension/pom.xml
+++ b/modules/samples/product/bpel-logger-extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/bpel-property-reader/pom.xml b/modules/samples/product/bpel-property-reader/pom.xml
index 2b3b550e..c0a2c9d7 100644
--- a/modules/samples/product/bpel-property-reader/pom.xml
+++ b/modules/samples/product/bpel-property-reader/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/bpmn-sample-jars/pom.xml b/modules/samples/product/bpmn-sample-jars/pom.xml
index a6ae625b..f5874db8 100644
--- a/modules/samples/product/bpmn-sample-jars/pom.xml
+++ b/modules/samples/product/bpmn-sample-jars/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/product/humantask-eventlistener/pom.xml b/modules/samples/product/humantask-eventlistener/pom.xml
index cb27a976..57511cf6 100644
--- a/modules/samples/product/humantask-eventlistener/pom.xml
+++ b/modules/samples/product/humantask-eventlistener/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/humantask-ui-webapp/pom.xml b/modules/samples/product/humantask-ui-webapp/pom.xml
index 45842e2b..cd7fee61 100644
--- a/modules/samples/product/humantask-ui-webapp/pom.xml
+++ b/modules/samples/product/humantask-ui-webapp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/pom.xml b/modules/samples/product/pom.xml
index 36ba2b62..0eaaf90e 100644
--- a/modules/samples/product/pom.xml
+++ b/modules/samples/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-samples-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/process-tools/pom.xml b/modules/samples/product/process-tools/pom.xml
index 1f8eef25..49238e43 100644
--- a/modules/samples/product/process-tools/pom.xml
+++ b/modules/samples/product/process-tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/sample-client/pom.xml b/modules/samples/product/sample-client/pom.xml
index 37e83078..e7608f37 100644
--- a/modules/samples/product/sample-client/pom.xml
+++ b/modules/samples/product/sample-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/product/sample-utils/pom.xml b/modules/samples/product/sample-utils/pom.xml
index 4046ba8d..13919e33 100644
--- a/modules/samples/product/sample-utils/pom.xml
+++ b/modules/samples/product/sample-utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>samples</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/services/CreditRatingService/pom.xml b/modules/services/CreditRatingService/pom.xml
index 4853df66..0ce1f279 100644
--- a/modules/services/CreditRatingService/pom.xml
+++ b/modules/services/CreditRatingService/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>sample-services</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>CreditRatingService</artifactId>
diff --git a/modules/services/UserService/pom.xml b/modules/services/UserService/pom.xml
index 2a55e99e..4a71c4e0 100644
--- a/modules/services/UserService/pom.xml
+++ b/modules/services/UserService/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>sample-services</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>UserService</artifactId>
     <packaging>war</packaging>
diff --git a/modules/services/pom.xml b/modules/services/pom.xml
index e86641e3..87d27366 100644
--- a/modules/services/pom.xml
+++ b/modules/services/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
 	<relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index 787f0e27..94c8016a 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
         <artifactId>wso2bps-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index e94c16be..d005008a 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.bps</groupId>
     	<artifactId>wso2bps-styles-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index cf244b09..157b9151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,14 +15,13 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.bps</groupId>
     <artifactId>wso2bps-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <name>WSO2 BPS - Parent</name>
     <url>http://wso2.org/projects/bps/java</url>
     <description>WSO2 Business Process Server</description>
@@ -473,7 +472,7 @@
         <connection>scm:git:https://github.com/wso2/product-bps.git</connection>
         <developerConnection>scm:git:https://github.com/wso2/product-bps.git</developerConnection>
         <url>https://github.com/wso2/product-bps.git</url>
-        <tag>HEAD</tag>
+        <tag>v3.6.0-RC1</tag>
     </scm>
 
 
@@ -622,7 +621,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bps.version>3.6.0-SNAPSHOT</bps.version>
+        <bps.version>3.6.0</bps.version>
 
         <carbon.kernel.version>4.4.8</carbon.kernel.version>