From 3a7ef33c16154ad95ff08b1a04f30e0169700d02 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Sun, 27 Mar 2016 16:58:11 +0530
Subject: [PATCH] Fixing a build failure caused by unresolvable packages
 consumed by device.mgt.core and code cleanup

---
 components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml | 3 ++-
 .../pom.xml                                                   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 49adf0ee44d..f486ddfd653 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -84,7 +84,8 @@
                             org.apache.catalina,
                             org.apache.catalina.core,
                             org.apache.commons.collections,
-                            org.wso2.carbon.email.sender.*
+                            org.wso2.carbon.email.sender.*,
+                            org.wso2.carbon
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,
diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
index ac0aba65fb9..d6c808c4ead 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
@@ -85,8 +85,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>OAuth Authenticator Bundle</Bundle-Description>
                         <Private-Package>