You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ol...@apache.org on 2012/08/25 00:05:18 UTC

[2/4] git commit: %s/tab/ws/

%s/tab/ws/


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5ef60ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5ef60ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5ef60ace

Branch: refs/heads/master
Commit: 5ef60aceb1b6472f855624bc0110103484329db1
Parents: 9fb282b
Author: olivier lamy <ol...@apache.org>
Authored: Sat Aug 25 00:03:23 2012 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Aug 25 00:03:23 2012 +0200

----------------------------------------------------------------------
 agent/pom.xml                                      |   96 +++---
 api/pom.xml                                        |   52 ++--
 awsapi/pom.xml                                     |  178 +++++-----
 console-proxy/pom.xml                              |   62 ++--
 core/pom.xml                                       |   88 ++--
 deps/XenServerJava/pom.xml                         |   46 ++--
 parent/pom.xml                                     |  132 +++---
 .../user-concentrated-pod/pom.xml                  |   20 +-
 .../deployment-planners/user-dispersing/pom.xml    |   20 +-
 plugins/file-systems/netapp/pom.xml                |   34 +-
 plugins/host-allocators/random/pom.xml             |   20 +-
 plugins/hypervisors/kvm/pom.xml                    |   44 +-
 plugins/hypervisors/ovm/pom.xml                    |   20 +-
 plugins/hypervisors/vmware/pom.xml                 |   34 +-
 plugins/hypervisors/xen/pom.xml                    |   34 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |   20 +-
 plugins/network-elements/f5/pom.xml                |   44 +-
 plugins/network-elements/juniper-srx/pom.xml       |   44 +-
 plugins/network-elements/midokura-midonet/pom.xml  |   20 +-
 plugins/network-elements/netscaler/pom.xml         |   44 +-
 plugins/network-elements/nicira-nvp/pom.xml        |   20 +-
 plugins/network-elements/ovs/pom.xml               |   20 +-
 plugins/parent/pom.xml                             |   44 +-
 plugins/storage-allocators/random/pom.xml          |   20 +-
 plugins/user-authenticators/ldap/pom.xml           |   20 +-
 plugins/user-authenticators/md5/pom.xml            |   20 +-
 plugins/user-authenticators/plain-text/pom.xml     |   20 +-
 pom.xml                                            |  308 +++++++-------
 server/pom.xml                                     |  108 +++---
 usage/pom.xml                                      |   42 +-
 utils/pom.xml                                      |  226 ++++++------
 vmware-base/pom.xml                                |  102 +++---
 32 files changed, 1001 insertions(+), 1001 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 1db0316..a569a7d 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -17,52 +17,52 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-agent</artifactId>
-	<name>Apache CloudStack Agents</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>6.1.26</version>
-		</dependency>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-utils</artifactId>
-			<version>${project.version}</version>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-agent</artifactId>
+  <name>Apache CloudStack Agents</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.26</version>
+    </dependency>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index c2ffa81..f0ba16d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -17,30 +17,30 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-api</artifactId>
-	<name>Apache CloudStack API</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-utils</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>${cs.gson.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-api</artifactId>
+  <name>Apache CloudStack API</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${cs.gson.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 2555d9f..045a62a 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -17,99 +17,99 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-awsapi</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<name>Apache CloudStack AWS API Bridge</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-awsapi</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <name>Apache CloudStack AWS API Bridge</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
+  </parent>
+  <dependencies>
     <dependency>
       <groupId>org.apache.axis2</groupId>
       <artifactId>axis2</artifactId>
       <version>${cs.axis2.version}</version>
     </dependency>
-				<dependency>
-						<groupId>org.apache.ws.commons.axiom</groupId>
-						<artifactId>axiom-api</artifactId>
-						<version>${cs.axiom.version}</version>
-				</dependency>
-<dependency>
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate-core</artifactId>
-    <version>${cs.hibernate.version}</version>
-</dependency>
-<dependency>
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate-annotations</artifactId>
-    <version>${cs.hibernate.version}</version>
-</dependency>
-<dependency>
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate-entitymanager</artifactId>
-    <version>${cs.hibernate.version}</version>
-</dependency>
-<dependency>
-    <groupId>log4j</groupId>
-    <artifactId>log4j</artifactId>
-    <version>${cs.log4j.version}</version>
-</dependency>
-<dependency>
-    <groupId>org.apache.neethi</groupId>
-    <artifactId>neethi</artifactId>
-    <version>${cs.neethi.version}</version>
-</dependency>
-<dependency>
-<groupId>com.google.code.gson</groupId>
-<artifactId>gson</artifactId>
-<version>${cs.gson.version}</version>
-</dependency>
-<dependency>
-<groupId>commons-codec</groupId>
-<artifactId>commons-codec</artifactId>
-<version>${cs.codec.version}</version>
-</dependency>
-<dependency>
-    <groupId>javax.servlet</groupId>
-    <artifactId>servlet-api</artifactId>
-    <version>${cs.servlet.version}</version>
-		<scope>provided</scope>
-</dependency>
-<dependency>
-    <groupId>com.googlecode.json-simple</groupId>
-    <artifactId>json-simple</artifactId>
-    <version>1.1</version>
-</dependency>
-<dependency>
-<groupId>org.jasypt</groupId>
-<artifactId>jasypt</artifactId>
-<version>${cs.jasypt.version}</version>
-</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-<!--
-		<testSourceDirectory>test</testSourceDirectory>
-    <plugins>
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <version>2.2</version>
-       <executions>
-         <execution>
-           <goals>
-             <goal>test-jar</goal>
-           </goals>
-         </execution>
-       </executions>
-     </plugin>
-    </plugins>
--->
-	</build>
+    <dependency>
+      <groupId>org.apache.ws.commons.axiom</groupId>
+      <artifactId>axiom-api</artifactId>
+      <version>${cs.axiom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <version>${cs.hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>${cs.hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>${cs.hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${cs.log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.neethi</groupId>
+      <artifactId>neethi</artifactId>
+      <version>${cs.neethi.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${cs.gson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${cs.codec.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${cs.servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt</artifactId>
+      <version>${cs.jasypt.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <!--
+        <testSourceDirectory>test</testSourceDirectory>
+        <plugins>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-jar-plugin</artifactId>
+           <version>2.2</version>
+           <executions>
+             <execution>
+               <goals>
+                 <goal>test-jar</goal>
+               </goals>
+             </execution>
+           </executions>
+         </plugin>
+        </plugins>
+    -->
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/console-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 5dca6e7..31f4e31 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -17,35 +17,35 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-console-proxy</artifactId>
-	<name>Apache CloudStack Console Proxy</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${cs.log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>${cs.gson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${cs.codec.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-console-proxy</artifactId>
+  <name>Apache CloudStack Console Proxy</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${cs.log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${cs.gson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${cs.codec.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2ea1cc6..ec41088 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,48 +17,48 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-core</artifactId>
-	<name>Apache CloudStack Core</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>xapi</artifactId>
-			<version>${cs.xapi.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>junit</artifactId>
-					<groupId>junit</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>${cs.httpclient.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-codec</artifactId>
-					<groupId>commons-codec</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-		<!-- <testSourceDirectory>test</testSourceDirectory> -->
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-core</artifactId>
+  <name>Apache CloudStack Core</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>xapi</artifactId>
+      <version>${cs.xapi.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${cs.httpclient.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-codec</artifactId>
+          <groupId>commons-codec</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <!-- <testSourceDirectory>test</testSourceDirectory> -->
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/deps/XenServerJava/pom.xml
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index f60f1c8..1debfd6 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -17,27 +17,27 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>cloud-parent</artifactId>
-		<groupId>com.cloud</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>xapi</artifactId>
-	<version>5.6.100-1-SNAPSHOT</version>
-	<name>XenSource XAPI</name>
-	<description>XenSource XAPI Java Bindings</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.xmlrpc</groupId>
-			<artifactId>xmlrpc-client</artifactId>
-			<version>${cs.xmlrpc.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<defaultGoal>install</defaultGoal>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>cloud-parent</artifactId>
+    <groupId>com.cloud</groupId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>xapi</artifactId>
+  <version>5.6.100-1-SNAPSHOT</version>
+  <name>XenSource XAPI</name>
+  <description>XenSource XAPI Java Bindings</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.xmlrpc</groupId>
+      <artifactId>xmlrpc-client</artifactId>
+      <version>${cs.xmlrpc.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <defaultGoal>install</defaultGoal>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9564572..1f938d7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -17,70 +17,70 @@
   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/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloudstack</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-parent</artifactId>
-	<packaging>pom</packaging>
-	<name>Apache CloudStack Parent</name>
-	<description>Apache CloudStack Parent POM</description>
-	<properties>
-		<cs.log4j.version>1.2.16</cs.log4j.version>
-		<cs.log4j.extras.version>1.1</cs.log4j.extras.version>
-		<cs.cglib.version>2.2.2</cs.cglib.version>
-		<cs.dbcp.version>1.4</cs.dbcp.version>
-		<cs.pool.version>1.6</cs.pool.version>
-		<cs.codec.version>1.6</cs.codec.version>
-		<cs.configuration.version>1.8</cs.configuration.version>
-		<cs.ejb.version>3.0</cs.ejb.version>
-		<cs.junit.version>4.10</cs.junit.version>
-		<cs.bcprov.version>1.46</cs.bcprov.version>
-		<cs.jsch.version>0.1.42</cs.jsch.version>
-		<cs.jpa.version>1.0.0.Final</cs.jpa.version>
-		<cs.jasypt.version>1.9.0</cs.jasypt.version>
-		<cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
-		<cs.ehcache.version>1.5.0</cs.ehcache.version>
-		<cs.gson.version>1.7.1</cs.gson.version>
-		<cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
-		<cs.httpclient.version>3.1</cs.httpclient.version>
-		<cs.httpcore.version>4.0</cs.httpcore.version>
-		<cs.mysql.version>5.1.12</cs.mysql.version>
-		<cs.xstream.version>1.3.1</cs.xstream.version>
-		<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
-		<cs.mail.version>1.4</cs.mail.version>
-		<cs.axis.version>1.4</cs.axis.version>
-		<cs.axis2.version>1.5.1</cs.axis2.version>
-		<cs.axiom.version>1.2.8</cs.axiom.version>
-		<cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
-		<cs.neethi.version>2.0.4</cs.neethi.version>
-		<cs.servlet.version>2.4</cs.servlet.version>
-		<skipTests>true</skipTests>
-	</properties>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>${cs.jdk.version}</source>
-					<target>${cs.jdk.version}</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${cs.junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloudstack</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>Apache CloudStack Parent</name>
+  <description>Apache CloudStack Parent POM</description>
+  <properties>
+    <cs.log4j.version>1.2.16</cs.log4j.version>
+    <cs.log4j.extras.version>1.1</cs.log4j.extras.version>
+    <cs.cglib.version>2.2.2</cs.cglib.version>
+    <cs.dbcp.version>1.4</cs.dbcp.version>
+    <cs.pool.version>1.6</cs.pool.version>
+    <cs.codec.version>1.6</cs.codec.version>
+    <cs.configuration.version>1.8</cs.configuration.version>
+    <cs.ejb.version>3.0</cs.ejb.version>
+    <cs.junit.version>4.10</cs.junit.version>
+    <cs.bcprov.version>1.46</cs.bcprov.version>
+    <cs.jsch.version>0.1.42</cs.jsch.version>
+    <cs.jpa.version>1.0.0.Final</cs.jpa.version>
+    <cs.jasypt.version>1.9.0</cs.jasypt.version>
+    <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
+    <cs.ehcache.version>1.5.0</cs.ehcache.version>
+    <cs.gson.version>1.7.1</cs.gson.version>
+    <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
+    <cs.httpclient.version>3.1</cs.httpclient.version>
+    <cs.httpcore.version>4.0</cs.httpcore.version>
+    <cs.mysql.version>5.1.12</cs.mysql.version>
+    <cs.xstream.version>1.3.1</cs.xstream.version>
+    <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
+    <cs.mail.version>1.4</cs.mail.version>
+    <cs.axis.version>1.4</cs.axis.version>
+    <cs.axis2.version>1.5.1</cs.axis2.version>
+    <cs.axiom.version>1.2.8</cs.axiom.version>
+    <cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
+    <cs.neethi.version>2.0.4</cs.neethi.version>
+    <cs.servlet.version>2.4</cs.servlet.version>
+    <skipTests>true</skipTests>
+  </properties>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>${cs.jdk.version}</source>
+          <target>${cs.jdk.version}</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${cs.junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/deployment-planners/user-concentrated-pod/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index 682ac05..a643cf9 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-planner-user-concentrated-pod</artifactId>
-	<name>Apache CloudStack Plugin - User Concentrated Pod Deployment Planner</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-planner-user-concentrated-pod</artifactId>
+  <name>Apache CloudStack Plugin - User Concentrated Pod Deployment Planner</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/deployment-planners/user-dispersing/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index 247479a..d4d7095 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-planner-user-dispersing</artifactId>
-	<name>Apache CloudStack Plugin - User Dispersing Deployment Planner</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-planner-user-dispersing</artifactId>
+  <name>Apache CloudStack Plugin - User Dispersing Deployment Planner</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/file-systems/netapp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml
index 9a59d16..a5f024d 100644
--- a/plugins/file-systems/netapp/pom.xml
+++ b/plugins/file-systems/netapp/pom.xml
@@ -17,21 +17,21 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-netapp</artifactId>
-	<name>Apache CloudStack Plugin - NetApp File System</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud.com.netapp</groupId>
-			<artifactId>manageontap</artifactId>
-			<version>1.0</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-netapp</artifactId>
+  <name>Apache CloudStack Plugin - NetApp File System</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud.com.netapp</groupId>
+      <artifactId>manageontap</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/host-allocators/random/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 478e273..85d125b 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-host-allocator-random</artifactId>
-	<name>Apache CloudStack Plugin - Host Allocator Random</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-host-allocator-random</artifactId>
+  <name>Apache CloudStack Plugin - Host Allocator Random</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 149b57a..d01a2b2 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -17,26 +17,26 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-hypervisor-kvm</artifactId>
-	<name>Apache CloudStack Plugin - Hypervisor KVM</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-agent</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.libvirt</groupId>
-			<artifactId>libvirt</artifactId>
-			<version>0.4.8</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
+  <name>Apache CloudStack Plugin - Hypervisor KVM</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-agent</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.libvirt</groupId>
+      <artifactId>libvirt</artifactId>
+      <version>0.4.8</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/hypervisors/ovm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 28dfcd1..cc480d7 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-hypervisor-ovm</artifactId>
-	<name>Apache CloudStack Plugin - Hypervisor OracleVM</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-hypervisor-ovm</artifactId>
+  <name>Apache CloudStack Plugin - Hypervisor OracleVM</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 5869fba..f9f681e 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -17,21 +17,21 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
-	<name>Apache CloudStack Plugin - Hypervisor VMware</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-vmware-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+  <name>Apache CloudStack Plugin - Hypervisor VMware</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-vmware-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/hypervisors/xen/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index 7c384c7..13ebeb5 100644
--- a/plugins/hypervisors/xen/pom.xml
+++ b/plugins/hypervisors/xen/pom.xml
@@ -17,21 +17,21 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-hypervisor-xen</artifactId>
-	<name>Apache CloudStack Plugin - Hypervisor Xen</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-plugin-network-ovs</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-hypervisor-xen</artifactId>
+  <name>Apache CloudStack Plugin - Hypervisor Xen</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-plugin-network-ovs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/elastic-loadbalancer/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index c4a8121..a50ad33 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-elb</artifactId>
-	<name>Apache CloudStack Plugin - Network Elastic Load Balancer</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-elb</artifactId>
+  <name>Apache CloudStack Plugin - Network Elastic Load Balancer</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/f5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index f135efa..57e4ea5 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -17,26 +17,26 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-f5</artifactId>
-	<name>Apache CloudStack Plugin - F5</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud.com.f5</groupId>
-			<artifactId>icontrol</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis</artifactId>
-			<version>${cs.axis.version}</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-f5</artifactId>
+  <name>Apache CloudStack Plugin - F5</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud.com.f5</groupId>
+      <artifactId>icontrol</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/juniper-srx/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index 6854e50..d6c907f 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -17,26 +17,26 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-srx</artifactId>
-	<name>Apache CloudStack Plugin - Juniper SRX</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud.com.f5</groupId>
-			<artifactId>icontrol</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis</artifactId>
-			<version>${cs.axis.version}</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-srx</artifactId>
+  <name>Apache CloudStack Plugin - Juniper SRX</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud.com.f5</groupId>
+      <artifactId>icontrol</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/midokura-midonet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midokura-midonet/pom.xml b/plugins/network-elements/midokura-midonet/pom.xml
index f305e93..c6c0ec2 100644
--- a/plugins/network-elements/midokura-midonet/pom.xml
+++ b/plugins/network-elements/midokura-midonet/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-midonet</artifactId>
-	<name>Apache CloudStack Plugin - Midokura Midonet</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-midonet</artifactId>
+  <name>Apache CloudStack Plugin - Midokura Midonet</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/netscaler/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 83b377a..e0fcf7e 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -17,26 +17,26 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-netscaler</artifactId>
-	<name>Apache CloudStack Plugin - Network Netscaler</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud.com.citrix</groupId>
-			<artifactId>netscaler</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.cloud.com.citrix</groupId>
-			<artifactId>netscaler-sdx</artifactId>
-			<version>1.0</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-netscaler</artifactId>
+  <name>Apache CloudStack Plugin - Network Netscaler</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud.com.citrix</groupId>
+      <artifactId>netscaler</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.cloud.com.citrix</groupId>
+      <artifactId>netscaler-sdx</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/nicira-nvp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index f70557c..8db11ae 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-nvp</artifactId>
-	<name>Apache CloudStack Plugin - Network Nicira NVP</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-nvp</artifactId>
+  <name>Apache CloudStack Plugin - Network Nicira NVP</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/network-elements/ovs/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index bd216d9..9385bb9 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-network-ovs</artifactId>
-	<name>Apache CloudStack Plugin - Open vSwitch</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-network-ovs</artifactId>
+  <name>Apache CloudStack Plugin - Open vSwitch</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/parent/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml
index 3a0bf3c..5fae41c 100644
--- a/plugins/parent/pom.xml
+++ b/plugins/parent/pom.xml
@@ -17,26 +17,26 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-parent</artifactId>
-	<name>Apache CloudStack Plugin POM</name>
-	<packaging>pom</packaging>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-parent</artifactId>
+  <name>Apache CloudStack Plugin POM</name>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/storage-allocators/random/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index aba1496..658bb19 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-storage-allocator-random</artifactId>
-	<name>Apache CloudStack Plugin - Storage Allocator Random</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-storage-allocator-random</artifactId>
+  <name>Apache CloudStack Plugin - Storage Allocator Random</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 0dfd6bc..a904ee0 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-user-authenticator-ldap</artifactId>
-	<name>Apache CloudStack Plugin - User Authenticator LDAP</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-user-authenticator-ldap</artifactId>
+  <name>Apache CloudStack Plugin - User Authenticator LDAP</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/user-authenticators/md5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index 7f4e780..c9173d7 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-user-authenticator-md5</artifactId>
-	<name>Apache CloudStack Plugin - User Authenticator MD5</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-user-authenticator-md5</artifactId>
+  <name>Apache CloudStack Plugin - User Authenticator MD5</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/plugins/user-authenticators/plain-text/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index e9d24d1..894b1b0 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -17,14 +17,14 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-plugin-user-authenticator-plaintext</artifactId>
-	<name>Apache CloudStack Plugin - User Authenticator Plain Text</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-plugin-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../parent/pom.xml</relativePath>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-plugin-user-authenticator-plaintext</artifactId>
+  <name>Apache CloudStack Plugin - User Authenticator Plain Text</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-plugin-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 299610a..4bdb537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,170 +17,170 @@
   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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.cloud</groupId>
-	<artifactId>cloudstack</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Apache CloudStack</name>
-	<description>CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
-	<url>http://www.cloudstack.org</url>
-	<scm>
-		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
-	</scm>
-	<issueManagement>
-		<system>jira</system>
-		<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
-	</issueManagement>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.cloud</groupId>
+  <artifactId>cloudstack</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Apache CloudStack</name>
+  <description>CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
+  <url>http://www.cloudstack.org</url>
+  <scm>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
+  </scm>
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
+  </issueManagement>
 
-	<properties>
-		<cs.jdk.version>1.6</cs.jdk.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+  <properties>
+    <cs.jdk.version>1.6</cs.jdk.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-	<distributionManagement>
-		<repository>
-			<id>apache.releases.https</id>
-			<name>Apache Release Distribution Repository</name>
-			<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-		</repository>
-		<snapshotRepository>
-			<id>apache.snapshots.https</id>
-			<name>Apache Development Snapshot Repository</name>
-			<url>https://repository.apache.org/content/repositories/snapshots</url>
-			<!--uniqueVersion>false</uniqueVersion -->
-		</snapshotRepository>
-		<site>
-			<id>apache.cloudstack.site</id>
-			<url>${site.deploy.url}</url>
-		</site>
-	</distributionManagement>
-	<repositories>
-		<repository>
-			<id>apache.snapshots</id>
-			<url>http://repository.apache.org/snapshots/</url>
-			<name>Apache Snapshot Repo</name>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>apache.snapshots</id>
-			<url>http://repository.apache.org/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
+  <distributionManagement>
+    <repository>
+      <id>apache.releases.https</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots.https</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <!--uniqueVersion>false</uniqueVersion -->
+    </snapshotRepository>
+    <site>
+      <id>apache.cloudstack.site</id>
+      <url>${site.deploy.url}</url>
+    </site>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <url>http://repository.apache.org/snapshots/</url>
+      <name>Apache Snapshot Repo</name>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <url>http://repository.apache.org/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
 
-	<inceptionYear>2012</inceptionYear>
+  <inceptionYear>2012</inceptionYear>
 
-	<mailingLists>
-		<mailingList>
-			<name>Apache CloudStack User List</name>
-			<subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
-			<unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
-			<post>cloudstack-users@incubator.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
-		</mailingList>
-		<mailingList>
-			<name>Apache CloudStack Developer List</name>
-			<subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
-			<unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
-			<post>cloudstack-dev@incubator.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
-		</mailingList>
-		<mailingList>
-			<name>Apache CloudStack Commits List</name>
-			<subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
-			<unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
-			<post>cloudstack-commits@incubator.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
-		</mailingList>
-	</mailingLists>
+  <mailingLists>
+    <mailingList>
+      <name>Apache CloudStack User List</name>
+      <subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-users@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache CloudStack Developer List</name>
+      <subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-dev@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache CloudStack Commits List</name>
+      <subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-commits@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
+    </mailingList>
+  </mailingLists>
 
-	<developers>
-		<developer>
-			<name>The Apache CloudStack Team</name>
-			<email>cloudstack-dev@incubator.apache.org</email>
-			<url>http://incubator.apache.org/projects/cloudstack.html</url>
-			<organization>Apache Software Foundation</organization>
-			<organizationUrl>http://apache.org/</organizationUrl>
-		</developer>
-	</developers>
+  <developers>
+    <developer>
+      <name>The Apache CloudStack Team</name>
+      <email>cloudstack-dev@incubator.apache.org</email>
+      <url>http://incubator.apache.org/projects/cloudstack.html</url>
+      <organization>Apache Software Foundation</organization>
+      <organizationUrl>http://apache.org/</organizationUrl>
+    </developer>
+  </developers>
 
-	<ciManagement>
-		<system>Jenkin</system>
-		<url>http://jenkins.cloudstack.org/</url>
-	</ciManagement>
+  <ciManagement>
+    <system>Jenkin</system>
+    <url>http://jenkins.cloudstack.org/</url>
+  </ciManagement>
 
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-	<organization>
-		<name>The Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
 
-	<modules>
-		<module>parent</module>
-		<module>api</module>
-		<module>agent</module>
-		<module>console-proxy</module>
-		<module>core</module>
-		<module>server</module>
-		<module>usage</module>
-		<module>utils</module>
-		<module>deps/XenServerJava</module>
-		<module>vmware-base</module>
-		<module>plugins</module>
-		<module>awsapi</module>
-	</modules>
+  <modules>
+    <module>parent</module>
+    <module>api</module>
+    <module>agent</module>
+    <module>console-proxy</module>
+    <module>core</module>
+    <module>server</module>
+    <module>usage</module>
+    <module>utils</module>
+    <module>deps/XenServerJava</module>
+    <module>vmware-base</module>
+    <module>plugins</module>
+    <module>awsapi</module>
+  </modules>
 
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<version>0.8</version>
-					<configuration>
-						<numUnapprovedLicenses>350</numUnapprovedLicenses>
-						<excludeSubProjects>false</excludeSubProjects>
-						<excludes>
-							<exclude>.git/**</exclude>
-							<exclude>.gitignore</exclude>
-							<exclude>velocity.log</exclude>
-							<exclude>**/target/**</exclude>
-							<exclude>distribution/**</exclude>
-							<exclude>**/jaxb.index</exclude>
-							<exclude>**/META-INF/MANIFEST</exclude>
-							<exclude>**/src/test/**/*.txt</exclude>
-							<exclude>**/.classpath</exclude>
-							<exclude>**/.settings/**/*</exclude>
-							<exclude>**/.project</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.8</version>
+          <configuration>
+            <numUnapprovedLicenses>350</numUnapprovedLicenses>
+            <excludeSubProjects>false</excludeSubProjects>
+            <excludes>
+              <exclude>.git/**</exclude>
+              <exclude>.gitignore</exclude>
+              <exclude>velocity.log</exclude>
+              <exclude>**/target/**</exclude>
+              <exclude>distribution/**</exclude>
+              <exclude>**/jaxb.index</exclude>
+              <exclude>**/META-INF/MANIFEST</exclude>
+              <exclude>**/src/test/**/*.txt</exclude>
+              <exclude>**/.classpath</exclude>
+              <exclude>**/.settings/**/*</exclude>
+              <exclude>**/.project</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index c82bb6b..27ea99a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -17,58 +17,58 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-server</artifactId>
-	<name>Apache CloudStack Server</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>${cs.httpcore.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>${cs.mysql.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>${cs.xstream.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-			<version>${cs.mail.version}</version>
-		</dependency>
-		<!-- <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-utils</artifactId> 
-			<version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> 
-			</dependency> <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-agent</artifactId> 
-			<version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> 
-			</dependency> -->
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-		<!-- <testSourceDirectory>test</testSourceDirectory> -->
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-server</artifactId>
+  <name>Apache CloudStack Server</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>${cs.httpcore.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>${cs.mysql.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>${cs.xstream.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>${cs.mail.version}</version>
+    </dependency>
+    <!-- <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-utils</artifactId>
+       <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
+       </dependency> <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-agent</artifactId>
+       <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
+       </dependency> -->
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <!-- <testSourceDirectory>test</testSourceDirectory> -->
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index cb40fc4..9bae8b1 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -17,25 +17,25 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-usage</artifactId>
-	<name>Apache CloudStack Usage Server</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>cloud-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-usage</artifactId>
+  <name>Apache CloudStack Usage Server</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.cloud</groupId>
+      <artifactId>cloud-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ef60ace/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 1c28b6f..7e85a51 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -17,117 +17,117 @@
   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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloud-utils</artifactId>
-	<name>Apache CloudStack Utils</name>
-	<parent>
-		<groupId>com.cloud</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${cs.log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>${cs.cglib.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>${cs.dbcp.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-pool</artifactId>
-					<groupId>commons-pool</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>${cs.ehcache.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>${cs.pool.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${cs.codec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>${cs.bcprov.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jcraft</groupId>
-			<artifactId>jsch</artifactId>
-			<version>${cs.jsch.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<version>${cs.jpa.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jasypt</groupId>
-			<artifactId>jasypt</artifactId>
-			<version>${cs.jasypt.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.trilead</groupId>
-			<artifactId>trilead-ssh2</artifactId>
-			<version>${cs.trilead.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>apache-log4j-extras</artifactId>
-			<version>${cs.log4j.extras.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>ejb-api</artifactId>
-			<version>${cs.ejb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>${cs.configuration.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-utils</artifactId>
+  <name>Apache CloudStack Utils</name>
+  <parent>
+    <groupId>com.cloud</groupId>
+    <artifactId>cloud-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${cs.log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cs.cglib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>${cs.dbcp.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-pool</artifactId>
+          <groupId>commons-pool</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>${cs.ehcache.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>${cs.pool.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${cs.codec.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk16</artifactId>
+      <version>${cs.bcprov.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>${cs.jsch.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <version>${cs.jpa.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt</artifactId>
+      <version>${cs.jasypt.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.trilead</groupId>
+      <artifactId>trilead-ssh2</artifactId>
+      <version>${cs.trilead.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>apache-log4j-extras</artifactId>
+      <version>${cs.log4j.extras.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.ejb</groupId>
+      <artifactId>ejb-api</artifactId>
+      <version>${cs.ejb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>${cs.configuration.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>