Fixing SNAPSHOT versions in some of the dependent components

revert-dabc3590
prabathabey 10 years ago
parent 5fb9c42027
commit 1c8aaab209

@ -88,6 +88,10 @@
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId> <artifactId>org.eclipse.osgi</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
@ -96,17 +100,13 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>

@ -94,14 +94,13 @@
</properties> </properties>
</adviceFile> </adviceFile>
<bundles> <bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${project.version} <bundleDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${carbon.mobile.device.mgt.version}
</bundleDef> </bundleDef>
</bundles> </bundles>
<importFeatures> <importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version} <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
</importFeatureDef> <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${cdm.core.version}
</importFeatureDef>
</importFeatures> </importFeatures>
</configuration> </configuration>
</execution> </execution>

@ -44,10 +44,7 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Test automation dependencies -->
<!--Test automation dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.automation</groupId> <groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.engine</artifactId> <artifactId>org.wso2.carbon.automation.engine</artifactId>
@ -72,7 +69,6 @@
<version>${test.framework.version}</version> <version>${test.framework.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId> <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
@ -81,7 +77,6 @@
</dependency> </dependency>
<!--Carbon Kernel Dependencies--> <!--Carbon Kernel Dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId> <artifactId>org.wso2.carbon.user.core</artifactId>
@ -235,16 +230,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat.ext</artifactId> <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
@ -256,9 +241,7 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</dependency> </dependency>
<!--CDM core dependencies--> <!--CDM core dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
@ -280,16 +263,13 @@
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<!--MDM dependencies--> <!--MDM dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.mdm</groupId> <groupId>org.wso2.carbon.mdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!--Osgi dependencies--> <!--Osgi dependencies-->
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>
@ -326,9 +306,7 @@
<version>3.3.100.v20120522-1822</version> <version>3.3.100.v20120522-1822</version>
</dependency> </dependency>
<!--Orbit dependencies--> <!--Orbit dependencies-->
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2-database-engine</artifactId>
@ -345,9 +323,7 @@
<version>${orbit.tomcat.jdbc.pooling.version}</version> <version>${orbit.tomcat.jdbc.pooling.version}</version>
</dependency> </dependency>
<!--APIM dependencies--> <!--APIM dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId> <artifactId>org.wso2.carbon.apimgt.core</artifactId>
@ -483,7 +459,6 @@
</dependency> </dependency>
<!--CXF dependencies (needed for mobile Jax_RS web apps)--> <!--CXF dependencies (needed for mobile Jax_RS web apps)-->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
@ -511,9 +486,7 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--Windows Jax-RS dependencies--> <!--Windows Jax-RS dependencies-->
<dependency> <dependency>
<groupId>org.apache.wss4j</groupId> <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-common</artifactId> <artifactId>wss4j-ws-security-common</artifactId>
@ -544,7 +517,6 @@
<artifactId>cxf-rt-ws-security</artifactId> <artifactId>cxf-rt-ws-security</artifactId>
<version>2.6.1</version> <version>2.6.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -558,10 +530,8 @@
<cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version> <cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version>
<cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range> <cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version> <carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<!--Maven build number plugin--> <!--Maven build number plugin-->
@ -570,13 +540,9 @@
<!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>--> <!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
<!--Jaggery --> <!--Jaggery -->
<jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version> <jaggery.version>0.9.0.ALPHA6</jaggery.version>
<jaggery.carbon.module.version>1.1.0</jaggery.carbon.module.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.process.module.version>1.0.0</jaggery.process.module.version> <jaggery.extensions.sso.version>1.1.0-SNAPSHOT</jaggery.extensions.sso.version>
<jaggery.uuid.module.version>1.0.0</jaggery.uuid.module.version>
<jaggery.sso.feature.version>1.1.0-SNAPSHOT</jaggery.sso.feature.version>
<jaggery.i18n.feature.version>1.1.0-SNAPSHOT</jaggery.i18n.feature.version>
<jaggery.test.feature.version>1.1.0</jaggery.test.feature.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>
@ -607,6 +573,39 @@
<jackson.version>1.9.0</jackson.version> <jackson.version>1.9.0</jackson.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons -->
<carbon.commons.version>4.3.1</carbon.commons.version>
<!-- Carbon Utils -->
<carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
<!-- Carbon Deployment -->
<carbon.deployment.version>4.3.0-SNAPSHOT</carbon.deployment.version>
<!-- Identity -->
<carbon.identity.version>4.3.0</carbon.identity.version>
<!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
<!-- Registry -->
<carbon.registry.version>4.3.0</carbon.registry.version>
<!-- Governance -->
<carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version>
<!-- Transport Management -->
<carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
<!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
<!-- Mobile Device Management -->
<carbon.mobile.device.mgt.version>2.0.0-SNAPSHOT</carbon.mobile.device.mgt.version>
<!-- API Management -->
<carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
</properties> </properties>
<scm> <scm>

@ -103,215 +103,196 @@
<!--<featureArtifactDef> <!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>--> </featureArtifactDef>-->
<!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${cdm.core.version} org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${cdm.core.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features -->
<!-- Mobile Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${jaggery.carbon.module.version} org.wso2.carbon.mdm:org.wso2.carbon.device.mgt.mobile.feature:${carbon.mobile.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Mobile Device Management Features -->
<!-- Carbon Deployment Features -->
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:process.feature:${jaggery.process.module.version} org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:uuid.feature:${jaggery.uuid.module.version} org.wso2.carbon:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Carbon Deployment Features -->
<!-- Jaggery Features -->
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:sso.feature:${jaggery.sso.feature.version} org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:i18n.feature:${jaggery.i18n.feature.version} org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery.test.feature.version} org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} org.jaggeryjs.modules:uuid.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.service.mgt.feature:${carbon.platform.version} org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.platform.version} org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Jaggery Features -->
<!-- Misc Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.module.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef> <!-- End of Misc Features -->
org.wso2.carbon:org.wso2.carbon.dbconsole.ui.feature:${carbon.platform.version}
</featureArtifactDef>-->
<!-- API Manager related features --> <!-- API Management Features -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.user.mgt.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.oauth.common.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.provider.server.feature:${carbon.platform.version}
</featureArtifactDef>
<!--Governance Feature-->
<!--featureArtifactDef>org.wso2.carbon:org.wso2.carbon.gadget.initializer.feature:${carbon.platform.version}</featureArtifactDef-->
<!--featureArtifactDef>org.wso2.carbon:org.wso2.carbon.gadget.editor.feature:${carbon.platform.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.gadget.editor.ui.feature:${carbon.platform.version}</featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of API Management Features -->
<!-- Carbon Commons Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.version} org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.idp.mgt.server.feature:${carbon.platform.version} org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.version} org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:${carbon.platform.version} org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Carbon Commons Features -->
<!-- Carbon Multi-tenancy Features -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}-->
<!--</featureArtifactDef>-->
<!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.tenant.common.server.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.um.ws.service.client.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!-- registry features --> <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!-- SSO -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.community.features.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.community.features.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<feaureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
</feaureArtifactDef>
<!-- SSO Fix-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ws.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.contentsearch.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--Governance Feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Identity Features -->
<!-- Registry Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.self.registration.server.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<!-- API Manager Publisher and Store Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<!-- SSO -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.ws.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version}
</featureArtifactDef> </featureArtifactDef>
<feaureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.version}
</feaureArtifactDef>
<!-- SSO Fix--> <!-- Governance Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.user.profile.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!-- End of Governance Features -->
org.wso2.carbon:org.wso2.carbon.identity.mgt.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.claim.mgt.server.feature:${carbon.platform.version}
</featureArtifactDef>
<!-- End of SSO Fixes -->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -331,276 +312,250 @@
</destination> </destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<feature> <!-- Device Management Features -->
<id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.server.feature.group</id> <id>org.wso2.carbon.device.mgt.server.feature.group</id>
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${project.version}</version> <version>${carbon.mobile.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${cdm.core.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features -->
<!-- Carbon Deployment Features -->
<feature> <feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.module.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<!-- End of Carbon Deployment Features -->
<!-- Jaggery Features -->
<feature> <feature>
<id>org.jaggeryjs.feature.group</id> <id>org.jaggeryjs.feature.group</id>
<version>${jaggery.feature.version}</version> <version>${jaggery.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.carbon.feature.group</id> <id>org.jaggeryjs.modules.carbon.feature.group</id>
<version>${jaggery.carbon.module.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.process.feature.group</id> <id>org.jaggeryjs.modules.process.feature.group</id>
<version>${jaggery.process.module.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.uuid.feature.group</id> <id>org.jaggeryjs.modules.uuid.feature.group</id>
<version>${jaggery.uuid.module.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.sso.feature.group</id> <id>org.jaggeryjs.modules.sso.feature.group</id>
<version>${jaggery.sso.feature.version}</version> <version>${jaggery.extensions.sso.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.i18n.feature.group</id> <id>org.jaggeryjs.modules.i18n.feature.group</id>
<version>${jaggery.i18n.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id> <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery.test.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<!-- End of Jaggery Features -->
<!-- Misc Features -->
<feature> <feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id> <id>org.wso2.carbon.transport.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.transport.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.service.mgt.feature.group</id> <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<!-- End of Misc Features -->
<!-- API Management Features -->
<feature> <feature>
<id>org.wso2.carbon.security.mgt.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<!-- API Manager Publisher and Store Features -->
<feature> <feature>
<id>org.wso2.carbon.module.mgt.feature.group</id> <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> <id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<!-- End of API Management Features -->
<!-- API Manager related features --> <!-- Carbon Commons Features -->
<feature> <feature>
<id>org.wso2.carbon.um.ws.service.server.feature.group</id> <id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.user.mgt.feature.group</id> <id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth.server.feature.group</id> <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth.common.feature.group</id> <id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<!-- End of Carbon Commons Features -->
<!-- Carbon Multi-tenancy Features -->
<!--<feature>-->
<!--<id>org.wso2.carbon.tenant.common.server.feature.group</id>-->
<!--<version>${carbon.multitenancy.version}</version>-->
<!--</feature>-->
<!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features -->
<feature> <feature>
<id>org.wso2.carbon.identity.provider.server.feature.group</id> <id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
org.wso2.carbon.identity.thrift.authentication.feature.group <version>${carbon.identity.version}</version>
</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.core.feature.group</id> <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.oauth.server.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.logging.mgt.feature.group</id> <id>org.wso2.carbon.identity.oauth.common.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.extensions.server.feature.group</id> <id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.server.feature.group</id> <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.identity.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.idp.mgt.feature.group</id>-->
<!--<version>${carbon.identity.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id> <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature>
<!-- SSO Features -->
<feature>
<id>
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
</id>
<version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id> </id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.idp.mgt.server.feature.group</id> <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.user.profile.server.feature.group</id> <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!-- SSO Fix-->
<feature> <feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id> <id>org.wso2.carbon.identity.user.profile.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id> <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id> <id>org.wso2.carbon.identity.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.claim.mgt.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.self.registration.server.feature.group</id> <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!-- End of Identity Features -->
<!-- registry features --> <!-- Registry Features -->
<feature> <feature>
<id>org.wso2.carbon.registry.core.feature.group</id> <id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.core.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ui.menu.feature.group</id> <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id> <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.associations.dependencies.feature.group</id> <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.community.features.server.feature.group</id> <id>org.wso2.carbon.registry.community.features.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ws.feature.group</id> <id>org.wso2.carbon.registry.ws.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.extensions.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.contentsearch.feature.group</id> <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<!-- governance feature -->
<feature>
<id>org.wso2.carbon.governance.metadata.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id> <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.um.ws.service.client.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<!-- API Manager Publisher and Store Features -->
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<!-- SSO Features -->
<feature>
<id>
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<!-- End of Registry Features -->
<!-- SSO Fix--> <!-- Governance Features -->
<feature> <feature>
<id>org.wso2.carbon.identity.user.profile.feature.group</id> <id>org.wso2.carbon.governance.metadata.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.governance.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.application.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.idp.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.mgt.feature.group</id> <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.claim.mgt.server.feature.group</id> <id>org.wso2.carbon.registry.extensions.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<!--SSO FIX OVER--> <!-- End of Governance Features -->
</features> </features>
</configuration> </configuration>

Loading…
Cancel
Save