From 3af6fcc3262d9c0b5b9d32d0c560faed06d6b1aa Mon Sep 17 00:00:00 2001
From: Stefan Bodewig
Date: Sun, 11 Sep 2016 12:12:24 +0200
Subject: [PATCH] fix version numbers
---
manual/Tasks/junit.html | 4 ++--
.../ant/taskdefs/optional/junit/JUnitTask.java | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index 9f6051217..9a4022e53 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -376,7 +376,7 @@ subelement.
The location of modules can be specified using this PATH like structure.
The modulepath requires fork to be set to true
.
-
since Ant 1.10
+since Ant 1.9.8
upgrademodulepath
@@ -384,7 +384,7 @@ The modulepath requires fork to be set to true
.
can be specified using this PATH like structure.
The upgrademodulepath requires fork to be set to true
.
-since Ant 1.10
+since Ant 1.9.8
formatter
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 08ae61886..14f9aa4a2 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
@@ -515,7 +515,7 @@ public class JUnitTask extends Task {
* Add a path to the modulepath.
*
* @return created modulepath.
- * @since 1.10
+ * @since 1.9.8
*/
public Path createModulepath() {
return getCommandline().createModulepath(getProject()).createPath();
@@ -525,7 +525,7 @@ public class JUnitTask extends Task {
* Add a path to the upgrademodulepath.
*
* @return created upgrademodulepath.
- * @since 1.10
+ * @since 1.9.8
*/
public Path createUpgrademodulepath() {
return getCommandline().createUpgrademodulepath(getProject()).createPath();
@@ -1724,7 +1724,7 @@ public class JUnitTask extends Task {
/**
* Checks a validity of module specific options.
- * @since 1.10
+ * @since 1.9.8
*/
private void checkModules() {
if (hasPath(getCommandline().getModulepath()) ||
@@ -1746,7 +1746,7 @@ public class JUnitTask extends Task {
* Checks is a junit is on given path.
* @param path the {@link Path} to check
* @return true when given {@link Path} contains junit
- * @since 1.10
+ * @since 1.9.8
*/
private boolean hasJunit(final Path path) {
try (AntClassLoader loader = AntClassLoader.newAntClassLoader(
@@ -1767,7 +1767,7 @@ public class JUnitTask extends Task {
* Expands a module path to flat path of jars and root folders usable by classloader.
* @param modulePath to be expanded
* @return the expanded path
- * @since 1.10
+ * @since 1.9.8
*/
private Path expandModulePath(Path modulePath) {
final Path expanded = new Path(getProject());
@@ -2386,7 +2386,7 @@ public class JUnitTask extends Task {
* Checks if a path exists and is non empty.
* @param path to be checked
* @return true if the path is non null
and non empty.
- * @since 1.10
+ * @since 1.9.8
*/
private static boolean hasPath(final Path path) {
return path != null && path.size() > 0;
@@ -2396,7 +2396,7 @@ public class JUnitTask extends Task {
* Checks if a given folder is an unpacked module.
* @param root the fodler to be checked
* @return true if the root is an unpacked module
- * @since 1.10
+ * @since 1.9.8
*/
private static boolean hasModuleInfo(final File root) {
return new File(root, "module-info.class").exists(); //NOI18N