diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 8b50b7bd..7409ff54 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -822,15 +822,6 @@
true
644
-
-
- ${pom.artifactId}-${pom.version}/repository/conf/identity
-
- true
- 644
-
@@ -851,6 +842,12 @@
644
+
+
+ ${pom.artifactId}-${pom.version}/repository/conf/identity
+
+ 644
+
${pom.artifactId}-${pom.version}/repository/conf/identity
diff --git a/modules/core/distribution/src/repository/conf/cdm-config.xml b/modules/core/distribution/src/repository/conf/cdm-config.xml
index bd22a4b0..caa367a5 100644
--- a/modules/core/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/core/distribution/src/repository/conf/cdm-config.xml
@@ -28,6 +28,8 @@
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
+
+
https://localhost:9443
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
new file mode 100644
index 00000000..2139b873
--- /dev/null
+++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ smart
+
+
+ https://${carbon.host}:${carbon.management.port}/devicemgt/login
+ https://${carbon.host}:${carbon.management.port}/devicemgt/login?retry=true
+
+
+
+ org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator
+ org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer
+ org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler
+ org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /authenticationendpoint/login.do
+ /repository/resources/security/client-truststore.jks
+ wso2carbon
+
+
+
+ https://accounts.google.com/o/oauth2/token
+ https://accounts.google.com/o/oauth2/auth
+ https://www.googleapis.com/oauth2/v3/userinfo
+
+
+ https://login.live.com/oauth20_token.srf
+ https://login.live.com/oauth20_authorize.srf
+ https://apis.live.net/v5.0/me?access_token=
+
+
+ https://graph.facebook.com/oauth/access_token
+ http://www.facebook.com/dialog/oauth
+ https://graph.facebook.com/me
+
+
+ /authenticationendpoint/fido-auth.jsp
+
+
+ https://api.login.yahoo.com/oauth2/get_token
+ https://api.login.yahoo.com/oauth2/request_auth
+ https://social.yahooapis.com/v1/user/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 5a02f5ef..036fee10 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -110,6 +110,12 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version}
+
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
@@ -2204,6 +2210,14 @@
org.wso2.carbon.apimgt.application.extension.feature.group
${carbon.device.mgt.version}
+
+ org.wso2.carbon.certificate.mgt.api.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group
+ ${carbon.device.mgt.version}
+
org.wso2.carbon.certificate.mgt.server.feature.group
${carbon.device.mgt.version}
@@ -2287,6 +2301,14 @@
org.wso2.carbon.email.sender.feature.group
${carbon.device.mgt.version}
+
+ org.wso2.carbon.certificate.mgt.api.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group
+ ${carbon.device.mgt.version}
+
org.wso2.carbon.certificate.mgt.server.feature.group
${carbon.device.mgt.version}
@@ -2744,6 +2766,14 @@
org.wso2.carbon.apimgt.application.extension.feature.group
${carbon.device.mgt.version}
+
+ org.wso2.carbon.certificate.mgt.api.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group
+ ${carbon.device.mgt.version}
+
org.wso2.carbon.certificate.mgt.server.feature.group
${carbon.device.mgt.version}
diff --git a/pom.xml b/pom.xml
index aea41c23..28c672e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1513,7 +1513,7 @@
4.5.4
- 4.7.0
+ 4.7.2
5.2.0
@@ -1534,12 +1534,12 @@
1.0.2
- 4.6.0
+ 4.6.1
- 4.5.6
+ 4.5.8
- 4.6.4
+ 4.6.5
2.0.3-SNAPSHOT