You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/09/19 14:23:24 UTC

svn commit: r1626188 - in /lucene/dev/branches/branch_5x/lucene: backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java core/src/java/org/apache/lucene/util/Version.java

Author: uschindler
Date: Fri Sep 19 12:23:24 2014
New Revision: 1626188

URL: http://svn.apache.org/r1626188
Log:
LUCENE-5944: Remove the version constant. The problem was the broken logic in TestBackwardsCompatibility to detect "Lucene trunk" which has an additional unreleased index before Version.LATEST: I will open issue, maybe Ryan has better idea.

Modified:
    lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java

Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1626188&r1=1626187&r2=1626188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/branch_5x/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Fri Sep 19 12:23:24 2014
@@ -361,12 +361,14 @@ public class TestBackwardsCompatibility 
         expectedVersions.add(major + minor + bugfix + prerelease + ".cfs");
       }
     }
+    /** TODO: fix LUCENE-5936 to add better way to detect trunk checkout:
     if (Version.LATEST.minor == 0 && Version.LATEST.bugfix == 0 && Version.LATEST.prerelease == 0) {
       // we are on trunk (latest is a first major release) so the last minor index
       // for the previous major version is also not yet tested
       assertNotNull(lastPrevMajorVersion);
       expectedVersions.remove(lastPrevMinorIndex);
     }
+    */
     Collections.sort(expectedVersions);
 
     // find what versions we are testing

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1626188&r1=1626187&r2=1626188&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java Fri Sep 19 12:23:24 2014
@@ -171,13 +171,6 @@ public final class Version {
   @Deprecated
   public static final Version LUCENE_4_10_0 = new Version(4, 10, 0);
 
-  /**
-   * Match settings and bugs in Lucene's 4.11.0 release.
-   * @deprecated (5.0) Use latest
-   */
-  @Deprecated
-  public static final Version LUCENE_4_11_0 = new Version(4, 11, 0);
-
   /** Match settings and bugs in Lucene's 5.0 release.
    *  <p>
    *  Use this to get the latest &amp; greatest settings, bug