community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113 from ayyoob/master

Browse Source 
removed snapshot version from dependencies
This commit is contained in:
Ruwan 2016-04-01 21:34:39 +05:30
commit 783465d459
4 changed files with 88 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
modules/distribution/src/assembly/bin.xml
View File

@ -744,22 +744,22 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<!-- End of "portal" app specific modifications --> <!-- End of "portal" app specific modifications -->
<!--<file>--> <file>
<!--<source>--> <source>
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war--> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
<!--</source>--> </source>
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps--> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
<!--</outputDirectory>--> </outputDirectory>
<!--<fileMode>755</fileMode>--> <fileMode>755</fileMode>
<!--</file>--> </file>
<!--<file>--> <file>
<!--<source>--> <source>
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war--> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
<!--</source>--> </source>
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps--> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
<!--</outputDirectory>--> </outputDirectory>
<!--<fileMode>755</fileMode>--> <fileMode>755</fileMode>
<!--</file>--> </file>
<file> <file>
<source> <source>
../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-admin.war
@ -768,26 +768,6 @@
</outputDirectory> </outputDirectory>
<destName>devicemgt_admin.war</destName> <destName>devicemgt_admin.war</destName>
</file> </file>
<file>
<source>
../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>../tools/mdm-android-agent-archetype/README.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>../tools/mdm-android-agent-archetype/android-agent.sh</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!-- Copying synapse.properties file --> <!-- Copying synapse.properties file -->
<file> <file>
<source>src/repository/conf/synapse.properties</source> <source>src/repository/conf/synapse.properties</source>
@ -1111,6 +1091,24 @@
<destName>AndroidSenseDM_DB.h2.db</destName> <destName>AndroidSenseDM_DB.h2.db</destName>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying ANDROID SENSE H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>AndroidSenseDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!-- Copying MOBILE-WINDOWS H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2MobileWindows_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!-- Copying ARDUINO H2 database --> <!-- Copying ARDUINO H2 database -->
<file> <file>
<source> <source>
@ -1157,23 +1155,23 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying MOBILE-ANDROID H2 database --> <!-- Copying MOBILE-ANDROID H2 database -->
<!--<file>--> <file>
<!--<source>--> <source>
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db--> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
<!--</source>--> </source>
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>--> <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<!--<destName>WSO2MobileAndroid_DB.h2.db</destName>--> <destName>WSO2MobileAndroid_DB.h2.db</destName>
<!--<fileMode>644</fileMode>--> <fileMode>644</fileMode>
<!--</file>--> </file>
<!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;--> <!-- Copying MOBILE-WINDOWS H2 database -->
<!--<file>--> <file>
<!--<source>--> <source>
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db--> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
<!--</source>--> </source>
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>--> <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<!--<destName>WSO2MobileWindows_DB.h2.db</destName>--> <destName>WSO2MobileWindows_DB.h2.db</destName>
<!--<fileMode>644</fileMode>--> <fileMode>644</fileMode>
<!--</file>--> </file>
<file> <file>
<source>src/repository/conf/carbon.xml <source>src/repository/conf/carbon.xml
</source> </source>

10
modules/distribution/src/repository/conf/identity/identity.xml
View File

@ -148,11 +148,11 @@
<GrantTypeName>iwa:ntlm</GrantTypeName> <GrantTypeName>iwa:ntlm</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler</GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <!--<SupportedGrantType>-->
<GrantTypeName>urn:ietf:params:oauth:grant-type:jwt-bearer</GrantTypeName> <!--<GrantTypeName>urn:ietf:params:oauth:grant-type:jwt-bearer</GrantTypeName>-->
<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTBearerGrantHandler</GrantTypeHandlerImplClass> <!--<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTBearerGrantHandler</GrantTypeHandlerImplClass>-->
<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass> <!--<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass>-->
</SupportedGrantType> <!--</SupportedGrantType>-->
</SupportedGrantTypes> </SupportedGrantTypes>
<OAuthCallbackHandlers> <OAuthCallbackHandlers>
<OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/> <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>

170
modules/p2-profile-gen/pom.xml
View File

@ -102,10 +102,6 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>-->
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@ -149,12 +145,12 @@
<featureArtifactDef> <featureArtifactDef>
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.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <featureArtifactDef>
<!--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.android.feature:${carbon.device.mgt.plugin.version}
<!--</featureArtifactDef>--> </featureArtifactDef>
<!--<featureArtifactDef>--> <featureArtifactDef>
<!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}--> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
<!--</featureArtifactDef>--> </featureArtifactDef>
<!-- Mobile Device Management Features --> <!-- Mobile Device Management Features -->
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
@ -239,9 +235,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
@ -272,9 +265,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version} org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.server.feature:${carbon.multitenancy.version}-->
<!--</featureArtifactDef>-->
<!-- End of Carbon Multi-tenancy Features --> <!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->
@ -290,9 +280,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
@ -325,15 +312,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
</featureArtifactDef-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
@ -355,15 +336,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!-- <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.iwa.ui.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef>-->
<!-- End of Identity Features --> <!-- End of Identity Features -->
<!-- Registry Features --> <!-- Registry Features -->
@ -536,12 +508,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<feaureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${carbon.identity.version}-->
<!--</feaureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<!-- SSO Fix--> <!-- SSO Fix-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version}
@ -557,9 +523,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<!-- Registry features --> <!-- Registry features -->
<featureArtifactDef> <featureArtifactDef>
@ -617,10 +580,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version} org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}-->
<!--</featureArtifactDef>-->
<!--+++++++++++++++++++++++++++++++++++++++++++++-->
<!-- End of Carbon Deployment Features --> <!-- End of Carbon Deployment Features -->
<!-- Registry Features --> <!-- Registry Features -->
@ -799,9 +758,9 @@
org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version} org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
</featureArtifactDef> </featureArtifactDef>
<!--JWT grant type handler--> <!--JWT grant type handler-->
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -872,10 +831,6 @@
<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -886,14 +841,14 @@
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!--<feature>--> <feature>
<!--<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>--> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<!--<version>${carbon.device.mgt.plugin.version}</version>--> <version>${carbon.device.mgt.plugin.version}</version>
<!--</feature>--> </feature>
<!--<feature>--> <feature>
<!--<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>--> <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<!--<version>${carbon.device.mgt.plugin.version}</version>--> <version>${carbon.device.mgt.plugin.version}</version>
<!--</feature>--> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
@ -1033,10 +988,6 @@
<id>org.wso2.carbon.tenant.common.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.tenant.mgt.server.feature.group</id>-->
<!--<version>${carbon.multitenancy.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.tenant.mgt.core.feature.group</id> <id>org.wso2.carbon.tenant.mgt.core.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
@ -1060,10 +1011,6 @@
<id>org.wso2.carbon.identity.oauth.server.feature.group</id> <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.oauth.common.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.identity.provider.server.feature.group</id> <id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
@ -1123,18 +1070,10 @@
<id>org.wso2.carbon.identity.application.mgt.feature.group</id> <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.mgt.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.claim.mgt.server.feature.group</id> <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.claim.mgt.feature.group</id> <id>org.wso2.carbon.claim.mgt.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
@ -1152,19 +1091,6 @@
<id>org.wso2.carbon.identity.xacml.server.feature.group</id> <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!-- <feature>
<id>org.wso2.carbon.identity.authenticator.iwa.ui.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.xacml.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.notification.mgt.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>-->
<feature> <feature>
<id>org.wso2.carbon.identity.user.registration.feature.group <id>org.wso2.carbon.identity.user.registration.feature.group
</id> </id>
@ -1278,17 +1204,10 @@
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.store.feature.group</id> <id>org.wso2.carbon.store.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.store.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -1370,22 +1289,16 @@
<!-- Identity Features --> <!-- Identity Features -->
<feature> <feature>
<id> <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group
</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<feature> <feature>
<id> <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
org.wso2.carbon.identity.application.mgt.server.feature.group
</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
@ -1397,9 +1310,7 @@
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
org.wso2.carbon.identity.user.registration.server.feature.group
</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
@ -1410,34 +1321,26 @@
<!-- Registry Features --> <!-- Registry Features -->
<feature> <feature>
<id> <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
org.wso2.carbon.registry.community.features.server.feature.group
</id>
<version>${carbon.registry.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.registry.community.features.ui.feature.group</id>
org.wso2.carbon.registry.community.features.ui.feature.group
</id>
<version>${carbon.registry.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<!-- End of Registry Features --> <!-- End of Registry Features -->
<!-- Governance features --> <!-- Governance features -->
<feature> <feature>
<id>org.wso2.carbon.registry.extensions.server.feature.group <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
</id>
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
org.wso2.carbon.governance.lifecycle.management.server.feature.group
</id>
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.governance.metadata.server.feature.group <id>org.wso2.carbon.governance.metadata.server.feature.group</id>
</id>
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<!-- End of Governance Features --> <!-- End of Governance Features -->
@ -1534,12 +1437,6 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<!-- END - Analytics features --> <!-- END - Analytics features -->
<!--<feature>-->
<!--<id>-->
<!--org.wso2.carbon.datasource.reader.hadoop.server.feature.group-->
<!--</id>-->
<!--<version>${carbon.data.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.analytics.messageconsole.feature.group</id> <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
@ -1566,13 +1463,6 @@
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<!-- ************** START - Capp Management ********* -->
<!--<feature>-->
<!--<id>org.wso2.carbon.application.mgt.feature.group</id>-->
<!--<version>${carbon.commons.version}</version>-->
<!--</feature>-->
<!-- ************** END - Capp Management ********* -->
<!-- ************** START - Data Bridge ************ --> <!-- ************** START - Data Bridge ************ -->
<feature> <feature>
<id>org.wso2.carbon.databridge.core.server.feature.group</id> <id>org.wso2.carbon.databridge.core.server.feature.group</id>
@ -1693,10 +1583,10 @@
<version>${carbon.metrics.version}</version> <version>${carbon.metrics.version}</version>
</feature> </feature>
<!--jwt grant type handler--> <!--jwt grant type handler-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <!--<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>-->
<version>${identity.jwt.extension.version}</version> <!--<version>${identity.jwt.extension.version}</version>-->
</feature> <!--</feature>-->
</features> </features>
</configuration> </configuration>
</execution> </execution>

11
pom.xml
View File

@ -1012,12 +1012,8 @@
<eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version> <eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version> <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
<!-- MDM android Agent -->
<mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
<!--CXF properties--> <!--CXF properties-->
<cxf.version>2.7.16</cxf.version> <cxf.version>2.7.16</cxf.version>
<cxf.bindings.version>2.5.11</cxf.bindings.version> <cxf.bindings.version>2.5.11</cxf.bindings.version>
@ -1050,7 +1046,6 @@
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<mdm.version>2.0.0-SNAPSHOT</mdm.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>5.0.3</carbon.api.mgt.version> <carbon.api.mgt.version>5.0.3</carbon.api.mgt.version>
@ -1059,7 +1054,7 @@
<carbon.mediation.version>4.5.1</carbon.mediation.version> <carbon.mediation.version>4.5.1</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.0.12-SNAPSHOT</carbon.analytics.common.version> <carbon.analytics.common.version>5.0.11</carbon.analytics.common.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1074,7 +1069,7 @@
<axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version> <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
<!--DAS--> <!--DAS-->
<carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version> <carbon.analytics.version>1.0.5</carbon.analytics.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<carbon.dashboard.version>1.0.13</carbon.dashboard.version> <carbon.dashboard.version>1.0.13</carbon.dashboard.version>
<shindig.version>1.0.0</shindig.version> <shindig.version>1.0.0</shindig.version>
@ -1116,8 +1111,6 @@
<!-- Release plugin ID for github--> <!-- Release plugin ID for github-->
<project.scm.id>github-scm</project.scm.id> <project.scm.id>github-scm</project.scm.id>
<uuf.version>1.0.0-SNAPSHOT</uuf.version>
<!-- MB Features --> <!-- MB Features -->
<carbon.messaging.version>3.1.0</carbon.messaging.version> <carbon.messaging.version>3.1.0</carbon.messaging.version>
<product.mb.version>3.1.0</product.mb.version> <product.mb.version>3.1.0</product.mb.version>