From 66971e4860770509a3d1166b11547d4c13056ad2 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 8 Mar 2016 15:52:09 +0530
Subject: [PATCH] removed conflicting jars that exports same packages

---
 modules/distribution/src/assembly/bin.xml | 19 ++++++++++++++++++-
 pom.xml                                   |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c478eb37..d9293494 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -90,8 +90,25 @@
                 <exclude>**/plugins/org.wso2.carbon.endpoint.ui*</exclude>
                 <exclude>**/plugins/org.wso2.carbon.inbound.ui*</exclude>
                 <exclude>**/plugins/org.wso2.carbon.rest.api.ui*</exclude>
-                <!--TODO: Remove exclude for asm-all jar after fixing java stack issue-->
+                <!--excluding asm-all jar after fixing java stack issue-->
                 <exclude>**/asm-all_4.1.0.wso2v1.jar</exclude>
+                <exclude>**/java-property-utils_1.9.0.wso2v1.jar</exclude>
+                <exclude>**/axis2-transport-jms_1.1.0.wso2v13.jar</exclude>
+                <exclude>**/axis2-transport-mail_1.1.0.wso2v13.jar</exclude>
+                <exclude>**/commons-digester_1.8.1.wso2v1.jar</exclude>
+                <exclude>**/org.apache.commons.configuration_1.10.0.jar</exclude>
+                <exclude>**/apache-zookeeper_3.3.4.wso2v1.jar</exclude>
+                <exclude>**/commons-configuration_1.6.0.wso2v1.jar</exclude>
+                <exclude>**/net.minidev.json-smart_1.2.0.jar</exclude>
+                <exclude>**/libthrift_0.7.0.wso2v2.jar</exclude>
+                <exclude>**/com.google.gson_2.3.1.jar</exclude>
+                <exclude>**/com.google.gson_2.2.4.jar</exclude>
+                <exclude>**/com.google.gson_2.1.0.jar</exclude>
+                <exclude>**/com.jayway.jsonpath_0.8.1.wso2v1.jar</exclude>
+                <exclude>**/json_1.0.0.wso2v1.jar</exclude>
+                <exclude>**/json_2.0.0.wso2v1.jar</exclude>
+                <exclude>**/bcprov-jdk15on_1.49.0.wso2v1.jar</exclude>
+                <exclude>**/xmlbeans_2.3.0.wso2v1.jar</exclude>
             </excludes>
         </fileSet>
 
diff --git a/pom.xml b/pom.xml
index bff2ec7d..711438a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1079,7 +1079,7 @@
         <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.11</carbon.event-processing.version>
+        <carbon.event-processing.version>2.0.12</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>