From d7ba05ce26dd8f72c1d0695ece2cb03d035e3cf9 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 13 Aug 2020 23:21:11 +0200 Subject: Remove checks for old Java Versions Signed-off-by: Lars Grefer --- util/src/main/java/org/aspectj/util/LangUtil.java | 5 +++++ util/src/test/java/org/aspectj/util/LangUtilTest.java | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'util/src') diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java index 5c656cd7a..98f53e3c8 100644 --- a/util/src/main/java/org/aspectj/util/LangUtil.java +++ b/util/src/main/java/org/aspectj/util/LangUtil.java @@ -125,22 +125,27 @@ public class LangUtil { return result; } + @Deprecated public static boolean isOnePointThreeVMOrGreater() { return 1.3 <= vmVersion; } + @Deprecated public static boolean is1dot4VMOrGreater() { return 1.4 <= vmVersion; } + @Deprecated public static boolean is15VMOrGreater() { return 1.5 <= vmVersion; } + @Deprecated public static boolean is16VMOrGreater() { return 1.6 <= vmVersion; } + @Deprecated public static boolean is17VMOrGreater() { return 1.7 <= vmVersion; } diff --git a/util/src/test/java/org/aspectj/util/LangUtilTest.java b/util/src/test/java/org/aspectj/util/LangUtilTest.java index 545cdd904..87b976957 100644 --- a/util/src/test/java/org/aspectj/util/LangUtilTest.java +++ b/util/src/test/java/org/aspectj/util/LangUtilTest.java @@ -101,9 +101,10 @@ public class LangUtilTest extends TestCase { // } public void testVersion() { - assertTrue(LangUtil.isOnePointThreeVMOrGreater()); // min vm now - floor may change - if (LangUtil.is15VMOrGreater()) { - assertTrue(LangUtil.is1dot4VMOrGreater()); + assertTrue(LangUtil.is18VMOrGreater()); // min vm now - floor may change + if (LangUtil.is11VMOrGreater()) { + assertTrue(LangUtil.is19VMOrGreater()); + assertTrue(LangUtil.is10VMOrGreater()); } } -- cgit v1.2.3