upgrade sisu* version which has some perf improvement, add exclusion for non needed...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205207 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 3e2b0ff3d9942ed159d71c8545e75e8f4b39f47a..f97b2a9e6d195e47b0079466bb7c0870d28571c4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -491,10 +491,22 @@
     <dependency>
       <groupId>org.sonatype.sisu</groupId>
       <artifactId>sisu-inject-plexus</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.sonatype.sisu</groupId>
+          <artifactId>sisu-guice</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.sonatype.sisu</groupId>
       <artifactId>sisu-guice</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.sonatype.sisu</groupId>
+          <artifactId>sisu-guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>

diff --git a/pom.xml b/pom.xml
index fa0080dce70362ec0aa30bbefefc1c73ba6986f1..952bfa4f1d221cc86636d6d5b1fd5b9a8b50e537 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -91,8 +91,8 @@
     <!-- restore when we will be able to use a derby in memory database -->
     <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
     <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
-    <sisu-inject-plexus.version>2.2.2</sisu-inject-plexus.version>
-    <sisu-guice.version>3.0.1</sisu-guice.version>
+    <sisu-inject-plexus.version>2.3.0</sisu-inject-plexus.version>
+    <sisu-guice.version>3.1.0</sisu-guice.version>
     <plexus-digest.version>1.1</plexus-digest.version>
     <plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version>
     <plexus-utils.version>1.5.5</plexus-utils.version>