diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c24afad6..2e4ced59 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -744,49 +744,29 @@
755
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
- devicemgt_admin.war
+ 755
- ../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
- ${pom.artifactId}-${pom.version}/repository/tools
-
- 755
-
-
- ../tools/mdm-android-agent-archetype/README.txt
- ${pom.artifactId}-${pom.version}/repository/tools
+ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
755
- ../tools/mdm-android-agent-archetype/android-agent.sh
- ${pom.artifactId}-${pom.version}/repository/tools
+
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
+
+ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
- 755
+ devicemgt_admin.war
@@ -1111,6 +1091,24 @@
AndroidSenseDM_DB.h2.db
644
+
+
+
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
+
+ ${pom.artifactId}-${pom.version}/repository/database
+ AndroidSenseDM_DB.h2.db
+ 644
+
+
+
+
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+
+ ${pom.artifactId}-${pom.version}/repository/database
+ WSO2MobileWindows_DB.h2.db
+ 644
+
@@ -1157,23 +1155,23 @@
644
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
+
+ ${pom.artifactId}-${pom.version}/repository/database
+ WSO2MobileAndroid_DB.h2.db
+ 644
+
+
+
+
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+
+ ${pom.artifactId}-${pom.version}/repository/database
+ WSO2MobileWindows_DB.h2.db
+ 644
+
src/repository/conf/carbon.xml
diff --git a/modules/distribution/src/repository/conf/identity/identity.xml b/modules/distribution/src/repository/conf/identity/identity.xml
index b88ce8ca..6d4288b1 100644
--- a/modules/distribution/src/repository/conf/identity/identity.xml
+++ b/modules/distribution/src/repository/conf/identity/identity.xml
@@ -148,11 +148,11 @@
iwa:ntlm
org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler
-
- urn:ietf:params:oauth:grant-type:jwt-bearer
- org.wso2.carbon.identity.oauth2.grant.jwt.JWTBearerGrantHandler
- org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator
-
+
+
+
+
+
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index c1ebf60f..3dba82a8 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -102,10 +102,6 @@
true
-
-
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@@ -149,12 +145,12 @@
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
-
-
-
-
-
-
+
+ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+
+
+ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+
@@ -239,9 +235,6 @@
org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
-
-
-
org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
@@ -272,9 +265,6 @@
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version}
-
-
-
@@ -290,9 +280,6 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
-
-
-
org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
@@ -325,15 +312,9 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
-
-
-
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
-
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
@@ -355,15 +336,6 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
-
@@ -536,12 +508,6 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}
-
-
-
-
-
-
org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version}
@@ -557,9 +523,6 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
-
-
-
@@ -617,10 +580,6 @@
org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
-
-
-
-
@@ -799,9 +758,9 @@
org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
-
- org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
-
+
+
+
@@ -872,10 +831,6 @@
org.wso2.carbon.identity.jwt.client.extension.feature.group
${carbon.device.mgt.version}
-
-
-
-
org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group
${carbon.device.mgt.version}
@@ -886,14 +841,14 @@
org.wso2.carbon.device.mgt.mobile.feature.group
${carbon.device.mgt.plugin.version}
-
-
-
-
-
-
-
-
+
+ org.wso2.carbon.device.mgt.mobile.android.feature.group
+ ${carbon.device.mgt.plugin.version}
+
+
+ org.wso2.carbon.device.mgt.mobile.windows.feature.group
+ ${carbon.device.mgt.plugin.version}
+
org.wso2.carbon.device.mgt.iot.feature.group
@@ -1033,10 +988,6 @@
org.wso2.carbon.tenant.common.feature.group
${carbon.multitenancy.version}
-
-
-
-
org.wso2.carbon.tenant.mgt.core.feature.group
${carbon.multitenancy.version}
@@ -1060,10 +1011,6 @@
org.wso2.carbon.identity.oauth.server.feature.group
${carbon.identity.version}
-
-
-
-
org.wso2.carbon.identity.provider.server.feature.group
${carbon.identity.version}
@@ -1123,18 +1070,10 @@
org.wso2.carbon.identity.application.mgt.feature.group
${carbon.identity.version}
-
-
-
-
org.wso2.carbon.claim.mgt.server.feature.group
${carbon.identity.version}
-
org.wso2.carbon.claim.mgt.feature.group
${carbon.identity.version}
@@ -1152,19 +1091,6 @@
org.wso2.carbon.identity.xacml.server.feature.group
${carbon.identity.version}
-
-
org.wso2.carbon.identity.user.registration.feature.group
@@ -1278,17 +1204,10 @@
${appmgt.feature.version}
-
-
-
-
-
-
org.wso2.carbon.store.feature.group
${carbon.store.version}
-
org.wso2.carbon.appmgt.mdm.wso2emm.feature.group
${appmgt.feature.version}
@@ -1370,22 +1289,16 @@
-
- org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
-
+ org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
${carbon.identity.version}
-
- org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group
-
+ org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group
${carbon.identity.version}
-
- org.wso2.carbon.identity.application.mgt.server.feature.group
-
+ org.wso2.carbon.identity.application.mgt.server.feature.group
${carbon.identity.version}
@@ -1397,9 +1310,7 @@
${carbon.identity.version}
-
- org.wso2.carbon.identity.user.registration.server.feature.group
-
+ org.wso2.carbon.identity.user.registration.server.feature.group
${carbon.identity.version}
@@ -1410,34 +1321,26 @@
-
- org.wso2.carbon.registry.community.features.server.feature.group
-
+ org.wso2.carbon.registry.community.features.server.feature.group
${carbon.registry.version}
-
- org.wso2.carbon.registry.community.features.ui.feature.group
-
+ org.wso2.carbon.registry.community.features.ui.feature.group
${carbon.registry.version}
- org.wso2.carbon.registry.extensions.server.feature.group
-
+ org.wso2.carbon.registry.extensions.server.feature.group
${carbon.governance.version}
-
- org.wso2.carbon.governance.lifecycle.management.server.feature.group
-
+ org.wso2.carbon.governance.lifecycle.management.server.feature.group
${carbon.governance.version}
- org.wso2.carbon.governance.metadata.server.feature.group
-
+ org.wso2.carbon.governance.metadata.server.feature.group
${carbon.governance.version}
@@ -1534,12 +1437,6 @@
${carbon.analytics.common.version}
-
-
-
-
-
-
org.wso2.carbon.analytics.messageconsole.feature.group
@@ -1566,13 +1463,6 @@
${carbon.analytics.version}
-
-
-
-
-
-
-
org.wso2.carbon.databridge.core.server.feature.group
@@ -1693,10 +1583,10 @@
${carbon.metrics.version}
-
- org.wso2.carbon.identity.oauth2.grant.jwt.feature.group
- ${identity.jwt.extension.version}
-
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 536c7163..f79a3997 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1012,12 +1012,8 @@
3.9.1.v20130814-1242
-
1.2.140.wso2v3
-
- 1.0.0-SNAPSHOT
-
2.7.16
2.5.11
@@ -1050,7 +1046,6 @@
2.1.0-SNAPSHOT
- 2.0.0-SNAPSHOT
5.0.3
@@ -1059,7 +1054,7 @@
4.5.1
- 5.0.12-SNAPSHOT
+ 5.0.11
7.0.59.wso2v1
@@ -1074,7 +1069,7 @@
1.1.0-wso2v17
- 1.0.6-SNAPSHOT
+ 1.0.5
1.0.0-wso2v3
1.0.13
1.0.0
@@ -1116,8 +1111,6 @@
github-scm
- 1.0.0-SNAPSHOT
-
3.1.0
3.1.0