ISPN-4139 Upgrade Lucene 4 Infinispan Directory to Lucene 4.7.0

documentation/src/main/asciidoc/user_guide/chapter-13-Infinispan_as_a_storage_for_Lucene_indexes.adoc

@@ -11,7 +11,7 @@ Two different _LockFactory_ implementations are provided to guarantee only one _
 Javadoc: link:$$http://docs.jboss.org/infinispan/6.0/apidocs/org/infinispan/lucene/InfinispanDirectory.html$$[] Issue tracker: link:$$https://jira.jboss.org/browse/ISPN/component/12312732$$[] Source code: link:$$http://www.jboss.org/infinispan/sourcecode.html$$[]
 
 === Lucene compatibility
-The current version was developed and compiled against both _Lucene 3.6.2_ and _Lucene 4.3.0_ (separately and then assembled in a single jar for your convenience as most code is shared). It is also regularly tested to work with Lucene versions from 3.0.x to 3.5.0, version 2.9.x, the older 2.4.1 and newer version 4.0, 4.1, 4.2. 
+The current version was developed and compiled against both _Lucene 3.6.2_ and _Lucene 4.7.0_ (separately and then assembled in a single jar for your convenience as most code is shared). It is also regularly tested to work with Lucene versions from 3.0.x to 3.5.0, version 2.9.x, the older 2.4.1 and newer versions 4.0 to 4.7.
 
 === How to use it
 To create a Directory instance:

lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/BaseLuceneLock.java

@@ -1,5 +1,6 @@
 package org.infinispan.lucene.locking;
 
+import java.io.Closeable;
 import org.apache.lucene.store.Lock;
 import org.infinispan.Cache;
 import org.infinispan.context.Flag;
@@ -17,7 +18,7 @@
  * @see org.apache.lucene.store.Lock
  */
 @SuppressWarnings("unchecked")
-class BaseLuceneLock extends Lock {
+class BaseLuceneLock extends Lock implements Closeable {
 
    private static final Log log = LogFactory.getLog(BaseLuceneLock.class);
 
@@ -77,4 +78,12 @@ public boolean isLocked() {
       return locked;
    }
 
+   /**
+    * Since Lucene 4.7, method release() was renamed to close()
+    */
+   @Override
+   public void close() {
+      clearLock();
+   }
+
 }

lucene/lucene-v3/src/main/java/org/infinispan/lucene/locking/TransactionalSharedLuceneLock.java

@@ -1,5 +1,6 @@
 package org.infinispan.lucene.locking;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import javax.transaction.Transaction;
@@ -24,7 +25,7 @@
  * @see org.apache.lucene.store.Lock
  */
 @SuppressWarnings("unchecked")
-class TransactionalSharedLuceneLock extends Lock {
+class TransactionalSharedLuceneLock extends Lock implements Closeable {
 
    private static final Log log = LogFactory.getLog(TransactionalSharedLuceneLock.class, Log.class);
 
@@ -180,4 +181,12 @@ public void clearLockSuspending() {
       }
    }
 
+   /**
+    * Since Lucene 4.7, method release() was renamed to close()
+    */
+   @Override
+   public void close() throws IOException {
+      release();
+   }
+
 }

lucene/lucene-v4/src/test/java/org/infinispan/lucene/locking/LockManagerFunctionalTest.java

@@ -46,7 +46,7 @@ public void testLuceneIndexLocking(final String writeLockProvider) throws IOExce
       assert ! anotherLock.isLocked();
       assert ! luceneLockA.obtain();
       assert ! luceneLockB.obtain();
-      luceneLockA.release();
+      luceneLockA.close();
       assert ! luceneLockB.isLocked();
       assert luceneLockB.obtain();
       lockManagerA.clearLock(writeLockProvider);

parent/pom.xml

@@ -134,7 +134,7 @@
       <version.leveldbjni>1.7</version.leveldbjni>
       <version.log4j>1.2.16</version.log4j>
       <version.lucene.v3>3.6.2</version.lucene.v3>
-      <version.lucene.v4>4.6.1</version.lucene.v4>
+      <version.lucene.v4>4.7.0</version.lucene.v4>
       <version.mc4j>1.2.6</version.mc4j>
       <version.milyn.smooks>1.2.2</version.milyn.smooks>
       <version.mockito>1.9.5</version.mockito>