Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java	(revision 522641)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java	(working copy)
@@ -42,7 +42,9 @@
     private static final String WRITE_LOCK = IndexWriter.WRITE_LOCK_NAME;
 
     /** Name of the commit lock file */
-    private static final String COMMIT_LOCK = IndexWriter.COMMIT_LOCK_NAME;
+    // -DBJ - Removed Code for Lucene 2.1.0
+    //private static final String COMMIT_LOCK = IndexWriter.COMMIT_LOCK_NAME;
+    // -DBJ - END Removed Code
 
     /** The name of this persistent index */
     private final String name;
@@ -88,14 +90,16 @@
                 log.error("Unable to remove write lock on search index.");
             }
         }
-        File commitLock = new File(indexDir, COMMIT_LOCK);
-        if (commitLock.exists()) {
-            lockEncountered = true;
-            log.warn("Removing commit lock on search index.");
-            if (!commitLock.delete()) {
-                log.error("Unable to remove write lock on search index.");
-            }
-        }
+        // -DBJ - Removed Code for Lucene 2.1.0
+//        File commitLock = new File(indexDir, COMMIT_LOCK);
+//        if (commitLock.exists()) {
+//            lockEncountered = true;
+//            log.warn("Removing commit lock on search index.");
+//            if (!commitLock.delete()) {
+//                log.error("Unable to remove write lock on search index.");
+//            }
+//        }
+        // -DBJ - END Removed Code
     }
 
     /**
Index: pom.xml
===================================================================
--- pom.xml	(revision 522641)
+++ pom.xml	(working copy)
@@ -685,7 +685,7 @@
       <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>