From 3ff3207ac170d8e2df5f256737a33e81df248c99 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Wed, 16 Nov 2016 20:41:22 +0530
Subject: [PATCH] Set broker version to be same as the core version

---
 modules/broker/distribution/pom.xml |  4 ++--
 pom.xml                             | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml
index 502b9a8d..090a9eeb 100644
--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@@ -116,13 +116,13 @@
                                 <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2iot-broker-${product.wso2iot.broker.version}.zip" />
+                                        <include name="wso2iot-broker-${product.iot.broker.version}.zip" />
                                     </fileset>
                                 </unzip>
                                 <!-- Disabling default way of checking authorizations due to 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;" />
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false">
-                                    <fileset dir="${tempdir}/wso2iot-broker-${product.wso2iot.broker.version}/repository/components/">
+                                    <fileset dir="${tempdir}/wso2iot-broker-${product.iot.broker.version}/repository/components/">
                                     </fileset>
                                 </copy>
                                 <unzip dest="${tempdir}">
diff --git a/pom.xml b/pom.xml
index ffafbcba..d0c29668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1278,7 +1278,7 @@
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.stratos.mb.dashboard.ui</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -1288,38 +1288,38 @@
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.stratos.mb.deployment</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.stratos.mb.login.ui</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.iot.broker.styles</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.stratos.mb.styles</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <!--Dependencies for integration tests  -->
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.iot.broker.integration.common.clients</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.iot.broker.integration.common.utils</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.iot</groupId>
                 <artifactId>org.wso2.iot.broker.platform.common.utils</artifactId>
-                <version>${product.wso2iot.broker.version}</version>
+                <version>${product.iot.broker.version}</version>
             </dependency>
             <dependency>
                 <groupId>jline</groupId>
@@ -1566,7 +1566,6 @@
         <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>
-        <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -1581,7 +1580,7 @@
         <orbit.version.rampart>1.6.1.wso2v10</orbit.version.rampart>
 
         <!-- IoT Broker Dependencies -->
-        <product.wso2iot.broker.version>1.0.0-SNAPSHOT</product.wso2iot.broker.version>
+        <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
         <andes.version>3.2.0-SNAPSHOT</andes.version>
         <carbon.messaging.version>3.2.0-SNAPSHOT</carbon.messaging.version>