[MSHARED-1152] Remove public modifier for JUnit5 tests
diff --git a/pom.xml b/pom.xml
index 22720d7..74b78e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
index 978e0ed..6a94b64 100644
--- a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
@@ -33,7 +33,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class DefaultInvokerTest {
+class DefaultInvokerTest {
 
     private Invoker invoker = newInvoker();
     private InvocationRequest request = new DefaultInvocationRequest();
@@ -46,7 +46,7 @@
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testBuildShouldSucceed() throws MavenInvocationException, URISyntaxException {
+    void testBuildShouldSucceed() throws MavenInvocationException, URISyntaxException {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.setGoals(Arrays.asList("clean", "package"));
@@ -57,7 +57,7 @@
     }
 
     @Test
-    public void testBuildShouldFail() throws MavenInvocationException, URISyntaxException {
+    void testBuildShouldFail() throws MavenInvocationException, URISyntaxException {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.addArgs(Arrays.asList("clean", "package"));
@@ -68,7 +68,7 @@
     }
 
     @Test
-    public void testBuildShouldTimeout() throws MavenInvocationException, URISyntaxException {
+    void testBuildShouldTimeout() throws MavenInvocationException, URISyntaxException {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.addArgs(Arrays.asList("clean", "package"));
@@ -89,7 +89,7 @@
     }
 
     @Test
-    public void testSpacePom() throws Exception {
+    void testSpacePom() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.setPomFileName("pom with spaces.xml");
@@ -101,7 +101,7 @@
     }
 
     @Test
-    public void testSpaceAndSpecialCharPom() throws Exception {
+    void testSpaceAndSpecialCharPom() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.setPomFileName("pom with spaces & special char.xml");
@@ -113,7 +113,7 @@
     }
 
     @Test
-    public void testSpaceSettings() throws Exception {
+    void testSpaceSettings() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.setUserSettingsFile(new File(basedir, "settings with spaces.xml"));
@@ -125,7 +125,7 @@
     }
 
     @Test
-    public void testSpaceLocalRepo() throws Exception {
+    void testSpaceLocalRepo() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.setLocalRepositoryDirectory(new File(basedir, "repo with spaces"));
@@ -137,7 +137,7 @@
     }
 
     @Test
-    public void testSpaceProperties() throws Exception {
+    void testSpaceProperties() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         Properties props = getProperties();
@@ -152,7 +152,7 @@
     }
 
     @Test
-    public void testPomOutsideProject() throws Exception {
+    void testPomOutsideProject() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         File pom = new File(basedir, "temp/pom.xml");
@@ -165,7 +165,7 @@
     }
 
     @Test
-    public void testMavenWrapperInProject() throws Exception {
+    void testMavenWrapperInProject() throws Exception {
         File basedir = getBasedirForBuild();
         request.setBaseDirectory(basedir);
         request.addArg("test-wrapper-goal");
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 ed26f8e..bbd2ce6 100644
--- a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -48,9 +48,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-public class MavenCommandLineBuilderTest {
+class MavenCommandLineBuilderTest {
     @TempDir
-    public Path temporaryFolder;
+    private Path temporaryFolder;
 
     private Properties sysProps;
     private File lrd;
@@ -58,7 +58,7 @@
     private Commandline cli = new Commandline();
 
     @BeforeEach
-    public void setUp() throws IOException {
+    void setUp() throws IOException {
         sysProps = System.getProperties();
         Properties p = new Properties(sysProps);
 
@@ -68,12 +68,12 @@
     }
 
     @AfterEach
-    public void tearDown() {
+    void tearDown() {
         System.setProperties(sysProps);
     }
 
     @Test
-    public void testShouldFailToSetLocalRepoLocationGloballyWhenItIsAFile() {
+    void testShouldFailToSetLocalRepoLocationGloballyWhenItIsAFile() {
 
         mclb.setLocalRepositoryDirectory(lrd);
 
@@ -82,14 +82,14 @@
     }
 
     @Test
-    public void testShouldFailToSetLocalRepoLocationFromRequestWhenItIsAFile() {
+    void testShouldFailToSetLocalRepoLocationFromRequestWhenItIsAFile() {
         InvocationRequest request = newRequest().setLocalRepositoryDirectory(lrd);
 
         assertThrows(IllegalArgumentException.class, () -> mclb.setLocalRepository(request, cli));
     }
 
     @Test
-    public void testShouldSetLocalRepoLocationGlobally() throws IOException {
+    void testShouldSetLocalRepoLocationGlobally() throws IOException {
         File lrd = Files.createDirectory(temporaryFolder.resolve("workdir"))
                 .toFile()
                 .getCanonicalFile();
@@ -100,7 +100,7 @@
     }
 
     @Test
-    public void testShouldSetLocalRepoLocationFromRequest() throws Exception {
+    void testShouldSetLocalRepoLocationFromRequest() throws Exception {
         File lrd = Files.createDirectory(temporaryFolder.resolve("workdir"))
                 .toFile()
                 .getCanonicalFile();
@@ -110,7 +110,7 @@
     }
 
     @Test
-    public void testRequestProvidedLocalRepoLocationShouldOverrideGlobal() throws Exception {
+    void testRequestProvidedLocalRepoLocationShouldOverrideGlobal() throws Exception {
         File lrd = Files.createDirectory(temporaryFolder.resolve("workdir"))
                 .toFile()
                 .getCanonicalFile();
@@ -125,7 +125,7 @@
     }
 
     @Test
-    public void testShouldSetWorkingDirectoryGlobally() throws Exception {
+    void testShouldSetWorkingDirectoryGlobally() throws Exception {
         File wd = Files.createDirectory(temporaryFolder.resolve("workdir")).toFile();
 
         mclb.setBaseDirectory(wd);
@@ -135,7 +135,7 @@
     }
 
     @Test
-    public void testShouldSetWorkingDirectoryFromRequest() throws Exception {
+    void testShouldSetWorkingDirectoryFromRequest() throws Exception {
         File wd = Files.createDirectory(temporaryFolder.resolve("workdir")).toFile();
 
         InvocationRequest req = newRequest();
@@ -147,7 +147,7 @@
     }
 
     @Test
-    public void testRequestProvidedWorkingDirectoryShouldOverrideGlobal() throws Exception {
+    void testRequestProvidedWorkingDirectoryShouldOverrideGlobal() throws Exception {
         File wd = Files.createDirectory(temporaryFolder.resolve("workdir")).toFile();
         File gwd =
                 Files.createDirectory(temporaryFolder.resolve("global-workdir")).toFile();
@@ -163,7 +163,7 @@
     }
 
     @Test
-    public void testShouldUseSystemOutLoggerWhenNoneSpecified() throws Exception {
+    void testShouldUseSystemOutLoggerWhenNoneSpecified() throws Exception {
         setupTempMavenHomeIfMissing(false);
 
         mclb.checkRequiredState();
@@ -200,14 +200,14 @@
     }
 
     @Test
-    public void testShouldFailIfLoggerSetToNull() {
+    void testShouldFailIfLoggerSetToNull() {
         mclb.setLogger(null);
 
         assertThrows(IllegalStateException.class, () -> mclb.checkRequiredState());
     }
 
     @Test
-    public void testShouldFindDummyMavenExecutable() throws Exception {
+    void testShouldFindDummyMavenExecutable() throws Exception {
         File dummyMavenHomeBin = Files.createDirectories(temporaryFolder
                         .resolve("invoker-tests")
                         .resolve("dummy-maven-home")
@@ -229,7 +229,7 @@
 
     @Test
     @EnabledOnOs(OS.WINDOWS)
-    public void testShouldFindDummyPS1MavenExecutable() throws Exception {
+    void testShouldFindDummyPS1MavenExecutable() throws Exception {
         File dummyMavenHomeBin = Files.createDirectories(temporaryFolder
                         .resolve("invoker-tests")
                         .resolve("dummy-maven-home")
@@ -244,7 +244,7 @@
     }
 
     @Test
-    public void testShouldFindDummyMavenExecutableWithMavenHomeFromRequest() throws Exception {
+    void testShouldFindDummyMavenExecutableWithMavenHomeFromRequest() throws Exception {
         File dummyMavenHomeBin = Files.createDirectories(temporaryFolder
                         .resolve("invoker-tests")
                         .resolve("dummy-maven-home")
@@ -266,7 +266,7 @@
     }
 
     @Test
-    public void testShouldSetBatchModeFlagFromRequest() {
+    void testShouldSetBatchModeFlagFromRequest() {
 
         mclb.setFlags(newRequest().setBatchMode(true), cli);
 
@@ -274,7 +274,7 @@
     }
 
     @Test
-    public void testShouldSetOfflineFlagFromRequest() {
+    void testShouldSetOfflineFlagFromRequest() {
 
         mclb.setFlags(newRequest().setOffline(true), cli);
 
@@ -282,7 +282,7 @@
     }
 
     @Test
-    public void testShouldSetUpdateSnapshotsFlagFromRequest() {
+    void testShouldSetUpdateSnapshotsFlagFromRequest() {
 
         mclb.setFlags(newRequest().setUpdateSnapshots(true), cli);
 
@@ -317,7 +317,7 @@
     }
 
     @Test
-    public void testShouldSetDebugFlagFromRequest() {
+    void testShouldSetDebugFlagFromRequest() {
 
         mclb.setFlags(newRequest().setDebug(true), cli);
 
@@ -325,7 +325,7 @@
     }
 
     @Test
-    public void testShouldSetErrorFlagFromRequest() {
+    void testShouldSetErrorFlagFromRequest() {
 
         mclb.setFlags(newRequest().setShowErrors(true), cli);
 
@@ -333,7 +333,7 @@
     }
 
     @Test
-    public void testShouldSetQuietFlagFromRequest() {
+    void testShouldSetQuietFlagFromRequest() {
 
         mclb.setFlags(newRequest().setQuiet(true), cli);
 
@@ -341,21 +341,21 @@
     }
 
     @Test
-    public void testShouldSetNonRecursiveFlagsFromRequest() {
+    void testShouldSetNonRecursiveFlagsFromRequest() {
         mclb.setFlags(newRequest().setRecursive(false), cli);
 
         assertArgumentsPresent(cli, Collections.singleton("-N"));
     }
 
     @Test
-    public void testShouldSetShowVersionFlagsFromRequest() {
+    void testShouldSetShowVersionFlagsFromRequest() {
         mclb.setFlags(newRequest().setShowVersion(true), cli);
 
         assertArgumentsPresent(cli, Collections.singleton("-V"));
     }
 
     @Test
-    public void testDebugOptionShouldMaskShowErrorsOption() {
+    void testDebugOptionShouldMaskShowErrorsOption() {
 
         mclb.setFlags(newRequest().setDebug(true).setShowErrors(true), cli);
 
@@ -364,14 +364,14 @@
     }
 
     @Test
-    public void testShouldSetBuilderIdOptionsFromRequest() {
+    void testShouldSetBuilderIdOptionsFromRequest() {
         mclb.setFlags(newRequest().setBuilder("builder-id-123"), cli);
 
         assertArgumentsPresentInOrder(cli, "-b", "builder-id-123");
     }
 
     @Test
-    public void testAlsoMake() {
+    void testAlsoMake() {
 
         mclb.setReactorBehavior(newRequest().setAlsoMake(true), cli);
 
@@ -380,7 +380,7 @@
     }
 
     @Test
-    public void testProjectsAndAlsoMake() {
+    void testProjectsAndAlsoMake() {
 
         mclb.setReactorBehavior(
                 newRequest().setProjects(Collections.singletonList("proj1")).setAlsoMake(true), cli);
@@ -389,7 +389,7 @@
     }
 
     @Test
-    public void testAlsoMakeDependents() {
+    void testAlsoMakeDependents() {
 
         mclb.setReactorBehavior(newRequest().setAlsoMakeDependents(true), cli);
 
@@ -398,7 +398,7 @@
     }
 
     @Test
-    public void testProjectsAndAlsoMakeDependents() {
+    void testProjectsAndAlsoMakeDependents() {
 
         mclb.setReactorBehavior(
                 newRequest().setProjects(Collections.singletonList("proj1")).setAlsoMakeDependents(true), cli);
@@ -407,7 +407,7 @@
     }
 
     @Test
-    public void testProjectsAndAlsoMakeAndAlsoMakeDependents() {
+    void testProjectsAndAlsoMakeAndAlsoMakeDependents() {
 
         mclb.setReactorBehavior(
                 newRequest()
@@ -420,7 +420,7 @@
     }
 
     @Test
-    public void testShouldSetResumeFrom() {
+    void testShouldSetResumeFrom() {
 
         mclb.setReactorBehavior(newRequest().setResumeFrom(":module3"), cli);
 
@@ -428,7 +428,7 @@
     }
 
     @Test
-    public void testShouldSetStrictChecksumPolityFlagFromRequest() {
+    void testShouldSetStrictChecksumPolityFlagFromRequest() {
 
         mclb.setFlags(newRequest().setGlobalChecksumPolicy(InvocationRequest.CheckSumPolicy.Fail), cli);
 
@@ -436,7 +436,7 @@
     }
 
     @Test
-    public void testShouldSetLaxChecksumPolicyFlagFromRequest() {
+    void testShouldSetLaxChecksumPolicyFlagFromRequest() {
 
         mclb.setFlags(newRequest().setGlobalChecksumPolicy(InvocationRequest.CheckSumPolicy.Warn), cli);
 
@@ -444,7 +444,7 @@
     }
 
     @Test
-    public void testShouldSetFailAtEndFlagFromRequest() {
+    void testShouldSetFailAtEndFlagFromRequest() {
 
         mclb.setReactorBehavior(
                 newRequest().setReactorFailureBehavior(InvocationRequest.ReactorFailureBehavior.FailAtEnd), cli);
@@ -453,7 +453,7 @@
     }
 
     @Test
-    public void testShouldSetFailNeverFlagFromRequest() {
+    void testShouldSetFailNeverFlagFromRequest() {
 
         mclb.setReactorBehavior(
                 newRequest().setReactorFailureBehavior(InvocationRequest.ReactorFailureBehavior.FailNever), cli);
@@ -462,7 +462,7 @@
     }
 
     @Test
-    public void testShouldAddArg() throws CommandLineConfigurationException {
+    void testShouldAddArg() throws CommandLineConfigurationException {
         InvocationRequest request =
                 newRequest().addArg("arg1").addArg("arg2").setQuiet(true).setBuilder("bId");
 
@@ -474,7 +474,7 @@
     }
 
     @Test
-    public void testShouldUseDefaultOfFailFastWhenSpecifiedInRequest() {
+    void testShouldUseDefaultOfFailFastWhenSpecifiedInRequest() {
 
         mclb.setReactorBehavior(
                 newRequest().setReactorFailureBehavior(InvocationRequest.ReactorFailureBehavior.FailFast), cli);
@@ -487,13 +487,13 @@
     }
 
     @Test
-    public void testShouldSetNoTransferProgressFlagFromRequest() {
+    void testShouldSetNoTransferProgressFlagFromRequest() {
         mclb.setFlags(newRequest().setNoTransferProgress(true), cli);
         assertArgumentsPresent(cli, Collections.singleton("-ntp"));
     }
 
     @Test
-    public void testShouldSpecifyFileOptionUsingNonStandardPomFileLocation() throws Exception {
+    void testShouldSpecifyFileOptionUsingNonStandardPomFileLocation() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("file-option-nonstd-pom-file-location"))
                 .toFile();
@@ -514,7 +514,7 @@
     }
 
     @Test
-    public void testShouldNotSpecifyFileOptionUsingStandardPomFileLocation() throws Exception {
+    void testShouldNotSpecifyFileOptionUsingStandardPomFileLocation() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("std-pom-file-location"))
                 .toFile();
@@ -535,7 +535,7 @@
     }
 
     @Test
-    public void testShouldSetPomForOutsideWorkspace() throws Exception {
+    void testShouldSetPomForOutsideWorkspace() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("std-pom-file-location"))
                 .toFile();
@@ -556,7 +556,7 @@
     }
 
     @Test
-    public void testShouldNotSpecifyFileOptionUsingStandardPomInBasedir() throws Exception {
+    void testShouldNotSpecifyFileOptionUsingStandardPomInBasedir() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("std-basedir-is-pom-file"))
                 .toFile();
@@ -577,7 +577,7 @@
     }
 
     @Test
-    public void testShouldUseDefaultPomFileWhenBasedirSpecifiedWithoutPomFileName() throws Exception {
+    void testShouldUseDefaultPomFileWhenBasedirSpecifiedWithoutPomFileName() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("std-basedir-no-pom-filename"))
                 .toFile();
@@ -596,7 +596,7 @@
     }
 
     @Test
-    public void testShouldSpecifyPomFileWhenBasedirSpecifiedWithPomFileName() throws Exception {
+    void testShouldSpecifyPomFileWhenBasedirSpecifiedWithPomFileName() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("std-basedir-with-pom-filename"))
                 .toFile();
@@ -615,7 +615,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomUserSettingsLocationFromRequest() throws Exception {
+    void testShouldSpecifyCustomUserSettingsLocationFromRequest() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("custom-settings"))
                 .toFile();
@@ -632,7 +632,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomGlobalSettingsLocationFromRequest() throws Exception {
+    void testShouldSpecifyCustomGlobalSettingsLocationFromRequest() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("custom-settings"))
                 .toFile()
@@ -650,7 +650,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomToolchainsLocationFromRequest() throws Exception {
+    void testShouldSpecifyCustomToolchainsLocationFromRequest() throws Exception {
         File projectDir = Files.createDirectories(
                         temporaryFolder.resolve("invoker-tests").resolve("custom-toolchains"))
                 .toFile();
@@ -667,7 +667,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomPropertyFromRequest() {
+    void testShouldSpecifyCustomPropertyFromRequest() {
 
         Properties properties = new Properties();
         properties.setProperty("key", "value");
@@ -678,7 +678,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomPropertyWithSpacesInValueFromRequest() {
+    void testShouldSpecifyCustomPropertyWithSpacesInValueFromRequest() {
 
         Properties properties = new Properties();
         properties.setProperty("key", "value with spaces");
@@ -689,7 +689,7 @@
     }
 
     @Test
-    public void testShouldSpecifyCustomPropertyWithSpacesInKeyFromRequest() {
+    void testShouldSpecifyCustomPropertyWithSpacesInKeyFromRequest() {
 
         Properties properties = new Properties();
         properties.setProperty("key with spaces", "value with spaces");
@@ -701,7 +701,7 @@
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testShouldSpecifySingleGoalFromRequest() throws CommandLineConfigurationException {
+    void testShouldSpecifySingleGoalFromRequest() throws CommandLineConfigurationException {
 
         List<String> goals = new ArrayList<>();
         goals.add("test");
@@ -721,7 +721,7 @@
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testShouldSpecifyTwoGoalsFromRequest() throws CommandLineConfigurationException {
+    void testShouldSpecifyTwoGoalsFromRequest() throws CommandLineConfigurationException {
         List<String> goals = new ArrayList<>();
         goals.add("test");
         goals.add("clean");
@@ -745,14 +745,14 @@
     }
 
     @Test
-    public void testShouldSpecifyThreadsFromRequest() {
+    void testShouldSpecifyThreadsFromRequest() {
         mclb.setThreads(newRequest().setThreads("2.0C"), cli);
 
         assertArgumentsPresentInOrder(cli, "-T", "2.0C");
     }
 
     @Test
-    public void testBuildTypicalMavenInvocationEndToEnd() throws Exception {
+    void testBuildTypicalMavenInvocationEndToEnd() throws Exception {
         File mavenDir = setupTempMavenHomeIfMissing(false);
 
         InvocationRequest request = newRequest();
@@ -805,7 +805,7 @@
     }
 
     @Test
-    public void testShouldInsertActivatedProfiles() throws Exception {
+    void testShouldInsertActivatedProfiles() throws Exception {
         setupTempMavenHomeIfMissing(false);
 
         String profile1 = "profile-1";
@@ -825,7 +825,7 @@
     }
 
     @Test
-    public void testMvnExecutableFromInvoker() throws Exception {
+    void testMvnExecutableFromInvoker() throws Exception {
         assumeTrue(Objects.nonNull(System.getProperty("maven.home")), "Test only works when maven.home is set");
 
         File mavenExecutable = new File("mvnDebug");
@@ -839,7 +839,7 @@
     }
 
     @Test
-    public void testMvnExecutableFormRequest() throws Exception {
+    void testMvnExecutableFormRequest() throws Exception {
         assumeTrue(Objects.nonNull(System.getProperty("maven.home")), "Test only works when maven.home is set");
 
         File mavenExecutable = new File("mvnDebug");
@@ -852,7 +852,7 @@
     }
 
     @Test
-    public void testDefaultMavenCommand() throws Exception {
+    void testDefaultMavenCommand() throws Exception {
         assumeTrue(Objects.nonNull(System.getProperty("maven.home")), "Test only works when maven.home is set");
 
         mclb.build(newRequest());
@@ -862,7 +862,7 @@
     }
 
     @Test
-    public void testAddShellEnvironment() throws Exception {
+    void testAddShellEnvironment() throws Exception {
         setupTempMavenHomeIfMissing(false);
 
         InvocationRequest request = newRequest();
diff --git a/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java b/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
index ff80abb..cf210f5 100644
--- a/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
@@ -20,22 +20,22 @@
 
 import org.junit.jupiter.api.Test;
 
-public class SystemOutHandlerTest {
+class SystemOutHandlerTest {
 
     @Test
-    public void testConsumeWithoutAlwaysFlush() {
+    void testConsumeWithoutAlwaysFlush() {
         logTestStart();
         new SystemOutHandler(false).consumeLine("This is a test.");
     }
 
     @Test
-    public void testConsumeWithAlwaysFlush() {
+    void testConsumeWithAlwaysFlush() {
         logTestStart();
         new SystemOutHandler(true).consumeLine("This is a test.");
     }
 
     @Test
-    public void testConsumeNullLine() {
+    void testConsumeNullLine() {
         logTestStart();
         new SystemOutHandler().consumeLine(null);
     }
diff --git a/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java b/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
index 33b781f..1b6dfff 100644
--- a/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
@@ -26,7 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class SystemOutLoggerTest {
+class SystemOutLoggerTest {
 
     private static final Throwable EXCEPTION =
             new MalformedURLException("This is meant to happen. It's part of the test.");
@@ -34,162 +34,162 @@
     private static final String MESSAGE = "This is a test message.";
 
     @Test
-    public void testDebugWithMessageOnly() {
+    void testDebugWithMessageOnly() {
         logTestStart();
         new SystemOutLogger().debug(MESSAGE);
     }
 
     @Test
-    public void testDebugWithMessageAndError() {
+    void testDebugWithMessageAndError() {
         logTestStart();
         new SystemOutLogger().debug(MESSAGE, EXCEPTION);
     }
 
     @Test
-    public void testDebugWithNullMessageAndNoError() {
+    void testDebugWithNullMessageAndNoError() {
         logTestStart();
         new SystemOutLogger().debug(null);
     }
 
     @Test
-    public void testDebugWithNullMessageError() {
+    void testDebugWithNullMessageError() {
         logTestStart();
         new SystemOutLogger().debug(null, EXCEPTION);
     }
 
     @Test
-    public void testDebugWithMessageNullError() {
+    void testDebugWithMessageNullError() {
         logTestStart();
         new SystemOutLogger().debug(MESSAGE, null);
     }
 
     @Test
-    public void testInfoWithMessageOnly() {
+    void testInfoWithMessageOnly() {
         logTestStart();
         new SystemOutLogger().info(MESSAGE);
     }
 
     @Test
-    public void testInfoWithMessageAndError() {
+    void testInfoWithMessageAndError() {
         logTestStart();
         new SystemOutLogger().info(MESSAGE, EXCEPTION);
     }
 
     @Test
-    public void testInfoWithNullMessageAndNoError() {
+    void testInfoWithNullMessageAndNoError() {
         logTestStart();
         new SystemOutLogger().info(null);
     }
 
     @Test
-    public void testInfoWithNullMessageError() {
+    void testInfoWithNullMessageError() {
         logTestStart();
         new SystemOutLogger().info(null, EXCEPTION);
     }
 
     @Test
-    public void testInfoWithMessageNullError() {
+    void testInfoWithMessageNullError() {
         logTestStart();
         new SystemOutLogger().info(MESSAGE, null);
     }
 
     @Test
-    public void testWarnWithMessageOnly() {
+    void testWarnWithMessageOnly() {
         logTestStart();
         new SystemOutLogger().warn(MESSAGE);
     }
 
     @Test
-    public void testWarnWithMessageAndError() {
+    void testWarnWithMessageAndError() {
         logTestStart();
         new SystemOutLogger().warn(MESSAGE, EXCEPTION);
     }
 
     @Test
-    public void testWarnWithNullMessageAndNoError() {
+    void testWarnWithNullMessageAndNoError() {
         logTestStart();
         new SystemOutLogger().warn(null);
     }
 
     @Test
-    public void testWarnWithNullMessageError() {
+    void testWarnWithNullMessageError() {
         logTestStart();
         new SystemOutLogger().warn(null, EXCEPTION);
     }
 
     @Test
-    public void testWarnWithMessageNullError() {
+    void testWarnWithMessageNullError() {
         logTestStart();
         new SystemOutLogger().warn(MESSAGE, null);
     }
 
     @Test
-    public void testErrorWithMessageOnly() {
+    void testErrorWithMessageOnly() {
         logTestStart();
         new SystemOutLogger().error(MESSAGE);
     }
 
     @Test
-    public void testErrorWithMessageAndError() {
+    void testErrorWithMessageAndError() {
         logTestStart();
         new SystemOutLogger().error(MESSAGE, EXCEPTION);
     }
 
     @Test
-    public void testErrorWithNullMessageAndNoError() {
+    void testErrorWithNullMessageAndNoError() {
         logTestStart();
         new SystemOutLogger().error(null);
     }
 
     @Test
-    public void testErrorWithNullMessageError() {
+    void testErrorWithNullMessageError() {
         logTestStart();
         new SystemOutLogger().error(null, EXCEPTION);
     }
 
     @Test
-    public void testErrorWithMessageNullError() {
+    void testErrorWithMessageNullError() {
         logTestStart();
         new SystemOutLogger().error(MESSAGE, null);
     }
 
     @Test
-    public void testFatalErrorWithMessageOnly() {
+    void testFatalErrorWithMessageOnly() {
         logTestStart();
         new SystemOutLogger().fatalError(MESSAGE);
     }
 
     @Test
-    public void testFatalErrorWithMessageAndError() {
+    void testFatalErrorWithMessageAndError() {
         logTestStart();
         new SystemOutLogger().fatalError(MESSAGE, EXCEPTION);
     }
 
     @Test
-    public void testFatalErrorWithNullMessageAndNoError() {
+    void testFatalErrorWithNullMessageAndNoError() {
         logTestStart();
         new SystemOutLogger().fatalError(null);
     }
 
     @Test
-    public void testFatalErrorWithNullMessageError() {
+    void testFatalErrorWithNullMessageError() {
         logTestStart();
         new SystemOutLogger().fatalError(null, EXCEPTION);
     }
 
     @Test
-    public void testFatalErrorWithMessageNullError() {
+    void testFatalErrorWithMessageNullError() {
         logTestStart();
         new SystemOutLogger().fatalError(MESSAGE, null);
     }
 
     @Test
-    public void testDefaultThresholdInfo() {
+    void testDefaultThresholdInfo() {
         assertEquals(InvokerLogger.INFO, new SystemOutLogger().getThreshold());
     }
 
     @Test
-    public void testThresholdDebug() {
+    void testThresholdDebug() {
         InvokerLogger logger = new SystemOutLogger();
         logger.setThreshold(InvokerLogger.DEBUG);
         assertTrue(logger.isDebugEnabled());
@@ -200,7 +200,7 @@
     }
 
     @Test
-    public void testThresholdInfo() {
+    void testThresholdInfo() {
         InvokerLogger logger = new SystemOutLogger();
         logger.setThreshold(InvokerLogger.INFO);
         assertFalse(logger.isDebugEnabled());
@@ -211,7 +211,7 @@
     }
 
     @Test
-    public void testThresholdWarn() {
+    void testThresholdWarn() {
         InvokerLogger logger = new SystemOutLogger();
         logger.setThreshold(InvokerLogger.WARN);
         assertFalse(logger.isDebugEnabled());
@@ -222,7 +222,7 @@
     }
 
     @Test
-    public void testThresholdError() {
+    void testThresholdError() {
         InvokerLogger logger = new SystemOutLogger();
         logger.setThreshold(InvokerLogger.ERROR);
         assertFalse(logger.isDebugEnabled());
@@ -233,7 +233,7 @@
     }
 
     @Test
-    public void testThresholdFatal() {
+    void testThresholdFatal() {
         InvokerLogger logger = new SystemOutLogger();
         logger.setThreshold(InvokerLogger.FATAL);
         assertFalse(logger.isDebugEnabled());