You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/03/07 04:54:41 UTC

svn commit: r1575153 - in /maven/indexer/branches/lucene-4.6/indexer-core/src: main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java

Author: olamy
Date: Fri Mar  7 03:54:41 2014
New Revision: 1575153

URL: http://svn.apache.org/r1575153
Log:
ignore tests for legacy lucene format, add exception when trying to use legacy format

Modified:
    maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
    maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java

Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java?rev=1575153&r1=1575152&r2=1575153&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java Fri Mar  7 03:54:41 2014
@@ -210,8 +210,7 @@ public class DefaultIndexUpdater
             else
             {
                 // legacy transfer format
-                timestamp = unpackIndexArchive( is, directory, //
-                    updateRequest.getIndexingContext() );
+                throw new IllegalArgumentException("The legacy format is no longer supported by this version of maven-indexer.");
             }
 
             if ( updateRequest.getDocumentFilter() != null )

Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java?rev=1575153&r1=1575152&r2=1575153&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java Fri Mar  7 03:54:41 2014
@@ -30,7 +30,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Properties;
 import java.util.Set;
-
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
@@ -50,6 +49,7 @@ import org.jmock.Mockery;
 import org.jmock.api.Invocation;
 import org.jmock.lib.action.ReturnValueAction;
 import org.jmock.lib.action.VoidAction;
+import org.junit.Ignore;
 
 /**
  * @author Eugene Kuleshov
@@ -828,7 +828,8 @@ public class DefaultIndexUpdaterTest
         assertIndexUpdateSucceeded(updateResult);
     }
 
-    public void testUpdateForceFullUpdateNoGZ()
+    @Ignore("Legacy format no longer supported with Lucene 4")
+    public void ignoreTestUpdateForceFullUpdateNoGZ()
         throws Exception
     {
         Mockery mockery = new Mockery();