Merge branch 'MNG-6056-feature-toggle' of https://git-wip-us.apache.org/repos/asf/maven into MNG-6056-feature-toggle
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/626a0406 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/626a0406 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/626a0406 Branch: refs/heads/MNG-6056-feature-toggle Commit: 626a0406bf98fd1818da687bc7c446956b556711 Parents: fd0a6b3 4298b51 Author: khmarbaise <[email protected]> Authored: Sat Sep 24 17:18:41 2016 +0200 Committer: khmarbaise <[email protected]> Committed: Sat Sep 24 17:18:41 2016 +0200 ---------------------------------------------------------------------- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +- .../src/test/java/org/apache/maven/cli/MavenCliTest.java | 1 - .../main/java/org/apache/maven/feature/DefaultFeatureToggles.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/626a0406/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/626a0406/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java ---------------------------------------------------------------------- diff --cc maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index dc3496f,9f18c4b..aef6d3f --- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@@ -21,10 -21,10 +21,9 @@@ package org.apache.maven.cli import java.io.File; -import junit.framework.TestCase; - import org.apache.commons.cli.ParseException; import org.apache.maven.feature.AvailableFeatureToggles; - +import junit.framework.TestCase; public class MavenCliTest extends TestCase
