From b4609c81e41d678cf03898a7cc4a4660beef0f88 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Thu, 23 Aug 2018 08:25:27 +0200 Subject: [PATCH] LANG-1415: Update Java Language requirement to 1.8 --- .travis.yml | 2 -- pom.xml | 6 +++--- src/changes/changes.xml | 1 + .../org/apache/commons/lang3/SystemUtilsTest.java | 13 ------------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8ef1b44f..9914040c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,6 @@ before_install: matrix: include: - - env: JDK_RELEASE='OpenJDK 7' - jdk: openjdk7 - env: JDK_RELEASE='OracleJDK 8' jdk: oraclejdk8 - env: JDK_RELEASE='OracleJDK 9' diff --git a/pom.xml b/pom.xml index 57e43444b..149e1514e 100644 --- a/pom.xml +++ b/pom.xml @@ -557,8 +557,8 @@ -Xmx512m ISO-8859-1 UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 3.9 - (Java 7+) + (Java 8+) 2.6 (Requires Java 1.2 or later) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 5e87a0b4e..905c41f33 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,6 +46,7 @@ The type attribute can be add,update,fix,remove. + Update Java Language requirement to 1.8 Add isEmpty method to ObjectUtils diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java index e89e20cea..572a46e9c 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -141,19 +141,6 @@ public void testIS_JAVA() { assertFalse(SystemUtils.IS_JAVA_9); assertFalse(SystemUtils.IS_JAVA_10); assertFalse(SystemUtils.IS_JAVA_11); - } else if (javaVersion.startsWith("1.7")) { - assertFalse(SystemUtils.IS_JAVA_1_1); - assertFalse(SystemUtils.IS_JAVA_1_2); - assertFalse(SystemUtils.IS_JAVA_1_3); - assertFalse(SystemUtils.IS_JAVA_1_4); - assertFalse(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertTrue(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); - assertFalse(SystemUtils.IS_JAVA_10); - assertFalse(SystemUtils.IS_JAVA_11); } else if (javaVersion.startsWith("1.8")) { assertFalse(SystemUtils.IS_JAVA_1_1); assertFalse(SystemUtils.IS_JAVA_1_2);