diff --git a/agent/pom.xml b/agent/pom.xml index e081323efcf..7b00a93963f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -39,14 +39,12 @@ commons-daemon commons-daemon - ${cs.daemon.version} maven-antrun-plugin - 1.7 generate-resource @@ -98,7 +96,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.5.1 copy-dependencies diff --git a/api/pom.xml b/api/pom.xml index 2edc17627f2..36d6a18edb3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -34,7 +34,6 @@ com.google.code.gson gson - ${cs.gson.version} org.apache.cloudstack @@ -44,7 +43,6 @@ - install org.apache.maven.plugins diff --git a/client/pom.xml b/client/pom.xml index 22924bb16e9..39299ddfbf8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -289,7 +289,6 @@ - install ru.concerteza.buildnumber @@ -560,7 +559,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.5.1 copy diff --git a/core/pom.xml b/core/pom.xml index a93d41595f9..9fa011d226a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -36,13 +36,6 @@ cloud-engine-api ${project.version} - commons-codec commons-codec diff --git a/developer/pom.xml b/developer/pom.xml index b34c2029b18..be14494b047 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -25,23 +25,19 @@ mysql mysql-connector-java - ${cs.mysql.version} runtime commons-dbcp commons-dbcp - ${cs.dbcp.version} commons-pool commons-pool - ${cs.pool.version} org.jasypt jasypt - ${cs.jasypt.version} org.apache.cloudstack @@ -55,7 +51,6 @@ - install org.codehaus.mojo diff --git a/framework/events/pom.xml b/framework/events/pom.xml index 6cf380a52df..222e99fe8f6 100644 --- a/framework/events/pom.xml +++ b/framework/events/pom.xml @@ -27,12 +27,10 @@ com.google.code.gson gson - ${cs.gson.version} com.google.guava guava - ${cs.guava.version} diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml index 82cddc625b6..77180a09356 100644 --- a/framework/ipc/pom.xml +++ b/framework/ipc/pom.xml @@ -23,12 +23,10 @@ cglib cglib-nodep - ${cs.cglib.version} com.google.code.gson gson - ${cs.gson.version} org.apache.cloudstack diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 7f00076c89d..c6019720f95 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -28,9 +28,6 @@ cloud-framework-rest Apache CloudStack Framework - REST - install - src - test diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml index c38765f8314..eb2545f4578 100644 --- a/plugins/alert-handlers/snmp-alerts/pom.xml +++ b/plugins/alert-handlers/snmp-alerts/pom.xml @@ -33,12 +33,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.snmp4j - 2.1.0_1 log4j log4j - ${cs.log4j.version} diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml index 52f22b26c96..07af6975f45 100644 --- a/plugins/alert-handlers/syslog-alerts/pom.xml +++ b/plugins/alert-handlers/syslog-alerts/pom.xml @@ -33,7 +33,6 @@ log4j log4j - ${cs.log4j.version} diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 3e95c272cbf..16c77b3a87c 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -40,7 +40,7 @@ org.apache.cloudstack cloud-engine-storage - 4.3.0-SNAPSHOT + ${project.version} compile @@ -52,17 +52,14 @@ org.apache.axis axis - ${cs.axis.version} org.apache.axis axis-jaxrpc - ${cs.axis.version} wsdl4j wsdl4j - 1.4 diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 410cd145596..760b610a837 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -35,7 +35,6 @@ org.apache.axis axis - ${cs.axis.version} diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index ac61bf1fa41..542a6035cab 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -35,7 +35,6 @@ org.apache.axis axis - ${cs.axis.version} diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 617167f92f3..011f5e108b2 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -28,12 +28,10 @@ com.google.code.gson gson - ${cs.gson.version} org.aspectj aspectjtools - 1.6.2 test diff --git a/pom.xml b/pom.xml index 7fafd914040..0c9e4f1e461 100644 --- a/pom.xml +++ b/pom.xml @@ -296,6 +296,96 @@ javax.persistence ${cs.jpa.version} + + org.springframework + spring-web + ${org.springframework.version} + + + javax.servlet + servlet-api + ${cs.servlet.version} + + + org.apache.httpcomponents + httpcore + ${cs.httpcore.version} + + + org.apache.httpcomponents + httpclient + ${cs.httpcore.version} + + + com.thoughtworks.xstream + xstream + ${cs.xstream.version} + + + javax.mail + mail + ${cs.mail.version} + + + jstl + jstl + ${cs.jstl.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + javax.inject + javax.inject + 1 + + + com.google.code.gson + gson + ${cs.gson.version} + + + com.google.guava + guava + ${cs.guava.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.snmp4j + 2.1.0_1 + + + org.aspectj + aspectjtools + 1.6.2 + + + org.apache.axis + axis + ${cs.axis.version} + + + commons-daemon + commons-daemon + ${cs.daemon.version} + + + org.apache.axis + axis-jaxrpc + ${cs.axis.version} + + + wsdl4j + wsdl4j + 1.4 + @@ -306,21 +396,6 @@ ${cs.junit.version} test - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - javax.inject - javax.inject - 1 - org.mockito mockito-all @@ -333,6 +408,11 @@ ${org.springframework.version} test + + javax.inject + javax.inject + 1 + diff --git a/server/pom.xml b/server/pom.xml index 6e92e04a29c..10eb99f0f5a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -25,7 +25,6 @@ org.springframework spring-web - ${org.springframework.version} org.apache.cloudstack @@ -40,13 +39,11 @@ javax.servlet servlet-api - ${cs.servlet.version} provided org.apache.httpcomponents httpcore - ${cs.httpcore.version} org.apache.cloudstack @@ -56,22 +53,18 @@ org.apache.httpcomponents httpclient - ${cs.httpcore.version} com.thoughtworks.xstream xstream - ${cs.xstream.version} javax.mail mail - ${cs.mail.version} jstl jstl - ${cs.jstl.version} commons-codec diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 26284f68ecd..44380847163 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -33,17 +33,14 @@ log4j log4j - ${cs.log4j.version} com.google.code.gson gson - ${cs.gson.version} commons-codec commons-codec - ${cs.codec.version} @@ -64,8 +61,6 @@ - install - src certs diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 8e9ab6b0ba9..ea4bfcaf477 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -30,17 +30,14 @@ log4j log4j - ${cs.log4j.version} com.google.code.gson gson - ${cs.gson.version} commons-codec commons-codec - ${cs.codec.version} @@ -61,9 +58,6 @@ - install - src - test org.apache.maven.plugins diff --git a/usage/pom.xml b/usage/pom.xml index d13d3d218ed..04d16307601 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -1,22 +1,14 @@ - - + + 4.0.0 cloud-usage Apache CloudStack Usage Server @@ -31,7 +23,7 @@ cloud-api ${project.version} test-jar - test + test org.apache.cloudstack @@ -49,15 +41,14 @@ runtime - commons-daemon - commons-daemon - ${cs.daemon.version} + commons-daemon + commons-daemon - resources + resources @@ -65,15 +56,14 @@ org.apache.maven.plugins maven-surefire-plugin - - com/cloud/usage/UsageManagerTest.java - + + com/cloud/usage/UsageManagerTest.java + org.apache.maven.plugins maven-dependency-plugin - 2.5.1 copy-dependencies @@ -90,7 +80,6 @@ maven-antrun-plugin - 1.7 generate-resource @@ -100,33 +89,27 @@ - + - - + + - + - - + + @@ -185,7 +168,7 @@ cloud-usage com.cloud.usage.UsageServer - + catalina.home diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 1f60896e9ed..3c415d310ef 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -45,7 +45,6 @@ com.google.code.gson gson - ${cs.gson.version} com.cloud.com.vmware @@ -56,17 +55,14 @@ org.apache.axis axis - ${cs.axis.version} org.apache.axis axis-jaxrpc - ${cs.axis.version} wsdl4j wsdl4j - 1.4