mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge branch 'master' of https://github.com/geethkokila/product-cdm
This commit is contained in:
commit
2a1f6d38fe
@ -1,4 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
~
|
||||
~ WSO2 Inc. licenses this file to you under the Apache License,
|
||||
~ Version 2.0 (the "License"); you may not use this file except
|
||||
~ in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing,
|
||||
~ software distributed under the License is distributed on an
|
||||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
~ KIND, either express or implied. See the License for the
|
||||
~ specific language governing permissions and limitations
|
||||
~ under the License.
|
||||
-->
|
||||
<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">
|
||||
<parent>
|
||||
@ -55,7 +72,7 @@
|
||||
org.apache.axis2.*;
|
||||
version="${axis2.osgi.version.range}",
|
||||
org.osgi.framework,
|
||||
org.osgi.service.component,
|
||||
org.osgi.service.component,
|
||||
org.apache.commons.logging,
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
|
||||
@ -1,4 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
~
|
||||
~ WSO2 Inc. licenses this file to you under the Apache License,
|
||||
~ Version 2.0 (the "License"); you may not use this file except
|
||||
~ in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing,
|
||||
~ software distributed under the License is distributed on an
|
||||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
~ KIND, either express or implied. See the License for the
|
||||
~ specific language governing permissions and limitations
|
||||
~ under the License.
|
||||
-->
|
||||
|
||||
<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">
|
||||
|
||||
23
pom.xml
23
pom.xml
@ -43,17 +43,7 @@
|
||||
<module>product/modules/integration</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<carbon.kernal.version>4.2.0</carbon.kernal.version>
|
||||
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
|
||||
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
|
||||
|
||||
<!--Testing -->
|
||||
<test.framework.version>4.3.1</test.framework.version>
|
||||
<testng.version>6.8</testng.version>
|
||||
<stub.version>4.3.0-SNAPSHOT</stub.version>
|
||||
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
|
||||
</properties>
|
||||
|
||||
|
||||
<dependencyManagement>
|
||||
@ -102,5 +92,18 @@
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<properties>
|
||||
<carbon.kernal.version>4.2.0</carbon.kernal.version>
|
||||
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
|
||||
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
|
||||
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
|
||||
|
||||
<!--Testing -->
|
||||
<test.framework.version>4.3.1</test.framework.version>
|
||||
<testng.version>6.8</testng.version>
|
||||
<stub.version>4.3.0-SNAPSHOT</stub.version>
|
||||
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user