Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -124,7 +124,6 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.governance.api</artifactId>
-            <version>4.2.1</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -120,8 +120,11 @@
                 <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <dependency>
-
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.governance.api</artifactId>
+                <version>${carbon.platform.version}</version>
+            </dependency>
             <!--Osgi dependencies-->
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
@@ -201,6 +204,7 @@
                 <version>${project.version}</version>
             </dependency>
 
+
         </dependencies>
     </dependencyManagement>