ruwin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the issues in build

Browse Source
revert-70aa11f8
harshanL 10 years ago
parent d84a3c47d2
commit 65fa0fcd61
6 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
Unescape View File

@ -139,7 +139,7 @@
<artifactId>org.wso2.carbon.user.api</artifactId> <artifactId>org.wso2.carbon.user.api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
</dependency> </dependency>
<dependency> <dependency>

24
pom.xml
Unescape View File

@ -270,7 +270,7 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
<exclusions> <exclusions>
@ -575,9 +575,9 @@
</dependencyManagement> </dependencyManagement>
<scm> <scm>
<url>https://github.com/wso2/product-mdm.git</url> <url>https://github.com/wso2/product-cdm.git</url>
<developerConnection>scm:git:https://github.com/wso2/product-mdm.git</developerConnection> <developerConnection>scm:git:https://github.com/wso2/product-cdm.git</developerConnection>
<connection>scm:git:https://github.com/wso2/product-mdm.git</connection> <connection>scm:git:https://github.com/wso2/product-cdm.git</connection>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
@ -619,7 +619,7 @@
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<configuration> <configuration>
<preparationGoals>clean install</preparationGoals> <preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>false</autoVersionSubmodules>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -780,11 +780,11 @@
<!--Jaggery --> <!--Jaggery -->
<jaggery.version>0.9.0.ALPHA6</jaggery.version> <jaggery.version>0.9.0.ALPHA6</jaggery.version>
<jaggery.extensions.version>1.0.0</jaggery.extensions.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.1.0-SNAPSHOT</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
<!--Testing --> <!--Testing -->
<automation.test.framework.version>4.3.1</automation.test.framework.version> <automation.test.framework.version>4.3.1</automation.test.framework.version>
<automation.utils.version>4.3.0-SNAPSHOT</automation.utils.version> <automation.utils.version>4.3.0</automation.utils.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
@ -802,14 +802,11 @@
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.3.2</carbon.commons.version> <carbon.commons.version>4.3.2</carbon.commons.version>
<!-- Carbon Utils -->
<carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.3.0</carbon.deployment.version> <carbon.deployment.version>4.3.0</carbon.deployment.version>
<!-- Identity --> <!-- Identity -->
<carbon.identity.version>4.3.0</carbon.identity.version> <carbon.identity.version>4.3.1</carbon.identity.version>
<!-- Multi-tenancy --> <!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.0</carbon.multitenancy.version> <carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
@ -818,10 +815,7 @@
<carbon.registry.version>4.3.0</carbon.registry.version> <carbon.registry.version>4.3.0</carbon.registry.version>
<!-- Governance --> <!-- Governance -->
<carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version> <carbon.governance.version>4.3.0</carbon.governance.version>
<!-- Transport Management -->
<carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
<!-- Device Management --> <!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>

4
product/modules/integration/tests-common/admin-clients/pom.xml
Unescape View File

@ -29,8 +29,8 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.cdm.integration.common.clients</artifactId> <artifactId>org.wso2.carbon.cdm.integration.common.clients</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>WSO2 CDM - Integration Admin Clients</name> <name>WSO2 CDM - Integration Admin Clients</name>
</project> </project>

4
product/modules/integration/tests-common/integration-test-utils/pom.xml
Unescape View File

@ -29,8 +29,8 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.cdm.integration.common.utils</artifactId> <artifactId>org.wso2.carbon.cdm.integration.common.utils</artifactId>
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>WSO2 CDM - Integration Test Utils</name> <name>WSO2 CDM - Integration Test Utils</name>

4
product/modules/integration/tests-common/ui-pages/pom.xml
Unescape View File

@ -29,8 +29,8 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.cdm.integration.ui.pages</artifactId> <artifactId>org.wso2.carbon.cdm.integration.ui.pages</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>WSO2 CDM - Integration Test Ui Pages</name> <name>WSO2 CDM - Integration Test Ui Pages</name>

39
product/modules/p2-profile-gen/pom.xml
Unescape View File

@ -140,11 +140,14 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version} org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Carbon Deployment Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Carbon Deployment Features -->
<!-- Carbon Utils Features --> <!-- Carbon Utils Features -->
<!-- End of Carbon Utils Features --> <!-- End of Carbon Utils Features -->
@ -159,9 +162,7 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
</featureArtifactDef>
<!-- End of Carbon Commons Features --> <!-- End of Carbon Commons Features -->
<!-- API Manager related features --> <!-- API Manager related features -->
@ -178,7 +179,7 @@
<!-- Identity Features --> <!-- Identity Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef> <!--featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@ -250,13 +251,13 @@
<!-- Governance Features --> <!-- Governance Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -328,12 +329,17 @@
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<!-- End of Carbon Deployment Features --> <feature>
<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<!-- End of Carbon Deployment Features -->
<!-- Carbon Utils Features --> <!-- Carbon Utils Features -->
<!-- End of Carbon Utils Features --> <!-- End of Carbon Utils Features -->
@ -351,10 +357,7 @@
<id>org.wso2.carbon.logging.mgt.feature.group</id> <id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id>
<version>${carbon.transport.mgt.version}</version>
</feature>
<!--End of Carbon Commons Features--> <!--End of Carbon Commons Features-->
<!-- API Manager Features --> <!-- API Manager Features -->
@ -374,7 +377,7 @@
<!-- Identity Features --> <!-- Identity Features -->
<feature> <feature>
<id>org.wso2.carbon.security.mgt.feature.group</id> <id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--feature> <!--feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id> <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>

Write Preview
Loading…
Cancel
Save