From c7a46a89957f57e79535a88575ec4cdd0461ff58 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Sun, 10 Mar 2013 11:38:48 +0530 Subject: [PATCH] removing unused commented dependencies removing the spring related dependencies that were commented out. Signed-off-by: Prasanna Santhanam --- pom.xml | 580 ++++++++++++++++++++++++-------------------------------- 1 file changed, 253 insertions(+), 327 deletions(-) diff --git a/pom.xml b/pom.xml index 679acedac80..6d5ea1d85b2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,23 @@ - + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 @@ -19,14 +28,14 @@ org.apache.cloudstack cloudstack - 4.3.0-SNAPSHOT + 4.2.0-SNAPSHOT pom Apache CloudStack Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. http://www.cloudstack.org - scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git - scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git jira @@ -34,6 +43,7 @@ + 1.6 UTF-8 @@ -54,7 +64,7 @@ 2.0.0 1.9.0 build213-svnkit-1.3-patch - 2.6.6 + 1.5.0 1.7.1 14.0-rc1 5.6.100-1-SNAPSHOT @@ -73,9 +83,9 @@ 1.2 1.0-20081010.060147 5.1 - 3.2.4.RELEASE + 3.1.2.RELEASE 1.9.5 - 1.3.22 + 1.3.21.1 2.6 1.4 0.9.8 @@ -100,49 +110,40 @@ Apache CloudStack User List - users-subscribe@cloudstack.apache.org - users-unsubscribe@cloudstack.apache.org - users@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-users - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users - + cloudstack-users-subscribe@incubator.apache.org + cloudstack-users-unsubscribe@incubator.apache.org + cloudstack-users@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users Apache CloudStack Developer List - dev-subscribe@cloudstack.apache.org - dev-unsubscribe@cloudstack.apache.org - dev@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-dev - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev - + cloudstack-dev-subscribe@incubator.apache.org + cloudstack-dev-unsubscribe@incubator.apache.org + cloudstack-dev@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev Apache CloudStack Commits List - commits-subscribe@cloudstack.apache.org - commits-unsubscribe@cloudstack.apache.org - commits@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-commits - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits - + cloudstack-commits-subscribe@incubator.apache.org + cloudstack-commits-unsubscribe@incubator.apache.org + cloudstack-commits@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits The Apache CloudStack Team - dev@cloudstack.apache.org - http://cloudstack.apache.org/ + cloudstack-dev@incubator.apache.org + http://incubator.apache.org/projects/cloudstack.html Apache Software Foundation http://apache.org/ - Jenkins - http://builds.apache.org/ + Jenkin + http://jenkins.cloudstack.org/ @@ -172,231 +173,15 @@ test client services - maven-standard - quickcloud - - mysql - mysql-connector-java - ${cs.mysql.version} - provided,test - - - log4j - log4j - ${cs.log4j.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - cglib - cglib-nodep - ${cs.cglib.version} - - - commons-dbcp - commons-dbcp - ${cs.dbcp.version} - - - commons-pool - commons-pool - - - - - net.sf.ehcache - ehcache-core - ${cs.ehcache.version} - - - commons-pool - commons-pool - ${cs.pool.version} - - - commons-codec - commons-codec - ${cs.codec.version} - - - org.bouncycastle - bcprov-jdk16 - ${cs.bcprov.version} - - - com.jcraft - jsch - ${cs.jsch.version} - - - org.jasypt - jasypt - ${cs.jasypt.version} - - - com.trilead - trilead-ssh2 - ${cs.trilead.version} - - - com.amazonaws - aws-java-sdk - ${cs.aws.sdk.version} - - - log4j - apache-log4j-extras - ${cs.log4j.extras.version} - - - log4j - log4j - - - - - javax.ejb - ejb-api - ${cs.ejb.version} - - - com.googlecode.java-ipv6 - java-ipv6 - ${cs.java-ipv6.version} - - - commons-configuration - commons-configuration - ${cs.configuration.version} - - - commons-io - commons-io - ${cs.commons-io.version} - - - - org.reflections - reflections - ${cs.reflections.version} - - - org.owasp.esapi - esapi - 2.0.1 - - - org.eclipse.persistence - 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} - - - 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.7.0 - - - org.aspectj - aspectjweaver - 1.7.0 - - - 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 - - - org.slf4j - slf4j-api - 1.7.5 - - - org.slf4j - slf4j-log4j12 - 1.7.5 - + + mysql + mysql-connector-java + ${cs.mysql.version} + @@ -406,23 +191,62 @@ junit ${cs.junit.version} test - + + + org.springframework + spring-core + ${org.springframework.version} + - org.mockito - mockito-all - 1.9.5 - test + org.springframework + spring-context + ${org.springframework.version} org.springframework - spring-test + spring-web ${org.springframework.version} - test + + + + org.mockito + mockito-all + 1.9.5 + test + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.aspectj + aspectjrt + 1.7.1 - javax.inject - javax.inject - 1 + org.aspectj + aspectjweaver + 1.7.1 + + + javax.inject + javax.inject + 1 @@ -430,11 +254,6 @@ install src test - - - ${basedir}/resources - - test/resources @@ -450,7 +269,7 @@ true - ${cs.target.dir} + target **/* @@ -498,8 +317,12 @@ - org.apache.maven.plugins - maven-antrun-plugin + + org.apache.maven.plugins + + + maven-antrun-plugin + [1.7,) run @@ -518,14 +341,10 @@ tomcat7-maven-plugin 2.0 - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - org.apache.rat apache-rat-plugin + 0.8 0 false @@ -572,10 +391,11 @@ services/secondary-storage/conf/agent.properties services/secondary-storage/conf/environment.properties tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf - tools/appliance/definitions/devcloud/* - tools/appliance/definitions/systemvmtemplate/* - tools/appliance/definitions/systemvm64template/* - tools/appliance/definitions/builtin/* + tools/appliance/definitions/systemvmtemplate/base.sh + tools/appliance/definitions/systemvmtemplate/cleanup.sh + tools/appliance/definitions/systemvmtemplate/definition.rb + tools/appliance/definitions/systemvmtemplate/preseed.cfg + tools/appliance/definitions/systemvmtemplate/zerodisk.sh tools/cli/cloudmonkey.egg-info/* tools/devcloud/src/deps/boxes/basebox-build/definition.rb tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg @@ -638,8 +458,6 @@ systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf tools/transifex/.tx/config tools/marvin/marvin/sandbox/advanced/sandbox.cfg - tools/ngui/static/bootstrap/* - tools/ngui/static/js/lib/* @@ -650,41 +468,41 @@ ${cs.jdk.version} ${cs.jdk.version} - true - 128m - 512m - -XDignore.symbol.file=true + true + 128m + 512m + -XDignore.symbol.file=true - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - remove-old-installers - - remove-project-artifact - - - true - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + remove-old-installers + + remove-project-artifact + + + true + + + + org.apache.maven.plugins maven-dependency-plugin @@ -730,9 +548,9 @@ developer - - tools/devcloud/devcloud.cfg - + + tools/devcloud/devcloud.cfg + developer tools @@ -759,5 +577,113 @@ vmware-base + + simulator + + + deploydb-simulator + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${project.basedir}/utils/conf/db.properties + ${project.basedir}/utils/conf/db.properties.override + + true + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + commons-dbcp + commons-dbcp + ${cs.dbcp.version} + + + commons-pool + commons-pool + ${cs.pool.version} + + + org.jasypt + jasypt + ${cs.jasypt.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + + + process-resources + create-schema + + java + + + + + false + true + + org.apache.cloudstack + cloud-server + + com.cloud.upgrade.DatabaseCreator + + + ${project.basedir}/utils/conf/db.properties + ${project.basedir}/utils/conf/db.properties.override + + ${basedir}/target/db/create-schema-simulator.sql + ${basedir}/target/db/templates.simulator.sql + + com.cloud.upgrade.DatabaseUpgradeChecker + --database=simulator + --rootpassword=${db.root.password} + + + + + catalina.home + ${project.basedir}/utils + + + + + + +