diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 15d97bf8..c37a322e 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1291,6 +1291,11 @@
644
+
+
+ ${pom.artifactId}-${pom.version}/conf/security/
+
+
${pom.artifactId}-${pom.version}
@@ -1549,13 +1554,13 @@
755
-
-
-
- ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-
- 755
-
+
+
+
+
+
+
+
diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product
index cf9cca05..4398635b 100644
--- a/modules/p2-profile/analytics-profile/carbon.product
+++ b/modules/p2-profile/analytics-profile/carbon.product
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 218493db..30283c1f 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -185,6 +185,7 @@
+
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
@@ -276,6 +277,9 @@
org.wso2.carbon.data:org.wso2.carbon.datasource.reader.cassandra.server.feature:${carbon.data.version}
+
+ org.wso2.carbon.data:org.wso2.carbon.datasource.reader.mongo.server.feature:${carbon.data.version}
+
@@ -294,6 +298,9 @@
org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
+
+ org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.server.feature:${carbon.event-processing.version}
+
org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
@@ -588,6 +595,17 @@
+
+
+
+
+
+
+
+
+
+
+
org.wso2.carbon.deployment.synchronizer.feature.group
@@ -699,6 +717,13 @@
org.wso2.carbon.datasource.reader.cassandra.server.feature.group
${carbon.data.version}
+
+
+ org.wso2.carbon.datasource.reader.mongo.server.feature.group
+ ${carbon.data.version}
+
+
+
diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product
index cf9cca05..4398635b 100644
--- a/modules/p2-profile/broker-profile/carbon.product
+++ b/modules/p2-profile/broker-profile/carbon.product
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product
index 3b6b09ec..79a83a52 100644
--- a/modules/p2-profile/iot-core-profile/carbon.product
+++ b/modules/p2-profile/iot-core-profile/carbon.product
@@ -2,7 +2,7 @@
+version="4.4.24" useFeatures="true" includeLaunchers="true">
@@ -14,7 +14,7 @@ version="4.4.17" useFeatures="true" includeLaunchers="true">
-
+
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 80fd2694..a6d84421 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -244,6 +244,10 @@
org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
+
+
+ org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
+
@@ -292,8 +296,13 @@
org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version}
+
+
+ org.wso2.carbon.identity.framework:org.wso2.carbon.identity.event.server.feature:${carbon.identity.framework.version}
+
+
- org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
+ org.wso2.carbon.identity.inbound.auth.openid:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version}
@@ -353,10 +362,10 @@
- org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
+ org.wso2.carbon.identity.local.auth.requestpath.basic:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
- org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
+ org.wso2.carbon.identity.local.auth.requestpath.oauth:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version}
@@ -377,7 +386,15 @@
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
-
+
+
+
+
+
+
+
+
+
@@ -735,9 +752,19 @@
- org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
+ org.wso2.carbon.extension.identity.oauth2.grantType.jwt:org.wso2.carbon.extension.identity.oauth2.jwt.feature:${identity.jwt.extension.version}
-
+
+
+
+ org.wso2.carbon.consent.mgt:org.wso2.carbon.consent.mgt.server.feature:${carbon.consent.mgt.version}
+
+
+
+
+ org.wso2.carbon.utils:org.wso2.carbon.database.utils.feature:${org.wso2.carbon.database.utils.version}
+
+
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
@@ -1137,6 +1164,12 @@
org.wso2.carbon.forum.server.feature.group
${carbon.api.mgt.version}
+
+
+ org.wso2.carbon.apimgt.publisher.feature.group
+ ${carbon.api.mgt.version}
+
+
@@ -1230,6 +1263,12 @@
org.wso2.carbon.user.mgt.feature.group
${carbon.identity.framework.version}
+
+
+
+
+
+
org.wso2.carbon.directory.service.mgr.server.feature.group
@@ -1310,6 +1349,17 @@
+
+
+
+
+
+
+
+
+
+
+
org.wso2.carbon.registry.core.feature.group
@@ -1492,8 +1542,25 @@
org.wso2.carbon.identity.oauth.feature.group
${identity.inbound.auth.oauth.version}
+
+
+ org.wso2.carbon.identity.event.server.feature.group
+ ${carbon.identity.framework.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
org.wso2.carbon.registry.community.features.server.feature.group
@@ -1607,9 +1674,21 @@
- org.wso2.carbon.identity.oauth2.grant.jwt.feature.group
+ org.wso2.carbon.extension.identity.oauth2.jwt.feature.group
${identity.jwt.extension.version}
+
+
+ org.wso2.carbon.consent.mgt.server.feature.group
+ ${carbon.consent.mgt.version}
+
+
+
+
+ org.wso2.carbon.database.utils.feature.group
+ ${org.wso2.carbon.database.utils.version}
+
+
org.wso2.carbon.device.mgt.cdmf.analytics.feature.group
${carbon.device.mgt.plugin.version}
@@ -1679,9 +1758,18 @@
${carbon.identity.framework.version}
- org.wso2.carbon.identity.oauth2.grant.jwt.feature.group
+ org.wso2.carbon.extension.identity.oauth2.jwt.feature.group
${identity.jwt.extension.version}
+
+ org.wso2.carbon.consent.mgt.server.feature.group
+ ${carbon.consent.mgt.version}
+
+
+
+ org.wso2.carbon.database.utils.feature.group
+ ${org.wso2.carbon.database.utils.version}
+
org.wso2.carbon.tenant.common.feature.group
${carbon.multitenancy.version}
@@ -1767,6 +1855,10 @@
org.wso2.carbon.identity.oauth.feature.group
${identity.inbound.auth.oauth.version}
+
+ org.wso2.carbon.identity.event.server.feature.group
+ ${carbon.identity.framework.version}
+
org.wso2.carbon.identity.user.registration.server.feature.group
${carbon.identity.framework.version}
@@ -1780,6 +1872,10 @@
org.wso2.carbon.user.mgt.feature.group
${carbon.identity.framework.version}
+
+
+
+
org.wso2.carbon.identity.core.feature.group
${carbon.identity.framework.version}
@@ -1844,6 +1940,10 @@
org.wso2.carbon.identity.jwt.client.extension.feature.group
${carbon.device.mgt.version}
+
+ org.wso2.carbon.consent.mgt.server.feature.group
+ ${carbon.consent.mgt.version}
+
org.wso2.carbon.identity.sso.saml.feature.group
${identity.inbound.auth.saml.version}
@@ -1993,6 +2093,10 @@
org.wso2.carbon.identity.jwt.client.extension.feature.group
${carbon.device.mgt.version}
+
+ org.wso2.carbon.consent.mgt.server.feature.group
+ ${carbon.consent.mgt.version}
+
org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group
${carbon.device.mgt.version}
@@ -2039,9 +2143,14 @@
${carbon.device.mgt.plugin.version}
- org.wso2.carbon.identity.oauth2.grant.jwt.feature.group
+ org.wso2.carbon.extension.identity.oauth2.jwt.feature.group
${identity.jwt.extension.version}
+
+
+ org.wso2.carbon.database.utils.feature.group
+ ${org.wso2.carbon.database.utils.version}
+
org.wso2.carbon.tenant.mgt.common.feature.group
${carbon.commons.version}
@@ -2199,6 +2308,10 @@
org.wso2.carbon.identity.oauth.feature.group
${identity.inbound.auth.oauth.version}
+
+ org.wso2.carbon.identity.event.server.feature.group
+ ${carbon.identity.framework.version}
+
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
@@ -2225,6 +2338,7 @@
org.wso2.carbon.identity.user.registration.server.feature.group
${carbon.identity.framework.version}
+
org.wso2.carbon.deployment.synchronizer.feature.group
${carbon.commons.version}
@@ -2349,6 +2463,10 @@
org.wso2.carbon.forum.server.feature.group
${carbon.api.mgt.version}
+
+ org.wso2.carbon.apimgt.publisher.feature.group
+ ${carbon.api.mgt.version}
+
org.wso2.carbon.tenant.common.feature.group
${carbon.multitenancy.version}
@@ -2671,7 +2789,7 @@
${carbon.device.mgt.plugin.version}
- org.wso2.carbon.identity.oauth2.grant.jwt.feature.group
+ org.wso2.carbon.extension.identity.oauth2.jwt.feature.group
${identity.jwt.extension.version}
@@ -2971,6 +3089,10 @@
org.wso2.carbon.forum.server.feature.group
${carbon.api.mgt.version}
+
+ org.wso2.carbon.apimgt.publisher.feature.group
+ ${carbon.api.mgt.version}
+
org.wso2.carbon.tenant.common.feature.group
${carbon.multitenancy.version}
diff --git a/pom.xml b/pom.xml
index cc29e76e..a97ec7ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1446,7 +1446,7 @@
- 4.4.17
+ 4.4.24
[4.4.0, 4.5.0)
2.2.0
@@ -1483,63 +1483,68 @@
1.1.1
- 4.5.8
+ 4.6.21
- 4.7.3
+ 4.7.15
- 5.7.5
+ 5.11.124
[5.2.0, 6.0.0)
- 5.3.1
- 5.1.1
- 5.3.1
- 5.2.1
- 5.3.11
- 5.1.2
- 5.1.4
- 5.1.1
-
- 5.1.1
-
- 5.1.4
- 1.0.0
+ 5.3.7
+ 5.2.5
+ 5.4.4
+ 5.2.5
+ 5.6.53
+ 5.1.3
+ 5.1.8
+ 5.1.5
+ 5.1.4
+ 5.1.12
+ 1.0.5
0.1.1
- 1.0.0
+ 2.0.2
+ 1.1.7
- 1.0.2
+ 1.0.10
+
+
+ 1.0.48
+
+
+ 2.0.6
- 4.6.1
+ 4.6.8
- 4.6.8
+ 4.6.28
- 4.7.8
+ 4.7.23
- 3.0.240
+ 3.0.242-SNAPSHOT
[3.0.0, 4.0.0)
${project.version}
- 4.0.136
+ 4.0.137-SNAPSHOT
- 6.1.109
+ 6.2.157
(6.0.0,7.0.0]
- 4.6.10
+ 4.6.61
- 5.1.17
- 1.3.3
- 1.3.5
+ 5.1.32
+ 1.3.16
+ 1.3.16
${project.version}
3.1.0
3.1.0
@@ -1572,7 +1577,7 @@
2.0.2
- 4.3.6
+ 4.4.41
3.8.1.v20120830-144521
1.0.3
@@ -1624,7 +1629,7 @@
2.8.2.wso2v1
2.0.0.wso2v1
2.0.7
- 2.1.9
+ 2.1.19
[2.6.0,3.0.0)
2.3.4-spark
@@ -1638,7 +1643,7 @@
1.5.1
- 5.1.4
+ 5.1.5
1.0.0-wso2v5