You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/11/18 09:50:56 UTC
[49/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
b784012
marvin-refactor: update to latest spring dependencies
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/571e091f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/571e091f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/571e091f
Branch: refs/heads/marvin_refactor
Commit: 571e091f1082948d8aaa70c9544ff5953e38155f
Parents: d30fe15
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Oct 25 12:41:20 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Oct 31 13:54:26 2013 +0530
----------------------------------------------------------------------
pom.xml | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/571e091f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2880a35..9e1eacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<cs.jstl.version>1.2</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.vmware.api.version>5.1</cs.vmware.api.version>
- <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+ <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
<cs.mockito.version>1.9.5</cs.mockito.version>
<cs.aws.sdk.version>1.3.22</cs.aws.sdk.version>
<cs.lang.version>2.6</cs.lang.version>
@@ -173,6 +173,8 @@
<module>test</module>
<module>client</module>
<module>services</module>
+ <module>maven-standard</module>
+ <module>quickcloud</module>
</modules>
<dependencyManagement>
@@ -359,7 +361,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.6.2</version>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -381,6 +388,16 @@
<artifactId>wsdl4j</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -414,6 +431,11 @@
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>test/resources</directory>
@@ -505,7 +527,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
<configuration>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludeSubProjects>false</excludeSubProjects>
@@ -554,7 +575,7 @@
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
<exclude>tools/appliance/definitions/devcloud/*</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate/*</exclude>
- <exclude>tools/appliance/definitions/systemvmtemplate64/*</exclude>
+ <exclude>tools/appliance/definitions/systemvm64template/*</exclude>
<exclude>tools/appliance/definitions/builtin/*</exclude>
<exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
<exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>