From 179097267aa45452b75709aa375ec624757c36ab Mon Sep 17 00:00:00 2001
From: sajithd <sajithd@wso2.com>
Date: Thu, 14 Dec 2017 22:50:32 +0530
Subject: [PATCH] Fix merge conflicts.

---
 components/distribution/pom.xml                      | 12 ++++++------
 .../findbugs-exclude.xml                             |  4 ++--
 .../findbugs-exclude.xml                             |  5 +----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/components/distribution/pom.xml b/components/distribution/pom.xml
index 8fe705c8ebc..c129d2ecbc2 100644
--- a/components/distribution/pom.xml
+++ b/components/distribution/pom.xml
@@ -402,7 +402,7 @@
                             <targetRepository>file:${basedir}/target/p2-repo</targetRepository>
                             <features>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature</id>
+                                    <id>org.wso2.carbon.utils.feature</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
@@ -720,7 +720,7 @@
                                     <version>${carbon.securevault.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature.group</id>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
@@ -890,7 +890,7 @@
                                     <version>${carbon.securevault.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature.group</id>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
@@ -1052,7 +1052,7 @@
                                     <version>${carbon.securevault.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature.group</id>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
@@ -1076,7 +1076,7 @@
                                     <version>${org.wso2.transport.http.netty.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature.group</id>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
@@ -1233,7 +1233,7 @@
                                     <version>${carbon.securevault.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.org.wso2.carbon.data.provider.utils.feature.group</id>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
                                     <version>${carbon.utils.version}</version>
                                 </feature>
                                 <feature>
diff --git a/components/org.wso2.carbon.data.provider/findbugs-exclude.xml b/components/org.wso2.carbon.data.provider/findbugs-exclude.xml
index a530f1fce37..65993be561e 100644
--- a/components/org.wso2.carbon.data.provider/findbugs-exclude.xml
+++ b/components/org.wso2.carbon.data.provider/findbugs-exclude.xml
@@ -19,7 +19,7 @@
 
 <FindBugsFilter>
     <Match>
-        <Class name="org.wso2.carbon.databridge.commons.org.wso2.carbon.data.provider.utils.DataBridgeCommonsUtils"/>
+        <Class name="org.wso2.carbon.databridge.commons.utils.DataBridgeCommonsUtils"/>
         <Bug pattern="DM_DEFAULT_ENCODING"/>
     </Match>
     <Match>
@@ -27,7 +27,7 @@
         <Bug pattern="EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
     </Match>
     <Match>
-        <Class name="org.wso2.carbon.databridge.commons.org.wso2.carbon.data.provider.utils.EventDefinitionConverterUtils"/>
+        <Class name="org.wso2.carbon.databridge.commons.utils.EventDefinitionConverterUtils"/>
         <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAY"/>
     </Match>
     <Match>
diff --git a/components/org.wso2.carbon.siddhi.editor.core/findbugs-exclude.xml b/components/org.wso2.carbon.siddhi.editor.core/findbugs-exclude.xml
index 147d18ea274..180a3ed21bf 100644
--- a/components/org.wso2.carbon.siddhi.editor.core/findbugs-exclude.xml
+++ b/components/org.wso2.carbon.siddhi.editor.core/findbugs-exclude.xml
@@ -16,8 +16,5 @@
 -->
 
 <FindBugsFilter>
-    <Match>
-        <Class name="org.wso2.carbon.siddhi.editor.core.internal.EditorMicroservice"/>
-        <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
-    </Match>
+
 </FindBugsFilter>
\ No newline at end of file