svn commit: r1293913 - in /maven/indexer/trunk/indexer-core: ./ src/main/java/org/apache/maven/index/cli/ src/main/java/org/apache/maven/index/context/

[olamy]

Author: olamy
Date: Sun Feb 26 19:11:32 2012
New Revision: 1293913

URL: http://svn.apache.org/viewvc?rev=1293913&view=rev
Log:
[MINDEXER-48] Assertions thrown when used with Lucene 3.1+.
Submitted by Jesse Glick.

Modified:
    maven/indexer/trunk/indexer-core/pom.xml
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusAnalyzer.java
    
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusLegacyAnalyzer.java

Modified: maven/indexer/trunk/indexer-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/pom.xml?rev=1293913&r1=1293912&r2=1293913&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/pom.xml (original)
+++ maven/indexer/trunk/indexer-core/pom.xml Sun Feb 26 19:11:32 2012
@@ -35,7 +35,7 @@ under the License.
   </description>
 
   <properties>
-    <lucene.version>3.0.3</lucene.version>
+    <lucene.version>3.5.0</lucene.version>
     <maven.version>3.0.1</maven.version>
     <aether.version>1.8</aether.version>
     <archetype.version>2.1</archetype.version>

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java?rev=1293913&r1=1293912&r2=1293913&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
 Sun Feb 26 19:11:32 2012
@@ -342,16 +342,12 @@ public class NexusIndexerCli
         }
 
         NexusIndexer indexer = plexus.lookup( NexusIndexer.class );
-        IndexingContext context = null;
-
         // this is a CLI/batch invocation, don't coggle it with threads
         DefaultIndexingContext.BLOCKING_COMMIT = true;
 
-        try
-        {
             long tstart = System.currentTimeMillis();
 
-            context = indexer.addIndexingContext( //
+        IndexingContext context = indexer.addIndexingContext( //
                                                   repositoryName, // context id
                                                   repositoryName, // 
repository id
                                                   repositoryFolder, // 
repository folder
@@ -360,6 +356,8 @@ public class NexusIndexerCli
                                                   null, // index update url
                                                   indexers );
 
+        try
+        {
             IndexPacker packer = plexus.lookup( IndexPacker.class );
 
             ArtifactScanningListener listener = new IndexerListener( context, 
debug, quiet );

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1293913&r1=1293912&r2=1293913&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
 Sun Feb 26 19:11:32 2012
@@ -500,6 +500,8 @@ public class DefaultIndexingContext
 
         indexWriter.setMergeScheduler( new SerialMergeScheduler() );
 
+        indexWriter.commit(); // LUCENE-2386
+
         openAndWarmupReaders();
     }
 

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusAnalyzer.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusAnalyzer.java?rev=1293913&r1=1293912&r2=1293913&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusAnalyzer.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusAnalyzer.java
 Sun Feb 26 19:11:32 2012
@@ -35,7 +35,7 @@ import org.apache.maven.index.creator.Ja
  * @author Eugene Kuleshov
  * @author cstamas
  */
-public class NexusAnalyzer
+public final class NexusAnalyzer
     extends Analyzer
 {
     public TokenStream tokenStream( String fieldName, Reader reader )

Modified: 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusLegacyAnalyzer.java
URL: 
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusLegacyAnalyzer.java?rev=1293913&r1=1293912&r2=1293913&view=diff
==============================================================================
--- 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusLegacyAnalyzer.java
 (original)
+++ 
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/NexusLegacyAnalyzer.java
 Sun Feb 26 19:11:32 2012
@@ -36,7 +36,7 @@ import org.apache.maven.index.ArtifactIn
  * 
  * @author Jason van Zyl
  */
-public class NexusLegacyAnalyzer
+public final class NexusLegacyAnalyzer
     extends Analyzer
 {
     private static Analyzer DEFAULT_ANALYZER = new StandardAnalyzer( 
Version.LUCENE_30 );