diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 8a9dc15579c..4df44512e57 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -62,12 +62,24 @@ ${project.version} test + + org.apache.cloudstack + cloud-utils + ${project.version} + test-jar + test + org.apache.cloudstack cloud-plugin-hypervisor-vmware ${project.version} test + + org.aspectj + aspectjrt + 1.7.1 + org.apache.cloudstack cloud-plugin-hypervisor-kvm diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 81af8ace135..380f5544f41 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -36,11 +36,15 @@ gson ${cs.gson.version} + + org.aspectj + aspectjtools + 1.6.2 + test + install - src - test maven-surefire-plugin diff --git a/pom.xml b/pom.xml index ed951515ed7..e7b4c5a068b 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,11 @@ mysql-connector-java ${cs.mysql.version} + + log4j + log4j + ${cs.log4j.version} + @@ -193,7 +198,12 @@ org.springframework - spring-core + spring-aop + ${org.springframework.version} + + + org.springframework + spring-beans ${org.springframework.version} diff --git a/server/pom.xml b/server/pom.xml index 56b0402f2c1..4511804312f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -89,19 +89,14 @@ org.apache.cloudstack cloud-utils ${project.version} + test-jar + test org.reflections reflections 0.9.8 - - org.apache.cloudstack - cloud-utils - ${project.version} - test-jar - test - org.apache.cloudstack cloud-api diff --git a/utils/pom.xml b/utils/pom.xml index fb723dcccc7..e8aa805d778 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -27,11 +27,6 @@ ../pom.xml - - org.springframework - spring-core - ${org.springframework.version} - org.springframework spring-context @@ -42,16 +37,9 @@ javax.inject 1 - - - org.aspectj - aspectjrt - 1.7.1 - log4j log4j - ${cs.log4j.version} cglib @@ -84,21 +72,6 @@ commons-codec ${cs.codec.version} - - commons-collections - commons-collections - ${cs.collections.version} - - - commons-discovery - commons-discovery - ${cs.discovery.version} - - - commons-logging - commons-logging - ${cs.logging.version} - org.bouncycastle bcprov-jdk16