This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch unused in repository https://gitbox.apache.org/repos/asf/maven-invoker.git
commit 16c89370dceb3e887da759a8be4d919bb1a500d4 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Thu Jan 1 07:54:57 2026 -0500 Clean up some unused and unneeded code --- .../maven/shared/invoker/InvocationRequest.java | 2 +- .../maven/shared/invoker/PrintStreamLogger.java | 4 +-- .../invoker/MavenCommandLineBuilderTest.java | 40 +++++----------------- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java b/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java index bb5905a..b43e98c 100644 --- a/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java +++ b/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java @@ -423,7 +423,7 @@ public interface InvocationRequest { /** * Warn checksum failures equivalent {@code --lax-checksums}. */ - Warn; + Warn } // ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java b/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java index b7b1ab7..b360001 100644 --- a/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java +++ b/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java @@ -121,10 +121,10 @@ public class PrintStreamLogger implements InvokerLogger { } buffer.append("Error:\n"); - buffer.append(writer.toString()); + buffer.append(writer); } - out.println(buffer.toString()); + out.println(buffer); } /** {@inheritDoc} */ diff --git a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java index 881f8de..1a5f4e3 100644 --- a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java +++ b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java @@ -164,38 +164,14 @@ class MavenCommandLineBuilderTest { @Test void shouldUseSystemOutLoggerWhenNoneSpecified() throws Exception { - setupTempMavenHomeIfMissing(false); + setupTempMavenHomeIfMissing(); mclb.checkRequiredState(); } - private File setupTempMavenHomeIfMissing(boolean forceDummy) throws Exception { + private File setupTempMavenHomeIfMissing() { String mavenHome = System.getProperty("maven.home"); - - File appDir; - - if (forceDummy || (mavenHome == null) || !new File(mavenHome).exists()) { - appDir = Files.createDirectories( - temporaryFolder.resolve("invoker-tests").resolve("maven-home")) - .toFile(); - - File binDir = new File(appDir, "bin"); - binDir.mkdirs(); - - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - createDummyFile(binDir, "mvn.bat"); - } else { - createDummyFile(binDir, "mvn"); - } - - Properties props = System.getProperties(); - props.setProperty("maven.home", appDir.getCanonicalPath()); - - System.setProperties(props); - } else { - appDir = new File(mavenHome); - } - + File appDir = new File(mavenHome); return appDir; } @@ -718,7 +694,7 @@ class MavenCommandLineBuilderTest { } @Test - void shouldSpecifySingleGoalFromRequestArg() throws Exception { + void shouldSpecifySingleGoalFromRequestArg() { mclb.setArgs(newRequest().addArg("test"), cli); @@ -739,7 +715,7 @@ class MavenCommandLineBuilderTest { } @Test - void shouldSpecifyTwoGoalsFromRequestArgs() throws Exception { + void shouldSpecifyTwoGoalsFromRequestArgs() { List<String> goals = new ArrayList<>(); goals.add("test"); goals.add("clean"); @@ -759,7 +735,7 @@ class MavenCommandLineBuilderTest { @Test void buildTypicalMavenInvocationEndToEnd() throws Exception { - File mavenDir = setupTempMavenHomeIfMissing(false); + File mavenDir = setupTempMavenHomeIfMissing(); InvocationRequest request = newRequest(); @@ -812,7 +788,7 @@ class MavenCommandLineBuilderTest { @Test void shouldInsertActivatedProfiles() throws Exception { - setupTempMavenHomeIfMissing(false); + setupTempMavenHomeIfMissing(); String profile1 = "profile-1"; String profile2 = "profile-2"; @@ -869,7 +845,7 @@ class MavenCommandLineBuilderTest { @Test void addShellEnvironment() throws Exception { - setupTempMavenHomeIfMissing(false); + setupTempMavenHomeIfMissing(); InvocationRequest request = newRequest();
