From 94f1b87ce355e2c4d76b71971d9cea35311d18a2 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Mon, 25 Jan 2016 10:47:31 +0530
Subject: [PATCH] Removing patches and upgrading DAS and MB

---
 modules/distribution/src/assembly/bin.xml | 22 ++++++++++------------
 modules/p2-profile-gen/pom.xml            |  7 +++++++
 pom.xml                                   | 16 ++++++++--------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 5afcb73a..555bad01 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -659,7 +659,7 @@
 
         <!-- Copying temporary patches from DAS that fixes JIRA DAS-339 and a Concurrent DB Access Issue -->
                         <!-- Can be safely removed upon a DAS release with these fixes -->
-        <fileSet>
+        <!--fileSet>
             <directory>
                 src/repository/patches
             </directory>
@@ -669,7 +669,7 @@
             <includes>
                 <include>**/*</include>
             </includes>
-        </fileSet>
+        </fileSet-->
 
     </fileSets>
 
@@ -801,14 +801,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--        <file>
-                    <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
-                    </source>
-                    <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-                    <filtered>true</filtered>
-                    <fileMode>644</fileMode>
-                </file>-->
-
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>INSTALL.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -863,9 +862,8 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon-event-broker.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/messaging-event-broker.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index d1a64c38..12a5774c 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -671,6 +671,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
+				<featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.hbase.server.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
@@ -1522,6 +1525,10 @@
                                     <id>org.wso2.carbon.analytics.datasource.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
+				<feature>
+                                    <id>org.wso2.carbon.analytics.datasource.hbase.server.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.spark.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
diff --git a/pom.xml b/pom.xml
index 62dee5e1..3382dd26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -988,7 +988,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.2</carbon.kernel.version>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1063,7 +1063,7 @@
         <carbon.mediation.version>4.4.11</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.0.6</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.9-SNAPSHOT</carbon.analytics.common.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -1078,12 +1078,12 @@
         <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.4</carbon.analytics.version>
+        <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <carbon.dashboard.version>1.0.9</carbon.dashboard.version>
         <shindig.version>1.0.0</shindig.version>
-        <carbon.event-processing.version>2.0.9</carbon.event-processing.version>
-        <carbon.data.version>4.3.2</carbon.data.version>
+        <carbon.event-processing.version>2.0.11-SNAPSHOT</carbon.event-processing.version>
+        <carbon.data.version>4.3.5-SNAPSHOT</carbon.data.version>
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
         <wss4j.security.version>1.6.17</wss4j.security.version>
@@ -1123,9 +1123,9 @@
         <uuf.version>1.0.0-SNAPSHOT</uuf.version>
 
         <!-- MB Features -->
-        <carbon.messaging.version>3.0.1</carbon.messaging.version>
-        <product.mb.version>3.0.0</product.mb.version>
-        <carbon.metrics.version>1.1.1</carbon.metrics.version>
+        <carbon.messaging.version>3.1.0-SNAPSHOT</carbon.messaging.version>
+        <product.mb.version>3.1.0-SNAPSHOT</product.mb.version>
+        <carbon.metrics.version>1.2.0</carbon.metrics.version>
     </properties>
 
     <scm>