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

Merge pull request #1 from wso2/release-1.9.0

Browse Source 
Merging Release 1.9.0 branch to trunk
revert-dabc3590
Geeth 10 years ago
parent 23d63956a8 6190741df2
commit e0e70b3135
5 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,20 +18,18 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Mobile Device Management Impl</name> <name>WSO2 Carbon - Mobile Device Management Impl</name>
<description>WSO2 Carbon - Mobile Device Management Impl</description> <description>WSO2 Carbon - Mobile Device Management Impl</description>

8
components/device-mgt/pom.xml
Unescape View File

@ -17,21 +17,19 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>carbon-device-mgt-plugins-parent</artifactId> <artifactId>carbon-device-mgt-plugins-parent</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Mobile Device Management Component</name> <name>WSO2 Carbon - Mobile Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

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

@ -17,21 +17,19 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.mobile.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<name>WSO2 Carbon - Mobile Implementation of Device Management</name> <name>WSO2 Carbon - Mobile Implementation of Device Management</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Mobile Device Management functionality <description>This feature contains the core bundles required for Mobile Device Management functionality

8
features/device-mgt/pom.xml
Unescape View File

@ -17,21 +17,19 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>carbon-device-mgt-plugins-parent</artifactId> <artifactId>carbon-device-mgt-plugins-parent</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Feature</name> <name>WSO2 Carbon - Device Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

35
pom.xml
Unescape View File

@ -17,18 +17,16 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>carbon-device-mgt-plugins-parent</artifactId> <artifactId>carbon-device-mgt-plugins-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.9.0-SNAPSHOT</version> <version>1.9.1-SNAPSHOT</version>
<name>WSO2 MDM - Parent</name> <name>WSO2 Carbon - Device Management Plugins Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 Mobile Device Manager</description> <description>WSO2 Carbon - Device Management Plugins Parent</description>
<parent> <parent>
<groupId>org.wso2</groupId> <groupId>org.wso2</groupId>
@ -429,18 +427,9 @@
<!--Maven build number plugin--> <!--Maven build number plugin-->
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<!--Jaggery -->
<jaggery.version>0.9.0</jaggery.version>
<jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.1.0</jaggery.extensions.test.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.version>
<automation.utils.version>4.3.0</automation.utils.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
@ -452,9 +441,6 @@
<orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version> <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.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.6.1</cxf.version> <cxf.version>2.6.1</cxf.version>
@ -483,7 +469,7 @@
<carbon.device.mgt.version>0.9.0</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>1.9.0-SNAPSHOT</carbon.mobile.device.mgt.version> <carbon.mobile.device.mgt.version>1.9.1-SNAPSHOT</carbon.mobile.device.mgt.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>1.3.1</carbon.api.mgt.version> <carbon.api.mgt.version>1.3.1</carbon.api.mgt.version>
@ -686,17 +672,6 @@
</releases> </releases>
</repository> </repository>
<repository>
<id>nexus-releases</id>
<name>WSO2 Release Distribution Repository</name>
<url>http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
<repository>
<id>nexus-service-releases</id>
<name>WSO2 Release Service Repository</name>
<url>http://maven.wso2.org/nexus/service/local/repositories/releases/content/</url>
</repository>
</repositories> </repositories>
</project> </project>

Write Preview
Loading…
Cancel
Save