summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-23 10:48:21 (EST)
committer Winston Prakash2011-12-01 20:47:19 (EST)
commit0af34e2c0fe8499f528e06343349a8018eec136f (patch)
tree6cf8d2e37f77d5a9c614c5e0029b7bcda55ebd09
parent7cf3cb5e4828a6482e6ae8887f9bd3a1c99a0e61 (diff)
downloadorg.eclipse.hudson.core-0af34e2c0fe8499f528e06343349a8018eec136f.zip
org.eclipse.hudson.core-0af34e2c0fe8499f528e06343349a8018eec136f.tar.gz
org.eclipse.hudson.core-0af34e2c0fe8499f528e06343349a8018eec136f.tar.bz2
Upgrade to sisu 2.3.0 and guava 10.0.1
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--pom.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index b4ab94b..a0c62fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,8 @@
<!--Libraries-->
<localizer.version>1.10</localizer.version>
<aspectj.version>1.6.11</aspectj.version>
- <sisuGuice.version>3.0.3</sisuGuice.version>
- <sisuInject.version>2.2.3</sisuInject.version>
+ <sisuGuice.version>3.1.0</sisuGuice.version>
+ <sisuInject.version>2.3.0</sisuInject.version>
<jetty.version>6.1.26</jetty.version>
<wagon-http.version>1.0-beta-7</wagon-http.version>
<animal-sniffer-annotation.version>1.0</animal-sniffer-annotation.version>
@@ -70,7 +70,7 @@
<slf4j-jdk14.version>1.6.1</slf4j-jdk14.version>
<jul-to-slf4j.version>1.6.1</jul-to-slf4j.version>
<logback-classic.version>0.9.28</logback-classic.version>
- <guava.version>r09</guava.version>
+ <guava.version>10.0.1</guava.version>
<ant.version>1.8.2</ant.version>
<xstream.version>1.4.1-hudson-2</xstream.version>
<jsr305.version>1.3.9</jsr305.version>
@@ -404,6 +404,12 @@
<artifactId>sisu-guice</artifactId>
<version>${sisuGuice.version}</version>
<classifier>no_aop</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>