removing unused commented dependencies

removing the spring related dependencies that were commented out.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-03-05 11:48:16 +05:30
parent 009749fb79
commit 8e917b1ad3
2 changed files with 215 additions and 142 deletions

View File

@ -16,7 +16,8 @@
KIND, either express or implied. See the License for the KIND, either express or implied. See the License for the
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--><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> <modelVersion>4.0.0</modelVersion>
<artifactId>cloudstack-plugins</artifactId> <artifactId>cloudstack-plugins</artifactId>
<name>Apache CloudStack Plugin POM</name> <name>Apache CloudStack Plugin POM</name>

354
pom.xml
View File

@ -1,15 +1,23 @@
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor <!--
license agreements. See the NOTICE file distributed with this work for additional Licensed to the Apache Software Foundation (ASF) under one
information regarding copyright ownership. The ASF licenses this file to or more contributor license agreements. See the NOTICE file
you under the Apache License, Version 2.0 (the "License"); you may not use distributed with this work for additional information
this file except in compliance with the License. You may obtain a copy of regarding copyright ownership. The ASF licenses this file
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required to you under the Apache License, Version 2.0 (the
by applicable law or agreed to in writing, software distributed under the "License"); you may not use this file except in compliance
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS with the License. You may obtain a copy of the License at
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. --> http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -26,8 +34,8 @@
<description>Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description> <description>Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
<url>http://www.cloudstack.org</url> <url>http://www.cloudstack.org</url>
<scm> <scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</connection> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
</scm> </scm>
<issueManagement> <issueManagement>
<system>jira</system> <system>jira</system>
@ -35,7 +43,7 @@
</issueManagement> </issueManagement>
<properties> <properties>
<!--skipTests>true</skipTests --> <!--skipTests>true</skipTests-->
<cs.jdk.version>1.6</cs.jdk.version> <cs.jdk.version>1.6</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -84,7 +92,6 @@
<cs.java-ipv6.version>0.10</cs.java-ipv6.version> <cs.java-ipv6.version>0.10</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties> <cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version> <cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
<cs.target.dir>target</cs.target.dir>
</properties> </properties>
<distributionManagement> <distributionManagement>
@ -99,49 +106,40 @@
<mailingLists> <mailingLists>
<mailingList> <mailingList>
<name>Apache CloudStack User List</name> <name>Apache CloudStack User List</name>
<subscribe>users-subscribe@cloudstack.apache.org</subscribe> <subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
<unsubscribe>users-unsubscribe@cloudstack.apache.org</unsubscribe> <unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
<post>users@cloudstack.apache.org</post> <post>cloudstack-users@incubator.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-users</archive> <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
<otherArchives>
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</otherArchive>
</otherArchives>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>Apache CloudStack Developer List</name> <name>Apache CloudStack Developer List</name>
<subscribe>dev-subscribe@cloudstack.apache.org</subscribe> <subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@cloudstack.apache.org</unsubscribe> <unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
<post>dev@cloudstack.apache.org</post> <post>cloudstack-dev@incubator.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-dev</archive> <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
<otherArchives>
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</otherArchive>
</otherArchives>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>Apache CloudStack Commits List</name> <name>Apache CloudStack Commits List</name>
<subscribe>commits-subscribe@cloudstack.apache.org</subscribe> <subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@cloudstack.apache.org</unsubscribe> <unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
<post>commits@cloudstack.apache.org</post> <post>cloudstack-commits@incubator.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-commits</archive> <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
<otherArchives>
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</otherArchive>
</otherArchives>
</mailingList> </mailingList>
</mailingLists> </mailingLists>
<developers> <developers>
<developer> <developer>
<name>The Apache CloudStack Team</name> <name>The Apache CloudStack Team</name>
<email>dev@cloudstack.apache.org</email> <email>cloudstack-dev@incubator.apache.org</email>
<url>http://cloudstack.apache.org/</url> <url>http://incubator.apache.org/projects/cloudstack.html</url>
<organization>Apache Software Foundation</organization> <organization>Apache Software Foundation</organization>
<organizationUrl>http://apache.org/</organizationUrl> <organizationUrl>http://apache.org/</organizationUrl>
</developer> </developer>
</developers> </developers>
<ciManagement> <ciManagement>
<system>Jenkins</system> <system>Jenkin</system>
<url>http://builds.apache.org/</url> <url>http://jenkins.cloudstack.org/</url>
</ciManagement> </ciManagement>
<licenses> <licenses>
@ -176,11 +174,11 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version> <version>${cs.mysql.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -190,12 +188,12 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${cs.junit.version}</version> <version>${cs.junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -206,36 +204,18 @@
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
<version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version> </dependency> -->
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<version>1.9.5</version> <version>1.9.5</version>
<scope>test</scope> <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${org.springframework.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${org.springframework.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
@ -247,19 +227,17 @@
<version>1.7.1</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<version>1</version> <version>1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. --> only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
@ -282,7 +260,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
@ -340,9 +318,11 @@
<exclude>dist/console-proxy/js/jquery.js</exclude> <exclude>dist/console-proxy/js/jquery.js</exclude>
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude> <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude> <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
<exclude>tools/appliance/definitions/devcloud/*</exclude> <exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate/*</exclude> <exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate64/*</exclude> <exclude>tools/appliance/definitions/systemvmtemplate/definition.rb</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate/preseed.cfg</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate/zerodisk.sh</exclude>
<exclude>tools/cli/cloudmonkey.egg-info/*</exclude> <exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
<exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude> <exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>
<exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude> <exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude>
@ -410,41 +390,41 @@
<configuration> <configuration>
<source>${cs.jdk.version}</source> <source>${cs.jdk.version}</source>
<target>${cs.jdk.version}</target> <target>${cs.jdk.version}</target>
<fork>true</fork> <fork>true</fork>
<meminitial>128m</meminitial> <meminitial>128m</meminitial>
<maxmem>512m</maxmem> <maxmem>512m</maxmem>
<compilerArgument>-XDignore.symbol.file=true</compilerArgument> <compilerArgument>-XDignore.symbol.file=true</compilerArgument>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>remove-old-installers</id> <id>remove-old-installers</id>
<goals> <goals>
<goal>remove-project-artifact</goal> <goal>remove-project-artifact</goal>
</goals> </goals>
<configuration> <configuration>
<removeAll>true</removeAll> <removeAll>true</removeAll>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@ -472,31 +452,15 @@
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>eclipse</id>
<properties>
<cs.target.dir>target-eclipse</cs.target.dir>
</properties>
</profile>
<profile>
<id>developer</id> <id>developer</id>
<properties> <properties>
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config> <marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
</properties> </properties>
<modules> <modules>
<module>developer</module> <module>developer</module>
<module>tools</module> <module>tools</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>impatient</id>
<properties>
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
</properties>
<modules>
<module>developer</module>
<!--module>tools/devcloud</module-->
</modules>
</profile>
<profile> <profile>
<id>vmware</id> <id>vmware</id>
<activation> <activation>
@ -508,5 +472,113 @@
<module>vmware-base</module> <module>vmware-base</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>simulator</id>
<activation>
<property>
<name>deploydb-simulator</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${project.basedir}/utils/conf/db.properties</file>
<file>${project.basedir}/utils/conf/db.properties.override</file>
</files>
<quiet>true</quiet>
</configuration>
</execution>
</executions>
</plugin>
<!-- DatabaseCreator driver here -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${cs.dbcp.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>${cs.jasypt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-server</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>process-resources</phase>
<id>create-schema</id>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
<executableDependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-server</artifactId>
</executableDependency>
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
<arguments>
<!-- db properties file -->
<argument>${project.basedir}/utils/conf/db.properties</argument>
<argument>${project.basedir}/utils/conf/db.properties.override</argument>
<!-- simulator sql files -->
<argument>${basedir}/target/db/create-schema-simulator.sql</argument>
<argument>${basedir}/target/db/templates.simulator.sql</argument>
<!-- database upgrade-->
<argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
<argument>--database=simulator</argument>
<argument>--rootpassword=${db.root.password}</argument>
<!-- enable verbosity by -v or dash-dash-verbose -->
</arguments>
<systemProperties>
<systemProperty>
<key>catalina.home</key>
<value>${project.basedir}/utils</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>