svn commit: r953607 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-common/ archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/ archiva-modules/archiva-base/archiva-indexer/ archiva-modules/archiva-scheduler/archiva-sc...

[brett]

Author: brett
Date: Fri Jun 11 08:35:06 2010
New Revision: 953607

URL: http://svn.apache.org/viewvc?rev=953607&view=rev
Log:
[MRM-1387] switch to official javax.inject library that is in the central 
repository

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
    
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml?rev=953607&r1=953606&r2=953607&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml Fri Jun 
11 08:35:06 2010
@@ -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>

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=953607&r1=953606&r2=953607&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
 Fri Jun 11 08:35:06 2010
@@ -71,6 +71,10 @@
       <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>
       <scope>test</scope>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=953607&r1=953606&r2=953607&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml 
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Fri Jun 
11 08:35:06 2010
@@ -66,6 +66,10 @@
       <artifactId>nexus-indexer</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>

Modified: 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=953607&r1=953606&r2=953607&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
 Fri Jun 11 08:35:06 2010
@@ -23,6 +23,10 @@
       <artifactId>nexus-indexer</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

Modified: archiva/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=953607&r1=953606&r2=953607&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Jun 11 08:35:06 2010
@@ -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,9 +278,18 @@
             <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>
         <version>1.1</version>