Merge branch '330-release' of https://github.com/geethkokila/carbon-device-mgt

features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/src/main/resources/conf/apim-integration.xml

@@ -21,8 +21,8 @@
 <APIMConfiguration>
 	<DCREndpoint>https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register</DCREndpoint>
 	<TokenEndpoint>https://${iot.gateway.host}:${iot.gateway.https.port}/token</TokenEndpoint>
-	<PublisherEndpoint>https://${iot.apimpublisher.host}:${iot.apimpublisher.https.port}/api/am/publisher/v0.11</PublisherEndpoint>
+	<PublisherEndpoint>https://${iot.apimpublisher.host}:${iot.apimpublisher.https.port}/api/am/publisher/v0.12</PublisherEndpoint>
-	<StoreEndpoint>https://${iot.apimstore.host}:${iot.apimstore.https.port}/api/am/store/v0.11</StoreEndpoint>
+	<StoreEndpoint>https://${iot.apimstore.host}:${iot.apimstore.https.port}/api/am/store/v0.12</StoreEndpoint>
 	<Username>admin</Username>
 	<Password>admin</Password>
 </APIMConfiguration>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -121,9 +121,6 @@
 								<bundleDef>
 									org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.pull.notification:${carbon.device.mgt.version}
 								</bundleDef>
-                                <bundleDef>
-                                    org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.stub:${identity.inbound.auth.oauth.version}
-                                </bundleDef>
                             </bundles>
                             <importBundles>
                                 <importBundleDef>org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.keymgt:${carbon.api.mgt.version}</importBundleDef>