From 6ec24785039de8c3a159789a44ef80de507bfbc2 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 11 Sep 2016 12:58:18 +0200 Subject: [PATCH 1/2] remove try-with-resources --- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 14f9aa4a2..d844133b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1749,7 +1749,9 @@ public class JUnitTask extends Task { * @since 1.9.8 */ private boolean hasJunit(final Path path) { - try (AntClassLoader loader = AntClassLoader.newAntClassLoader( + AntClassLoader loader = null; + try { + loader = AntClassLoader.newAntClassLoader( null, getProject(), path, @@ -1760,6 +1762,10 @@ public class JUnitTask extends Task { } catch (final Exception ex) { return false; } + } finally { + if (loader != null) { + loader.close(); + } } } From e95fe11095ecd42ef322a0523f6919cec809391b Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 11 Sep 2016 13:03:28 +0200 Subject: [PATCH 2/2] really remove Java7 and Java8 features --- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 9 +++++++-- .../tools/ant/taskdefs/optional/junit/JUnitTaskTest.java | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index d844133b3..5c78115b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; +import java.io.FilenameFilter; import java.io.FileOutputStream; import java.io.FileReader; import java.io.FileWriter; @@ -1755,7 +1756,7 @@ public class JUnitTask extends Task { null, getProject(), path, - true)) { + true); try { loader.loadClass("junit.framework.Test"); return true; @@ -1780,7 +1781,11 @@ public class JUnitTask extends Task { for (String path : modulePath.list()) { final File modulePathEntry = getProject().resolveFile(path); if (modulePathEntry.isDirectory() && !hasModuleInfo(modulePathEntry)) { - final File[] modules = modulePathEntry.listFiles((dir,name)->name.toLowerCase(Locale.ENGLISH).endsWith(".jar")); + final File[] modules = modulePathEntry.listFiles(new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.toLowerCase(Locale.ENGLISH).endsWith(".jar"); + } + }); if (modules != null) { for (File module : modules) { expanded.add(new Path(getProject(), String.format( diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java index d817cb10d..08daa0e17 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java @@ -472,7 +472,7 @@ public class JUnitTaskTest { assertNotNull(mockProcLauncher.cmd); String resCp = null; String resMp = null; - Set resExports = new TreeSet<>(); + Set resExports = new TreeSet(); for (int i = 1; i< mockProcLauncher.cmd.length; i++) { if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N resCp = mockProcLauncher.cmd[++i]; @@ -526,7 +526,7 @@ public class JUnitTaskTest { assertNotNull(mockProcLauncher.cmd); String resCp = null; String resMp = null; - Set resExports = new TreeSet<>(); + Set resExports = new TreeSet(); for (int i = 1; i< mockProcLauncher.cmd.length; i++) { if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N resCp = mockProcLauncher.cmd[++i];