Archiva is now up on the latest container avec role hints etc

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

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/consumers/IndexArtifactConsumer.java b/archiva-core/src/main/java/org/apache/maven/archiva/consumers/IndexArtifactConsumer.java
index 2d7026bb1f185ee379d5a498793e4fff483fd58e..4db7ea4c22b8c5ad3ff8a57991cac1ee40e53b00 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/consumers/IndexArtifactConsumer.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/consumers/IndexArtifactConsumer.java
@@ -46,7 +46,7 @@ public class IndexArtifactConsumer
     extends GenericArtifactConsumer
 {
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="lucene"
      */
     private RepositoryArtifactIndexFactory indexFactory;
     

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java
index fc0e626a0a4b5006e0f0372bdf0e8d9a8946ac67..64f3e308baa08d27043eaca267a56903e6bb3d32 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java
@@ -53,7 +53,7 @@ public class DuplicateArtifactFileReportProcessor
     private Digester digester;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="lucene"
      */
     private RepositoryArtifactIndexFactory indexFactory;
 

diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml
index 5ae0123925e47ad27efc7375d09084f8e6361d99..30b68f424a1f1e9532dc9e7d9b84f8da17bb6a05 100644 (file)
--- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml
@@ -32,6 +32,7 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory</role>
+          <role-hint>lucene</role-hint>
           <field-name>indexFactory</field-name>
         </requirement>
         <requirement>
@@ -44,4 +45,4 @@
       </configuration>
     </component>
   </components>
-</component-set>
\ No newline at end of file
+</component-set>

diff --git a/pom.xml b/pom.xml
index 174fea8141e2ca21ce73186f7b3acaf992ac6e17..5eb4fb64123a3b2d2075805ac3b8a68660c1bef9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -158,12 +158,12 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-18</version>
+        <version>1.0-alpha-20-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-api</artifactId>
-        <version>1.0-alpha-18</version>
+        <version>1.0-alpha-20-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>