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

Fixing the product mdm repo with released device mgt component -version 0.9.0

Browse Source
revert-dabc3590
Geeth Munasinghe 10 years ago
parent dcac237380
commit 2ccc35f9bd
10 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File

6
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
Unescape View File

@ -107,15 +107,15 @@
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId> <artifactId>org.wso2.carbon.apimgt.api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId> <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
</dependency> </dependency>
<dependency> <dependency>

2
features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
Unescape View File

@ -43,7 +43,7 @@
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

24
pom.xml
Unescape View File

@ -327,22 +327,22 @@
<!--CDM core dependencies--> <!--CDM core dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId> <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${cdm.core.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
@ -409,7 +409,7 @@
<!--APIM dependencies--> <!--APIM dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId> <artifactId>org.wso2.carbon.apimgt.core</artifactId>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
@ -420,7 +420,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId> <artifactId>org.wso2.carbon.apimgt.api</artifactId>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
@ -431,7 +431,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId> <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
@ -611,8 +611,8 @@
<carbon.kernel.version.range>[4.3.0, 4.4.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.3.0, 4.4.0)</carbon.kernel.version.range>
<!--CDM versions--> <!--CDM versions-->
<cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version> <cdm.core.version>0.9.0</cdm.core.version>
<cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range> <cdm.core.version.range>[0.8.0, 2.0.0)</cdm.core.version.range>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@ -658,7 +658,7 @@
<carbon.deployment.version>4.3.1</carbon.deployment.version> <carbon.deployment.version>4.3.1</carbon.deployment.version>
<!-- Identity --> <!-- Identity -->
<carbon.identity.version>4.3.2</carbon.identity.version> <carbon.identity.version>4.3.3</carbon.identity.version>
<!-- Multi-tenancy --> <!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.3</carbon.multitenancy.version> <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
@ -670,13 +670,13 @@
<carbon.governance.version>4.3.0</carbon.governance.version> <carbon.governance.version>4.3.0</carbon.governance.version>
<!-- Device Management --> <!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>0.9.0</carbon.device.mgt.version>
<!-- Mobile Device Management --> <!-- Mobile Device Management -->
<carbon.mobile.device.mgt.version>2.0.0-SNAPSHOT</carbon.mobile.device.mgt.version> <carbon.mobile.device.mgt.version>2.0.0-SNAPSHOT</carbon.mobile.device.mgt.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version> <carbon.api.mgt.version>1.3.1</carbon.api.mgt.version>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>

4
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -306,13 +306,13 @@
<files> <files>
<file> <file>
<source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source> <source>../mobileservices/agents/android/jax-rs/target/mdm-android-api.war</source>
<outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<file> <file>
<source>../rest-api/target/wso2cdm-api.war</source> <source>../rest-api/target/wso2mdm-api.war</source>
<outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps <outputDirectory>wso2mdm-${pom.version}/repository/deployment/server/webapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>

2
product/modules/distribution/src/assembly/docs.xml
Unescape View File

@ -29,7 +29,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../modules/documentation/src/site/xdoc/user-core</directory> <directory>../../modules/documentation/src/site/xdoc/user-core</directory>
<outputDirectory>wso2mobileserver-${carbon.mobile.device.mgt.version}-docs/user-core</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}-docs/user-core</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
<includes> <includes>
<include>user-mgt-actdir.xml</include> <include>user-mgt-actdir.xml</include>

2
product/modules/integration/tests-common/pom.xml
Unescape View File

@ -39,7 +39,7 @@
<modules> <modules>
<module>admin-clients</module> <module>admin-clients</module>
<module>integration-test-utils</module> <module>integration-test-utils</module>
<module>ui-pages</module> <!--<module>ui-pages</module>-->
</modules> </modules>
</project> </project>

4
product/modules/mobileservices/agents/android/jax-rs/pom.xml
Unescape View File

@ -146,12 +146,12 @@
<!--CDM Dependencies--> <!--CDM Dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
product/modules/mobileservices/agents/windows/jax-rs/pom.xml
Unescape View File

@ -169,12 +169,12 @@
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -106,10 +106,10 @@
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
@ -157,13 +157,13 @@
<!-- API Management Features --> <!-- API Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of API Management Features --> <!-- End of API Management Features -->
@ -198,9 +198,9 @@
<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}
</featureArtifactDef> </featureArtifactDef>
<!--<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> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
@ -213,9 +213,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <featureArtifactDef>
<!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}--> org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
<!--</featureArtifactDef>--> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
@ -421,10 +421,10 @@
<id>org.wso2.carbon.um.ws.service.server.feature.group</id> <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>--> <feature>
<!--<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> <feature>
<id>org.wso2.carbon.identity.oauth.common.feature.group</id> <id>org.wso2.carbon.identity.oauth.common.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
@ -441,10 +441,10 @@
<id>org.wso2.carbon.identity.core.feature.group</id> <id>org.wso2.carbon.identity.core.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<!--<feature>--> <feature>
<!--<id>org.wso2.carbon.idp.mgt.feature.group</id>--> <id>org.wso2.carbon.idp.mgt.feature.group</id>
<!--<version>${carbon.identity.version}</version>--> <version>${carbon.identity.version}</version>
<!--</feature>--> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id> <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>

4
product/modules/rest-api/pom.xml
Unescape View File

@ -160,12 +160,12 @@
<version>1.9.0</version> <version>1.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

Write Preview
Loading…
Cancel
Save