From 2b25d2bd2c98753ae76ee428c0d1bb4d0aebac61 Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Wed, 3 Dec 2014 15:19:07 +0530
Subject: [PATCH] Fixing pom issues

---
 .../org.wso2.carbon.device.mgt.core/pom.xml   | 21 +++++++++++++++--
 components/device-mgt/pom.xml                 | 18 +++++++++++++++
 pom.xml                                       | 23 +++++++++++--------
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 4249d8f6c2..91b34069d7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -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>
@@ -54,8 +71,8 @@
                         <Import-Package>
                             org.apache.axis2.*;
                             version="${axis2.osgi.version.range}",
-                            org.osgi.framework, 
-			    org.osgi.service.component,
+                            org.osgi.framework,
+                            org.osgi.service.component,
                             org.apache.commons.logging,
                         </Import-Package>
                         <Export-Package>
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index 399870d93f..0340cc35b2 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -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">
diff --git a/pom.xml b/pom.xml
index 876336192c..528fa0fee6 100644
--- a/pom.xml
+++ b/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>