Repository: ant Updated Branches: refs/heads/master 134f23805 -> 83aa80729
Don't let ForkDefinition, in confined package, have a compile dependency on classes outside that package Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/83aa8072 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/83aa8072 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/83aa8072 Branch: refs/heads/master Commit: 83aa80729adf14e340b3d31c09d8ab9f98c408c3 Parents: b3f55a2 Author: Jaikiran Pai <[email protected]> Authored: Thu Oct 11 17:12:32 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Mon Oct 29 18:48:37 2018 +0530 ---------------------------------------------------------------------- .../optional/junitlauncher/confined/ForkDefinition.java | 5 +++-- .../taskdefs/optional/junitlauncher/confined/package-info.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/83aa8072/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/ForkDefinition.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/ForkDefinition.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/ForkDefinition.java index 28f7225..ff95445 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/ForkDefinition.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/ForkDefinition.java @@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs.optional.junitlauncher.confined; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.optional.junitlauncher.StandaloneLauncher; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Environment; @@ -33,6 +32,8 @@ import org.apache.tools.ant.types.PropertySet; */ public class ForkDefinition { + private static final String STANDALONE_LAUNCHER_CLASS_NAME = "org.apache.tools.ant.taskdefs.optional.junitlauncher.StandaloneLauncher"; + private boolean includeAntRuntimeLibraries = true; private boolean includeJUnitPlatformLibraries = true; @@ -114,7 +115,7 @@ public class ForkDefinition { } catch (CloneNotSupportedException e) { throw new BuildException(e); } - cmdLine.setClassname(StandaloneLauncher.class.getName()); + cmdLine.setClassname(STANDALONE_LAUNCHER_CLASS_NAME); // VM arguments final Project project = task.getProject(); final ClassLoader taskClassLoader = task.getClass().getClassLoader(); http://git-wip-us.apache.org/repos/asf/ant/blob/83aa8072/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/package-info.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/package-info.java index 773c7b1..c8c80c8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/package-info.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/package-info.java @@ -20,7 +20,7 @@ * have any compile time dependency on any of JUnit platform or * engine classes/interfaces. They <em>must not</em> even have any * compile time dependency on any classes/interfaces that belong to the - * {@link org.apache.tools.ant.taskdefs.optional.junitlauncher} package. + * {@code org.apache.tools.ant.taskdefs.optional.junitlauncher} package. * * @since Ant 1.10.6 */
