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/03/12 14:17:48 UTC
svn commit: r1576729 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/util/Constants.java
test/org/apache/lucene/util/TestIOUtils.java
Author: uschindler
Date: Wed Mar 12 13:17:47 2014
New Revision: 1576729
URL: http://svn.apache.org/r1576729
Log:
LUCENE-5514: Remove outdated constants
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java?rev=1576729&r1=1576728&r2=1576729&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java Wed Mar 12 13:17:47 2014
@@ -53,11 +53,6 @@ public final class Constants {
public static final String OS_VERSION = System.getProperty("os.version");
public static final String JAVA_VENDOR = System.getProperty("java.vendor");
- /** @deprecated With Lucene 5.0, we are always on Java 7 */
- @Deprecated
- public static final boolean JRE_IS_MINIMUM_JAVA7 =
- new Boolean(true).booleanValue(); // prevent inlining in foreign class files
-
public static final boolean JRE_IS_MINIMUM_JAVA8;
/** True iff running on a 64bit JVM */
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java?rev=1576729&r1=1576728&r2=1576729&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java Wed Mar 12 13:17:47 2014
@@ -59,12 +59,10 @@ public class TestIOUtils extends LuceneT
System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:");
System.out.println(trace);
}
- if (Constants.JRE_IS_MINIMUM_JAVA7) {
- assertTrue("Stack trace does not contain first suppressed Exception: " + trace,
- trace.contains("java.io.IOException: TEST-IO-EXCEPTION-1"));
- assertTrue("Stack trace does not contain second suppressed Exception: " + trace,
- trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
- }
+ assertTrue("Stack trace does not contain first suppressed Exception: " + trace,
+ trace.contains("java.io.IOException: TEST-IO-EXCEPTION-1"));
+ assertTrue("Stack trace does not contain second suppressed Exception: " + trace,
+ trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
} catch (IOException e2) {
fail("IOException should not be thrown here");
}
@@ -85,10 +83,8 @@ public class TestIOUtils extends LuceneT
System.out.println("TestIOUtils.testSuppressedExceptions: Thrown Exception stack trace:");
System.out.println(trace);
}
- if (Constants.JRE_IS_MINIMUM_JAVA7) {
- assertTrue("Stack trace does not contain suppressed Exception: " + trace,
- trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
- }
+ assertTrue("Stack trace does not contain suppressed Exception: " + trace,
+ trace.contains("java.io.IOException: TEST-IO-EXCEPTION-2"));
}
}