* Maven 3 support * Pretty Format POM's * AWS API compiles now
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ebc0fa45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ebc0fa45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ebc0fa45 Branch: refs/heads/master Commit: ebc0fa458aed0e3fe878f3b75430b7a864b62188 Parents: c6a9e1b Author: Darren Shepherd <[email protected]> Authored: Sat Aug 18 08:50:38 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Fri Aug 24 11:18:54 2012 -0700 ---------------------------------------------------------------------- agent/pom.xml | 45 +++--- api/pom.xml | 9 +- awsapi/pom.xml | 98 ++++++++++++ console-proxy/pom.xml | 4 +- core/pom.xml | 36 ++--- deps/XenServerJava/pom.xml | 14 +- parent/pom.xml | 119 ++++++++------- .../user-concentrated-pod/pom.xml | 3 +- .../deployment-planners/user-dispersing/pom.xml | 3 +- plugins/file-systems/netapp/pom.xml | 17 +- plugins/host-allocators/random/pom.xml | 3 +- plugins/hypervisors/kvm/pom.xml | 27 ++-- plugins/hypervisors/ovm/pom.xml | 3 +- plugins/hypervisors/vmware/pom.xml | 17 +- plugins/hypervisors/xen/pom.xml | 17 +- .../network-elements/elastic-loadbalancer/pom.xml | 3 +- plugins/network-elements/f5/pom.xml | 27 ++-- plugins/network-elements/juniper-srx/pom.xml | 27 ++-- plugins/network-elements/midokura-midonet/pom.xml | 3 +- plugins/network-elements/netscaler/pom.xml | 27 ++-- plugins/network-elements/nicira-nvp/pom.xml | 3 +- plugins/network-elements/ovs/pom.xml | 3 +- plugins/parent/pom.xml | 5 +- plugins/pom.xml | 49 +++--- plugins/storage-allocators/random/pom.xml | 3 +- plugins/user-authenticators/ldap/pom.xml | 3 +- plugins/user-authenticators/md5/pom.xml | 3 +- plugins/user-authenticators/plain-text/pom.xml | 3 +- pom.xml | 3 +- server/pom.xml | 31 +--- usage/pom.xml | 2 +- utils/pom.xml | 55 ++++---- vmware-base/pom.xml | 63 ++++---- 33 files changed, 396 insertions(+), 332 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/agent/pom.xml ---------------------------------------------------------------------- diff --git a/agent/pom.xml b/agent/pom.xml index e20b3a2..44062aa 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -3,13 +3,12 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> @@ -22,31 +21,31 @@ <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> + <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> + <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/ebc0fa45/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index 0b3d17a..13f0772 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,15 +1,14 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<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> - <groupId>com.cloud</groupId> <artifactId>cloud-api</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>Apache CloudStack API</name> + <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> + <relativePath>../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml new file mode 100644 index 0000000..79d872f --- /dev/null +++ b/awsapi/pom.xml @@ -0,0 +1,98 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <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> + <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> +</project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/console-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 133a166..ccf67b1 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -3,12 +3,12 @@ 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> - <version>4.0.0-SNAPSHOT</version> - <name>Apache CloudStack Console Proxy</name> + <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> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index b3b3c36..8fdaad2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,14 +1,14 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<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> - <version>4.0.0-SNAPSHOT</version> - <name>Apache CloudStack Core</name> + <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> + <relativePath>../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> @@ -20,30 +20,28 @@ <groupId>com.cloud</groupId> <artifactId>xapi</artifactId> <version>${cs.xapi.version}</version> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> + <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> + <exclusions> + <exclusion> + <artifactId>commons-codec</artifactId> + <groupId>commons-codec</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> - <!-- - <testSourceDirectory>test</testSourceDirectory> - --> + <!-- <testSourceDirectory>test</testSourceDirectory> --> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/deps/XenServerJava/pom.xml ---------------------------------------------------------------------- diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml index e26480a..611852c 100644 --- a/deps/XenServerJava/pom.xml +++ b/deps/XenServerJava/pom.xml @@ -1,12 +1,12 @@ -<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";> +<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> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <groupId>com.cloud</groupId> <artifactId>xapi</artifactId> <version>5.6.100-1-SNAPSHOT</version> <name>XenSource XAPI</name> @@ -18,8 +18,8 @@ <version>${cs.xmlrpc.version}</version> </dependency> </dependencies> - <build> - <sourceDirectory>src</sourceDirectory> - <defaultGoal>install</defaultGoal> - </build> + <build> + <sourceDirectory>src</sourceDirectory> + <defaultGoal>install</defaultGoal> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index bca7065..1956d73 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,64 +1,69 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <parent> - <groupId>com.cloud</groupId> - <artifactId>cloudstack</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> +<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> - <groupId>com.cloud</groupId> <artifactId>cloud-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> <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> - <skipTests>true</skipTests> - </properties> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <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> + <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/ebc0fa45/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 e633877..06c587d 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/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 d01874a..f22fc0e 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/file-systems/netapp/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index db46780..c7d0e24 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -3,19 +3,18 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <dependencies> - <dependency> - <groupId>com.cloud.com.netapp</groupId> - <artifactId>manageontap</artifactId> - <version>1.0</version> - </dependency> - </dependencies> + <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/ebc0fa45/plugins/host-allocators/random/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index da9291c..6b3a8a5 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/hypervisors/kvm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 54b8d4d..8f002a5 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -3,24 +3,23 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <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> + <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/ebc0fa45/plugins/hypervisors/ovm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index a9a6eb3..8fb70f9 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/hypervisors/vmware/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 3b90909..6bf0d85 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -3,19 +3,18 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <dependencies> - <dependency> - <groupId>com.cloud</groupId> - <artifactId>cloud-vmware-base</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <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/ebc0fa45/plugins/hypervisors/xen/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index 9374332..ad170de 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -3,19 +3,18 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <dependencies> - <dependency> - <groupId>com.cloud</groupId> - <artifactId>cloud-plugin-network-ovs</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <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/ebc0fa45/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 662807a..e48d147 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/network-elements/f5/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 5304f46..31d10e5 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -3,24 +3,23 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <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> + <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/ebc0fa45/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 3727954..d9cb3f6 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -3,24 +3,23 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <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> + <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/ebc0fa45/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 682d067..1a3e824 100644 --- a/plugins/network-elements/midokura-midonet/pom.xml +++ b/plugins/network-elements/midokura-midonet/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/network-elements/netscaler/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index d2513be..92c21c3 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -3,24 +3,23 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <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> + <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/ebc0fa45/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 0279dff..ba462fc 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/network-elements/ovs/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index 926b527..5d2d6e4 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/parent/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml index 07675b6..3863b59 100644 --- a/plugins/parent/pom.xml +++ b/plugins/parent/pom.xml @@ -3,14 +3,13 @@ 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> - <version>4.0.0-SNAPSHOT</version> <name>Apache CloudStack Plugin POM</name> - <packaging>pom</packaging> + <packaging>pom</packaging> <parent> <groupId>com.cloud</groupId> <artifactId>cloud-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <relativePath>../../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 7050f53..41635a8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,39 +3,38 @@ 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-plugins</artifactId> - <version>4.0.0-SNAPSHOT</version> <name>Apache CloudStack Plugin POM</name> - <packaging>pom</packaging> + <packaging>pom</packaging> <parent> <groupId>com.cloud</groupId> <artifactId>cloud-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> </build> - <modules> - <module>parent</module> - <module>deployment-planners/user-concentrated-pod</module> - <module>deployment-planners/user-dispersing</module> - <module>file-systems/netapp</module> - <module>host-allocators/random</module> - <module>hypervisors/kvm</module> - <module>hypervisors/ovm</module> - <module>hypervisors/vmware</module> - <module>hypervisors/xen</module> - <module>network-elements/elastic-loadbalancer</module> - <module>network-elements/ovs</module> - <module>network-elements/f5</module> - <module>network-elements/juniper-srx</module> - <module>network-elements/midokura-midonet</module> - <module>network-elements/netscaler</module> - <module>network-elements/nicira-nvp</module> - <module>storage-allocators/random</module> - <module>user-authenticators/ldap</module> - <module>user-authenticators/md5</module> - <module>user-authenticators/plain-text</module> - </modules> + <modules> + <module>parent</module> + <module>deployment-planners/user-concentrated-pod</module> + <module>deployment-planners/user-dispersing</module> + <module>file-systems/netapp</module> + <module>host-allocators/random</module> + <module>hypervisors/kvm</module> + <module>hypervisors/ovm</module> + <module>hypervisors/vmware</module> + <module>hypervisors/xen</module> + <module>network-elements/elastic-loadbalancer</module> + <module>network-elements/ovs</module> + <module>network-elements/f5</module> + <module>network-elements/juniper-srx</module> + <module>network-elements/midokura-midonet</module> + <module>network-elements/netscaler</module> + <module>network-elements/nicira-nvp</module> + <module>storage-allocators/random</module> + <module>user-authenticators/ldap</module> + <module>user-authenticators/md5</module> + <module>user-authenticators/plain-text</module> + </modules> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/storage-allocators/random/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index b062c53..07a5a98 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/user-authenticators/ldap/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index fb78112..a984043 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/plugins/user-authenticators/md5/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index dfb0694..7936640 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/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 d617adc..5fc480d 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -3,12 +3,11 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> + <relativePath>../../parent/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 460e639..35c2b26 100644 --- a/pom.xml +++ b/pom.xml @@ -132,10 +132,11 @@ <module>deps/XenServerJava</module> <module>vmware-base</module> <module>plugins</module> + <module>awsapi</module> </modules> <build> - <defaultGoal>install</defaultGoal> + <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index d348b16..6065a82 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<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> - <version>4.0.0-SNAPSHOT</version> <name>Apache CloudStack Server</name> <parent> <groupId>com.cloud</groupId> @@ -43,28 +43,15 @@ <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> - --> + <!-- <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> - --> + <sourceDirectory>src</sourceDirectory> + <!-- <testSourceDirectory>test</testSourceDirectory> --> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/usage/pom.xml ---------------------------------------------------------------------- diff --git a/usage/pom.xml b/usage/pom.xml index 928603b..e05fc38 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -3,12 +3,12 @@ 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> - <version>4.0.0-SNAPSHOT</version> <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> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebc0fa45/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 16803a0..b8e4664 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -3,13 +3,12 @@ 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> - <version>4.0.0-SNAPSHOT</version> - <name>Apache CloudStack Utils</name> + <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> + <relativePath>../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> @@ -77,12 +76,12 @@ <groupId>log4j</groupId> <artifactId>apache-log4j-extras</artifactId> <version>${cs.log4j.extras.version}</version> - <exclusions> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ejb</groupId> @@ -95,23 +94,23 @@ <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> + <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/ebc0fa45/vmware-base/pom.xml ---------------------------------------------------------------------- diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 9300dc5..343dc2e 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -3,13 +3,12 @@ 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-vmware-base</artifactId> - <version>4.0.0-SNAPSHOT</version> <name>Apache CloudStack VMware Base</name> <parent> <groupId>com.cloud</groupId> <artifactId>cloud-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> @@ -17,36 +16,36 @@ <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> - <dependency> - <groupId>com.cloud.com.vmware</groupId> - <artifactId>vmware-vim</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.cloud.com.vmware</groupId> - <artifactId>vmware-vim25</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.cloud.com.vmware</groupId> - <artifactId>vmware-apputils</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis</artifactId> - <version>${cs.axis.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>${cs.axis.version}</version> - </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${cs.gson.version}</version> + </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-vim</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-vim25</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.cloud.com.vmware</groupId> + <artifactId>vmware-apputils</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis</artifactId> + <version>${cs.axis.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>${cs.axis.version}</version> + </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal>
