Updated Branches: refs/heads/master 78ac22e15 -> 5af61a85a
Fixed build. Not sure why it didn't come up on my compile before the commit Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5af61a85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5af61a85 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5af61a85 Branch: refs/heads/master Commit: 5af61a85aea0eff59414bd621155aa96267ea35b Parents: 78ac22e Author: Alex Huang <[email protected]> Authored: Thu Jul 18 22:53:07 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Thu Jul 18 22:53:30 2013 -0700 ---------------------------------------------------------------------- engine/storage/integration-test/pom.xml | 12 ++++++++++++ plugins/storage/volume/solidfire/pom.xml | 8 ++++++-- pom.xml | 12 +++++++++++- server/pom.xml | 9 ++------- utils/pom.xml | 27 --------------------------- 5 files changed, 31 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5af61a85/engine/storage/integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 8a9dc15..4df4451 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -64,11 +64,23 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-utils</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-vmware</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-kvm</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5af61a85/plugins/storage/volume/solidfire/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 81af8ac..380f554 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -36,11 +36,15 @@ <artifactId>gson</artifactId> <version>${cs.gson.version}</version> </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>1.6.2</version> + <scope>test</scope> + </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5af61a85/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ed95151..e7b4c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,11 @@ <artifactId>mysql-connector-java</artifactId> <version>${cs.mysql.version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${cs.log4j.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -193,7 +198,12 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <artifactId>spring-aop</artifactId> + <version>${org.springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> <version>${org.springframework.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5af61a85/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 56b0402..4511804 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -89,6 +89,8 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId> <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.reflections</groupId> @@ -97,13 +99,6 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-utils</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-api</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5af61a85/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index fb723dc..e8aa805 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -29,11 +29,6 @@ <dependencies> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${org.springframework.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${org.springframework.version}</version> </dependency> @@ -42,16 +37,9 @@ <artifactId>javax.inject</artifactId> <version>1</version> </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.7.1</version> - </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${cs.log4j.version}</version> </dependency> <dependency> <groupId>cglib</groupId> @@ -85,21 +73,6 @@ <version>${cs.codec.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${cs.collections.version}</version> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>${cs.discovery.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${cs.logging.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> <version>${cs.bcprov.version}</version>
