From 02fc935ac91dd5d0b6f1ca53f7b20a173332cd39 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 2 Sep 2013 07:47:03 +0000
Subject: [PATCH] use guice no_aop which is faster for our usage

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1519361 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-base/archiva-indexer/pom.xml       | 1 +
 archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml | 1 +
 archiva-modules/archiva-base/archiva-proxy/pom.xml         | 1 +
 archiva-modules/archiva-web/archiva-webapp/pom.xml         | 1 +
 archiva-modules/plugins/maven2-repository/pom.xml          | 1 +
 pom.xml                                                    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index c7f262c68..1a9aa2298 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -93,6 +93,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index b76018592..9a421a654 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -41,6 +41,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index e4d621b8e..2585c417f 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -100,6 +100,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 2b5f0c94a..8e522e856 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -96,6 +96,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
     </dependency>
 
     <dependency>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 9e98753d2..da6bfcb77 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -73,6 +73,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
diff --git a/pom.xml b/pom.xml
index fbeb7bb88..f2f57aeda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -485,6 +485,7 @@
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
         <version>4.0-beta</version>
+        <classifier>no_aop</classifier>
       </dependency>
 
       <dependency>