From 8f1414a1dcacfb9cbde93f4fa837be4810db9ef6 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Fri, 11 Jun 2010 08:35:06 +0000
Subject: [PATCH] [MRM-1387] switch to official javax.inject library that is in
 the central repository

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953607 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-base/archiva-common/pom.xml  |  4 ++++
 .../archiva-lucene-consumers/pom.xml                 |  4 ++++
 archiva-modules/archiva-base/archiva-indexer/pom.xml |  4 ++++
 .../archiva-scheduler-indexing/pom.xml               |  4 ++++
 pom.xml                                              | 12 +++++++++++-
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index 45d0dacf3..f290692c9 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -70,6 +70,10 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-indexer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index a876293b2..aba0008df 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -70,6 +70,10 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-indexer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-spring</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 003784012..c8e54d284 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -65,6 +65,10 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-indexer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 78e0fac8b..3e8366c44 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -22,6 +22,10 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-indexer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 883eda030..95689bea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
                     <exclude>xom:xom</exclude>
                     <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
                     <exclude>plexus:plexus-utils</exclude>
+                    <exclude>com.google.code.atinject:atinject</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -251,7 +252,7 @@
       <dependency>
         <groupId>org.sonatype.nexus</groupId>
         <artifactId>nexus-indexer</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <exclusions>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>
@@ -277,8 +278,17 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-settings</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.google.code.atinject</groupId>
+            <artifactId>atinject</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
-- 
2.39.5