upgraded to the latest Apache Lucene 4.6.1 release.

DmitryKey · Feb 16, 2014 · 75e1ee7 · 75e1ee7
1 parent 903ed75
commit 75e1ee7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,11 @@
 
     <groupId>luke</groupId>
     <artifactId>luke</artifactId>
-    <version>4.6.0</version>
+    <version>4.6.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucene.version>4.6.0</lucene.version>
+        <lucene.version>4.6.1</lucene.version>
         <ehcache.version>2.6.2</ehcache.version>
         <hadoop.version>0.20.2</hadoop.version>
         <log4j.version>1.2.17</log4j.version>

diff --git a/src/main/java/org/apache/lucene/index/IndexGate.java b/src/main/java/org/apache/lucene/index/IndexGate.java
@@ -183,8 +183,7 @@ private static void detectOldFormats(FormatDetails res, int format) {
   public static FormatDetails getIndexFormat(final Directory dir) throws Exception {
     SegmentInfos.FindSegmentsFile fsf = new SegmentInfos.FindSegmentsFile(dir) {
 
-      protected Object doBody(String segmentsFile) throws CorruptIndexException,
-          IOException {
+      protected Object doBody(String segmentsFile) throws IOException {
         FormatDetails res = new FormatDetails();
         res.capabilities = "unknown";
         res.genericName = "unknown";
@@ -197,8 +196,8 @@ protected Object doBody(String segmentsFile) throws CorruptIndexException,
             int actualVersion = SegmentInfos.VERSION_40;
             try {
               actualVersion = CodecUtil.checkHeaderNoMagic(in, "segments", SegmentInfos.VERSION_40, Integer.MAX_VALUE);
-              if (actualVersion > SegmentInfos.VERSION_40) {
-                res.capabilities += " (WARNING: newer version of Lucene that this tool)";
+              if (actualVersion > SegmentInfos.VERSION_46) {
+                res.capabilities += " (WARNING: newer version of Lucene than this tool)";
               }
             } catch (Exception e) {
               e.printStackTrace();

diff --git a/src/main/java/org/getopt/luke/Luke.java b/src/main/java/org/getopt/luke/Luke.java
@@ -5186,7 +5186,7 @@ public static Luke startLuke(String[] args) {
     Luke luke = new Luke();
     DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy");
     Calendar cal = Calendar.getInstance();
-    FrameLauncher f = new FrameLauncher("Luke - Lucene Index Toolbox, v 4.6.0 (" + dateFormat.format(cal.getTime()) + ")", luke, 850, 650);
+    FrameLauncher f = new FrameLauncher("Luke - Lucene Index Toolbox, v 4.6.1 (" + dateFormat.format(cal.getTime()) + ")", luke, 850, 650);
     f.setIconImage(Toolkit.getDefaultToolkit().createImage(Luke.class.getResource("/img/luke.gif")));
     if (args.length > 0) {
       boolean force = false, ro = false, ramdir = false;

diff --git a/src/main/resources/xml/about.xml b/src/main/resources/xml/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dialog modal="true" name="about" columns="1" gap="8" icon="/img/luke.gif" text=" About" left="4" right="4" bottom="4" top="4" close="remove(about)">
-	<label halign="center" valign="center" text="v 4.6.0 (2013-12-05)" font="10" icon="/img/luke-big.gif"/>
+	<label halign="center" valign="center" text="v 4.6.1 (2014-02-16)" font="10" icon="/img/luke-big.gif"/>
 	<button type="link" tooltip="Go to Luke home page" action="goUrl(this)" halign="center" property="url=http://www.getopt.org/luke" foreground="#5aaa88" text="Lucene Index Toolbox" font="18 bold"/>
 	<label halign="center" font="13" text="Created by Andrzej Bialecki &lt;[email protected]&gt;"/>
     <label halign="center" font="13" text="Maintained and further developed by Dmitry Kan &lt;[email protected]&gt;"/>