You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2022/04/01 19:19:04 UTC

[maven] 01/02: WIP: Cleanup Tests.

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MNG-7451
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 4acf8eb7750c9d55cd33ad0601086600592fec05
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Apr 1 20:39:34 2022 +0200

    WIP: Cleanup Tests.
---
 .../apache/maven/settings/GlobalSettingsTest.java  |   4 +-
 .../apache/maven/artifact/ArtifactUtilsTest.java   |   9 +-
 .../apache/maven/artifact/DefaultArtifactTest.java |  27 ++-
 .../artifact/versioning/ComparableVersionIT.java   |   4 +-
 .../artifact/versioning/ComparableVersionTest.java |  25 ++-
 .../versioning/DefaultArtifactVersionTest.java     |  16 +-
 .../artifact/versioning/VersionRangeTest.java      |  22 +-
 .../building/DefaultProblemCollectorTest.java      |   6 +-
 .../apache/maven/building/DefaultProblemTest.java  |  22 +-
 .../org/apache/maven/building/FileSourceTest.java  |  10 +-
 .../building/ProblemCollectorFactoryTest.java      |   6 +-
 .../apache/maven/building/StringSourceTest.java    |   8 +-
 .../org/apache/maven/building/UrlSourceTest.java   |   8 +-
 .../artifact/deployer/ArtifactDeployerTest.java    |   4 +-
 .../factory/DefaultArtifactFactoryTest.java        |   4 +-
 .../artifact/installer/ArtifactInstallerTest.java  |   4 +-
 .../repository/MavenArtifactRepositoryTest.java    |   4 +-
 .../resolver/ArtifactResolutionExceptionTest.java  |   4 +-
 .../artifact/resolver/ArtifactResolverTest.java    |   2 +-
 .../resolver/DefaultArtifactResolverTest.java      |   6 +-
 .../transform/TransformationManagerTest.java       |   4 +-
 .../manager/DefaultProfileManagerTest.java         |  14 +-
 .../org/apache/maven/project/ModelUtilsTest.java   |  34 ++--
 .../apache/maven/project/ProjectClasspathTest.java |   5 +-
 .../inheritance/t00/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t01/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t02/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t03/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t04/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t05/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t06/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t07/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t08/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t09/ProjectInheritanceTest.java    |   6 +-
 .../inheritance/t10/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t11/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t12/ProjectInheritanceTest.java    |   4 +-
 .../inheritance/t12scm/ProjectInheritanceTest.java |   6 +-
 .../project/path/DefaultPathTranslatorTest.java    |   8 +-
 .../repository/DefaultMirrorSelectorTest.java      |   4 +-
 .../repository/LegacyRepositorySystemTest.java     |   6 +-
 .../maven/repository/MirrorProcessorTest.java      |  16 +-
 .../legacy/DefaultUpdateCheckManagerTest.java      |  17 +-
 .../repository/legacy/DefaultWagonManagerTest.java |  18 +-
 .../legacy/LegacyRepositorySystemTest.java         |   6 +-
 .../resolver/DefaultArtifactCollectorTest.java     |  76 +++----
 .../conflict/FarthestConflictResolverTest.java     |  10 +-
 .../conflict/NearestConflictResolverTest.java      |  10 +-
 .../conflict/NewestConflictResolverTest.java       |  10 +-
 .../conflict/OldestConflictResolverTest.java       |  10 +-
 .../DefaultClasspathTransformationTest.java        |  12 +-
 .../DefaultGraphConflictResolutionPolicyTest.java  |   6 +-
 .../metadata/DefaultGraphConflictResolverTest.java |  10 +-
 .../artifact/handler/ArtifactHandlerTest.java      |   4 +-
 .../filter/ExclusionArtifactFilterTest.java        |  22 +-
 .../configuration/DefaultBeanConfiguratorTest.java |  13 +-
 .../exception/DefaultExceptionHandlerTest.java     |   8 +-
 .../DefaultBuildResumptionAnalyzerTest.java        |  14 +-
 .../DefaultBuildResumptionDataRepositoryTest.java  |  12 +-
 .../DefaultMavenExecutionRequestPopulatorTest.java |   4 +-
 .../maven/execution/DefaultMavenExecutionTest.java |   6 +-
 .../scope/internal/MojoExecutionScopeTest.java     |   6 +-
 .../maven/graph/DefaultGraphBuilderTest.java       |   2 +-
 .../graph/DefaultProjectDependencyGraphTest.java   |  18 +-
 .../aether/ConsumerModelSourceTransformerTest.java |   4 +-
 .../maven/lifecycle/DefaultLifecyclesTest.java     |  14 +-
 .../lifecycle/LifecycleExecutorSubModulesTest.java |   4 +-
 .../maven/lifecycle/LifecycleExecutorTest.java     |  24 +--
 .../maven/lifecycle/MavenExecutionPlanTest.java    |  10 +-
 .../internal/BuildListCalculatorTest.java          |   4 +-
 .../internal/ConcurrencyDependencyGraphTest.java   |   6 +-
 .../internal/LifecycleDependencyResolverTest.java  |   4 +-
 .../LifecycleExecutionPlanCalculatorTest.java      |   2 +-
 .../LifecycleTaskSegmentCalculatorImplTest.java    |   4 +-
 .../lifecycle/internal/PhaseRecorderTest.java      |   4 +-
 .../lifecycle/internal/ProjectBuildListTest.java   |   4 +-
 .../internal/builder/BuilderCommonTest.java        |  12 +-
 .../ConcurrencyDependencyGraphTest.java            |   4 +-
 .../multithreaded/ThreadOutputMuxerTest.java       |   4 +-
 .../stub/ProjectDependencyGraphStubTest.java       |  10 +-
 .../lifecycle/mapping/LifecyclePhaseTest.java      |   4 +-
 .../org/apache/maven/plugin/PluginManagerTest.java |  22 +-
 .../maven/plugin/PluginParameterExceptionTest.java |   8 +-
 .../PluginParameterExpressionEvaluatorTest.java    |  34 ++--
 .../plugin/internal/DefaultLegacySupportTest.java  |   4 +-
 .../plugin/internal/MavenPluginValidatorTest.java  |  10 +-
 .../project/AbstractMavenProjectTestCase.java      |   2 +-
 .../project/DefaultMavenProjectBuilderTest.java    |  33 ++-
 .../project/ExtensionDescriptorBuilderTest.java    |  10 +-
 .../org/apache/maven/project/MavenProjectTest.java |  24 +--
 .../apache/maven/project/PomConstructionTest.java  | 224 ++++++++++-----------
 .../apache/maven/project/ProjectBuilderTest.java   |  27 ++-
 .../maven/project/ProjectModelResolverTest.java    |  22 +-
 .../apache/maven/project/ProjectSorterTest.java    |  26 +--
 .../artifact/DefaultMavenMetadataCacheTest.java    |   8 +-
 .../artifact/DefaultProjectArtifactsCacheTest.java |   7 +-
 .../project/artifact/MavenMetadataSourceTest.java  |   8 +-
 .../canonical/CanonicalProjectBuilderTest.java     |   4 +-
 98 files changed, 612 insertions(+), 619 deletions(-)

diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index 70a1115..7ddad3c 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -35,11 +35,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author Benjamin Bentmann
  */
-public class GlobalSettingsTest
+class GlobalSettingsTest
 {
 
     @Test
-    public void testValidGlobalSettings()
+    void testValidGlobalSettings()
         throws Exception
     {
         String basedir = System.getProperty( "basedir", System.getProperty( "user.dir" ) );
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index 485b3f6..3cc2c55 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author Benjamin Bentmann
  */
-public class ArtifactUtilsTest
+class ArtifactUtilsTest
 {
 
     private Artifact newArtifact( String aid )
@@ -45,7 +45,7 @@ public class ArtifactUtilsTest
     }
 
     @Test
-    public void testIsSnapshot()
+    void testIsSnapshot()
     {
         assertFalse( ArtifactUtils.isSnapshot( null ) );
         assertFalse( ArtifactUtils.isSnapshot( "" ) );
@@ -57,7 +57,7 @@ public class ArtifactUtilsTest
     }
 
     @Test
-    public void testToSnapshotVersion()
+    void testToSnapshotVersion()
     {
         assertEquals( "1.2.3", ArtifactUtils.toSnapshotVersion( "1.2.3" ) );
         assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-SNAPSHOT" ) );
@@ -69,8 +69,7 @@ public class ArtifactUtilsTest
      * Tests that the ordering of the map resembles the ordering of the input collection of artifacts.
      */
     @Test
-    public void testArtifactMapByVersionlessIdOrdering()
-        throws Exception
+    void testArtifactMapByVersionlessIdOrdering()
     {
         List<Artifact> list = new ArrayList<>();
         list.add( newArtifact( "b" ) );
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
index 4f91962..c1d3870 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class DefaultArtifactTest
+class DefaultArtifactTest
 {
 
     private DefaultArtifact artifact;
@@ -47,8 +47,7 @@ public class DefaultArtifactTest
     private ArtifactHandlerMock artifactHandler;
 
     @BeforeEach
-    public void setUp()
-        throws Exception
+    void setUp()
     {
         artifactHandler = new ArtifactHandlerMock();
         versionRange = VersionRange.createFromVersion( version );
@@ -59,7 +58,7 @@ public class DefaultArtifactTest
     }
 
     @Test
-    public void testGetVersionReturnsResolvedVersionOnSnapshot()
+    void testGetVersionReturnsResolvedVersionOnSnapshot()
     {
         assertEquals( snapshotResolvedVersion, snapshotArtifact.getVersion() );
 
@@ -70,62 +69,62 @@ public class DefaultArtifactTest
     }
 
     @Test
-    public void testGetDependencyConflictId()
+    void testGetDependencyConflictId()
     {
         assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
     }
 
     @Test
-    public void testGetDependencyConflictIdNullGroupId()
+    void testGetDependencyConflictIdNullGroupId()
     {
         artifact.setGroupId( null );
         assertEquals( null + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
     }
 
     @Test
-    public void testGetDependencyConflictIdNullClassifier()
+    void testGetDependencyConflictIdNullClassifier()
     {
         artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, null, artifactHandler );
         assertEquals( groupId + ":" + artifactId + ":" + type, artifact.getDependencyConflictId() );
     }
 
     @Test
-    public void testGetDependencyConflictIdNullScope()
+    void testGetDependencyConflictIdNullScope()
     {
         artifact.setScope( null );
         assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
     }
 
     @Test
-    public void testToString()
+    void testToString()
     {
         assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope,
                       artifact.toString() );
     }
 
     @Test
-    public void testToStringNullGroupId()
+    void testToStringNullGroupId()
     {
         artifact.setGroupId( null );
         assertEquals( artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope, artifact.toString() );
     }
 
     @Test
-    public void testToStringNullClassifier()
+    void testToStringNullClassifier()
     {
         artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, null, artifactHandler );
         assertEquals( groupId + ":" + artifactId + ":" + type + ":" + version + ":" + scope, artifact.toString() );
     }
 
     @Test
-    public void testToStringNullScope()
+    void testToStringNullScope()
     {
         artifact.setScope( null );
         assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version, artifact.toString() );
     }
 
     @Test
-    public void testComparisonByVersion()
+    void testComparisonByVersion()
     {
         Artifact artifact1 = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
                                                   type, classifier, artifactHandler );
@@ -142,7 +141,7 @@ public class DefaultArtifactTest
     }
 
     @Test
-    public void testNonResolvedVersionRangeConsistentlyYieldsNullVersions()
+    void testNonResolvedVersionRangeConsistentlyYieldsNullVersions()
         throws Exception
     {
         VersionRange vr = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
index cd63b4d..463855e 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
@@ -33,11 +33,11 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ComparableVersionIT
+class ComparableVersionIT
 {
 
     @Test
-    public void test()
+    void test()
         throws Exception
     {
         Files.walkFileTree( Paths.get( "target" ), new SimpleFileVisitor<Path>()
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index a36f605..d57fbc9 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -31,8 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
  */
-@SuppressWarnings( "unchecked" )
-public class ComparableVersionTest
+class ComparableVersionTest
 {
     private Comparable newComparable( String version )
     {
@@ -104,19 +103,19 @@ public class ComparableVersionTest
     }
 
     @Test
-    public void testVersionsQualifier()
+    void testVersionsQualifier()
     {
         checkVersionsOrder( VERSIONS_QUALIFIER );
     }
 
     @Test
-    public void testVersionsNumber()
+    void testVersionsNumber()
     {
         checkVersionsOrder( VERSIONS_NUMBER );
     }
 
     @Test
-    public void testVersionsEqual()
+    void testVersionsEqual()
     {
         newComparable( "1.0-alpha" );
         checkVersionsEqual( "1", "1" );
@@ -170,7 +169,7 @@ public class ComparableVersionTest
     }
 
     @Test
-    public void testVersionComparing()
+    void testVersionComparing()
     {
         checkVersionsOrder( "1", "2" );
         checkVersionsOrder( "1.5", "2" );
@@ -209,7 +208,7 @@ public class ComparableVersionTest
      * <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=226100">226100</a>
      */
     @Test
-    public void testMng5568()
+    void testMng5568()
     {
         String a = "6.1.0";
         String b = "6.1.0rc3";
@@ -224,7 +223,7 @@ public class ComparableVersionTest
      * Test <a href="https://jira.apache.org/jira/browse/MNG-6572">MNG-6572</a> optimization.
      */
     @Test
-    public void testMng6572()
+    void testMng6572()
     {
         String a = "20190126.230843"; // resembles a SNAPSHOT
         String b = "1234567890.12345"; // 10 digit number
@@ -244,7 +243,7 @@ public class ComparableVersionTest
      * (related to MNG-6572 optimization)
      */
     @Test
-    public void testVersionEqualWithLeadingZeroes()
+    void testVersionEqualWithLeadingZeroes()
     {
         // versions with string lengths from 1 to 19
         String[] arr = new String[] {
@@ -277,7 +276,7 @@ public class ComparableVersionTest
      * (related to MNG-6572 optimization)
      */
     @Test
-    public void testVersionZeroEqualWithLeadingZeroes()
+    void testVersionZeroEqualWithLeadingZeroes()
     {
         // versions with string lengths from 1 to 19
         String[] arr = new String[] {
@@ -310,7 +309,7 @@ public class ComparableVersionTest
      * for qualifiers that start with "-0.", which was showing A == C and B == C but A &lt; B.
      */
     @Test
-    public void testMng6964()
+    void testMng6964()
     {
         String a = "1-0.alpha";
         String b = "1-0.beta";
@@ -322,7 +321,7 @@ public class ComparableVersionTest
     }
 
     @Test
-    public void testLocaleIndependent()
+    void testLocaleIndependent()
     {
         Locale orig = Locale.getDefault();
         Locale[] locales = { Locale.ENGLISH, new Locale( "tr" ), Locale.getDefault() };
@@ -341,7 +340,7 @@ public class ComparableVersionTest
     }
 
     @Test
-    public void testReuse()
+    void testReuse()
     {
         ComparableVersion c1 = new ComparableVersion( "1" );
         c1.parseVersion( "2" );
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
index 13f3ffa..367bba0 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class DefaultArtifactVersionTest
+class DefaultArtifactVersionTest
 {
     private ArtifactVersion newArtifactVersion( String version )
     {
@@ -54,7 +54,7 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testVersionParsing()
+    void testVersionParsing()
     {
         checkVersionParsing( "1", 1, 0, 0, 0, null );
         checkVersionParsing( "1.2", 1, 2, 0, 0, null );
@@ -92,7 +92,7 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testVersionComparing()
+    void testVersionComparing()
     {
         assertVersionEqual( "1", "1" );
         assertVersionOlder( "1", "2" );
@@ -140,7 +140,7 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testVersionSnapshotComparing()
+    void testVersionSnapshotComparing()
     {
         assertVersionEqual( "1-SNAPSHOT", "1-SNAPSHOT" );
         assertVersionOlder( "1-SNAPSHOT", "2-SNAPSHOT" );
@@ -175,7 +175,7 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testSnapshotVsReleases()
+    void testSnapshotVsReleases()
     {
         assertVersionOlder( "1.0-RC1", "1.0-SNAPSHOT" );
         assertVersionOlder( "1.0-rc1", "1.0-SNAPSHOT" );
@@ -183,7 +183,7 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testHashCode()
+    void testHashCode()
     {
         ArtifactVersion v1 = newArtifactVersion( "1" );
         ArtifactVersion v2 = newArtifactVersion( "1.0" );
@@ -192,13 +192,13 @@ public class DefaultArtifactVersionTest
     }
 
     @Test
-    public void testEqualsNullSafe()
+    void testEqualsNullSafe()
     {
         assertFalse( newArtifactVersion( "1" ).equals( null ) );
     }
 
     @Test
-    public void testEqualsTypeSafe()
+    void testEqualsTypeSafe()
     {
         assertFalse( newArtifactVersion( "1" ).equals( "non-an-artifact-version-instance" ) );
     }
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 50270a0..85bea12 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class VersionRangeTest
+class VersionRangeTest
 {
     private static final String CHECK_NUM_RESTRICTIONS = "check number of restrictions";
 
@@ -55,7 +55,7 @@ public class VersionRangeTest
     private static final String CHECK_SELECTED_VERSION = "check selected version";
 
     @Test
-    public void testRange()
+    void testRange()
         throws InvalidVersionSpecificationException, OverConstrainedVersionException
     {
         Artifact artifact = null;
@@ -161,7 +161,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testInvalidRanges()
+    void testInvalidRanges()
     {
         checkInvalidRange( "(1.0)" );
         checkInvalidRange( "[1.0)" );
@@ -180,7 +180,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testIntersections()
+    void testIntersections()
         throws InvalidVersionSpecificationException
     {
         VersionRange range1 = VersionRange.createFromVersionSpec( "1.0" );
@@ -663,7 +663,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testReleaseRangeBoundsContainsSnapshots()
+    void testReleaseRangeBoundsContainsSnapshots()
         throws InvalidVersionSpecificationException
     {
         VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2]" );
@@ -674,7 +674,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testSnapshotRangeBoundsCanContainSnapshots()
+    void testSnapshotRangeBoundsCanContainSnapshots()
         throws InvalidVersionSpecificationException
     {
         VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2-SNAPSHOT]" );
@@ -689,7 +689,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testSnapshotSoftVersionCanContainSnapshot()
+    void testSnapshotSoftVersionCanContainSnapshot()
         throws InvalidVersionSpecificationException
     {
         VersionRange range = VersionRange.createFromVersionSpec( "1.0-SNAPSHOT" );
@@ -706,7 +706,7 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testContains() throws InvalidVersionSpecificationException
+    void testContains() throws InvalidVersionSpecificationException
     {
         ArtifactVersion actualVersion = new DefaultArtifactVersion( "2.0.5" );
         assertTrue( enforceVersion( "2.0.5", actualVersion ) );
@@ -720,7 +720,7 @@ public class VersionRangeTest
         assertFalse( enforceVersion( "[2.0,2.0.5)", actualVersion ) );
     }
 
-    public boolean enforceVersion( String requiredVersionRange, ArtifactVersion actualVersion )
+    boolean enforceVersion( String requiredVersionRange, ArtifactVersion actualVersion )
         throws InvalidVersionSpecificationException
     {
         VersionRange vr = null;
@@ -731,13 +731,13 @@ public class VersionRangeTest
     }
 
     @Test
-    public void testOrder0()
+    void testOrder0()
     {
         // assertTrue( new DefaultArtifactVersion( "1.0-alpha10" ).compareTo( new DefaultArtifactVersion( "1.0-alpha1" ) ) > 0 );
     }
 
     @Test
-    public void testCache()
+    void testCache()
         throws InvalidVersionSpecificationException
     {
         VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2]" );
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
index a8b85d8..ae8cd26 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -26,11 +26,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class DefaultProblemCollectorTest
+class DefaultProblemCollectorTest
 {
 
     @Test
-    public void testGetProblems()
+    void testGetProblems()
     {
         DefaultProblemCollector collector = new DefaultProblemCollector( null );
         assertNotNull( collector.getProblems() );
@@ -59,7 +59,7 @@ public class DefaultProblemCollectorTest
     }
 
     @Test
-    public void testSetSource()
+    void testSetSource()
     {
         DefaultProblemCollector collector = new DefaultProblemCollector( null );
 
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
index 6182f99..69eb59a 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
@@ -19,18 +19,18 @@ package org.apache.maven.building;
  * under the License.
  */
 
-import org.apache.maven.building.Problem.Severity;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-public class DefaultProblemTest
+import org.apache.maven.building.Problem.Severity;
+import org.junit.jupiter.api.Test;
+
+class DefaultProblemTest
 {
 
     @Test
-    public void testGetSeverity()
+    void testGetSeverity()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertEquals( Severity.ERROR, problem.getSeverity() );
@@ -46,7 +46,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetLineNumber()
+    void testGetLineNumber()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertEquals( -1, problem.getLineNumber() );
@@ -63,7 +63,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetColumnNumber()
+    void testGetColumnNumber()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertEquals( -1, problem.getColumnNumber() );
@@ -80,7 +80,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetException()
+    void testGetException()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertNull( problem.getException() );
@@ -91,7 +91,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetSource()
+    void testGetSource()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertEquals( "", problem.getSource() );
@@ -104,7 +104,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetLocation()
+    void testGetLocation()
     {
         DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
         assertEquals( "", problem.getLocation() );
@@ -123,7 +123,7 @@ public class DefaultProblemTest
     }
 
     @Test
-    public void testGetMessage()
+    void testGetMessage()
     {
         DefaultProblem problem = new DefaultProblem( "MESSAGE", null, null, -1, -1, null );
         assertEquals( "MESSAGE", problem.getMessage() );
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
index 9373c01..07f6c26 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
@@ -28,11 +28,11 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class FileSourceTest
+class FileSourceTest
 {
 
     @Test
-    public void testFileSource()
+    void testFileSource()
     {
         NullPointerException e = assertThrows(
                 NullPointerException.class,
@@ -42,7 +42,7 @@ public class FileSourceTest
     }
 
     @Test
-    public void testGetInputStream()
+    void testGetInputStream()
         throws Exception
     {
         File txtFile = new File( "target/test-classes/source.txt" );
@@ -57,7 +57,7 @@ public class FileSourceTest
     }
 
     @Test
-    public void testGetLocation()
+    void testGetLocation()
     {
         File txtFile = new File( "target/test-classes/source.txt" );
         FileSource source = new FileSource( txtFile );
@@ -65,7 +65,7 @@ public class FileSourceTest
     }
 
     @Test
-    public void testGetFile()
+    void testGetFile()
     {
         File txtFile = new File( "target/test-classes/source.txt" );
         FileSource source = new FileSource( txtFile );
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
index ee2575b..fe21625 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
@@ -26,11 +26,11 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 
-public class ProblemCollectorFactoryTest
+class ProblemCollectorFactoryTest
 {
 
-    @Test
-    public void testNewInstance()
+
+    void testNewInstance()
     {
         ProblemCollector collector1 = ProblemCollectorFactory.newInstance( null );
 
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
index 85309aa..272c3d1 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
@@ -26,10 +26,10 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class StringSourceTest
+class StringSourceTest
 {
     @Test
-    public void testGetInputStream()
+    void testGetInputStream()
         throws Exception
     {
         StringSource source = new StringSource( "Hello World!" );
@@ -42,7 +42,7 @@ public class StringSourceTest
     }
 
     @Test
-    public void testGetLocation()
+    void testGetLocation()
     {
         StringSource source = new StringSource( "Hello World!" );
         assertEquals( "(memory)", source.getLocation() );
@@ -52,7 +52,7 @@ public class StringSourceTest
     }
 
     @Test
-    public void testGetContent()
+    void testGetContent()
     {
         StringSource source = new StringSource( null );
         assertEquals( "", source.getContent() );
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
index efdb9bb..0a6b6ec 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
@@ -29,11 +29,11 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UrlSourceTest
+class UrlSourceTest
 {
 
     @Test
-    public void testUrlSource()
+    void testUrlSource()
     {
         NullPointerException e = assertThrows(
                 NullPointerException.class,
@@ -43,7 +43,7 @@ public class UrlSourceTest
     }
 
     @Test
-    public void testGetInputStream()
+    void testGetInputStream()
         throws Exception
     {
         URL txtFile = new File( "target/test-classes/source.txt" ).toURI().toURL();
@@ -56,7 +56,7 @@ public class UrlSourceTest
     }
 
     @Test
-    public void testGetLocation()
+    void testGetLocation()
         throws Exception
     {
         URL txtFile = new File( "target/test-classes/source.txt" ).toURI().toURL();
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
index 3f33fa1..451a026 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
@@ -39,7 +39,7 @@ import javax.inject.Inject;
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  */
-public class ArtifactDeployerTest
+class ArtifactDeployerTest
     extends AbstractArtifactComponentTestCase
 {
     @Inject
@@ -54,7 +54,7 @@ public class ArtifactDeployerTest
     }
 
     @Test
-    public void testArtifactInstallation()
+    void testArtifactInstallation()
         throws Exception
     {
         sessionScope.enter();
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
index d124894..a07e667 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
@@ -29,14 +29,14 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @PlexusTest
-public class DefaultArtifactFactoryTest
+class DefaultArtifactFactoryTest
 {
 
     @Inject
     ArtifactFactory factory;
 
     @Test
-    public void testPropagationOfSystemScopeRegardlessOfInheritedScope()
+    void testPropagationOfSystemScopeRegardlessOfInheritedScope()
     {
         Artifact artifact = factory.createDependencyArtifact( "test-grp", "test-artifact", VersionRange.createFromVersion("1.0"), "type", null, "system", "provided" );
         Artifact artifact2 = factory.createDependencyArtifact( "test-grp", "test-artifact-2", VersionRange.createFromVersion("1.0"), "type", null, "system", "test" );
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
index afa2761..27febe4 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  */
-public class ArtifactInstallerTest
+class ArtifactInstallerTest
     extends AbstractArtifactComponentTestCase
 {
     @Inject
@@ -50,7 +50,7 @@ public class ArtifactInstallerTest
     }
 
     @Test
-    public void testArtifactInstallation()
+    void testArtifactInstallation()
         throws Exception
     {
         sessionScope.enter();
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
index 4e7b5dc..395c52f 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class MavenArtifactRepositoryTest
+class MavenArtifactRepositoryTest
 {
     private static class MavenArtifactRepositorySubclass extends MavenArtifactRepository
     {
@@ -44,7 +44,7 @@ public class MavenArtifactRepositoryTest
     }
 
     @Test
-    public void testHashCodeEquals()
+    void testHashCodeEquals()
     {
         MavenArtifactRepositorySubclass r1 = new MavenArtifactRepositorySubclass( "foo" );
         MavenArtifactRepositorySubclass r2 = new MavenArtifactRepositorySubclass( "foo" );
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
index e6b0e56..5d67cda 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
@@ -31,12 +31,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  * @author Mauro Talevi
  */
-public class ArtifactResolutionExceptionTest
+class ArtifactResolutionExceptionTest
 {
     private static final String LS = System.lineSeparator();
 
     @Test
-    public void testMissingArtifactMessageFormat()
+    void testMissingArtifactMessageFormat()
     {
         String message = "Missing artifact";
         String indentation = "  ";
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 6aa0652..63bcf96 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -52,7 +52,7 @@ import javax.inject.Inject;
 /**
  * @author Jason van Zyl
  */
-public class ArtifactResolverTest
+class ArtifactResolverTest
     extends AbstractArtifactComponentTestCase
 {
     @Inject
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
index 30458d5..6f65a99 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.inject.Inject;
 
-public class DefaultArtifactResolverTest
+class DefaultArtifactResolverTest
     extends AbstractArtifactComponentTestCase
 {
     @Inject
@@ -55,7 +55,7 @@ public class DefaultArtifactResolverTest
     }
 
     @Test
-    public void testMNG4738()
+    void testMNG4738()
         throws Exception
     {
         Artifact g = createLocalArtifact( "g", "1.0" );
@@ -101,7 +101,7 @@ public class DefaultArtifactResolverTest
     }
 
     @Test
-    public void testLookup()
+    void testLookup()
         throws Exception
     {
         ArtifactResolver resolver = getContainer().lookup( ArtifactResolver.class, "default" );
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
index 68a7522..65b7ba0 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
@@ -32,13 +32,13 @@ import javax.inject.Inject;
 
 /** @author Jason van Zyl */
 @PlexusTest
-public class TransformationManagerTest
+class TransformationManagerTest
 {
     @Inject
     ArtifactTransformationManager tm;
 
     @Test
-    public void testTransformationManager()
+    void testTransformationManager()
     {
         List<ArtifactTransformation> tms = tm.getArtifactTransformations();
 
diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
index bcb50a1..ce52b9d 100644
--- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @PlexusTest
-public class DefaultProfileManagerTest
+class DefaultProfileManagerTest
 {
 
     @Inject
@@ -49,7 +49,7 @@ public class DefaultProfileManagerTest
     }
 
     @Test
-    public void testShouldActivateDefaultProfile()
+    void testShouldActivateDefaultProfile()
         throws Exception
     {
         Profile notActivated = new Profile();
@@ -85,7 +85,7 @@ public class DefaultProfileManagerTest
     }
 
     @Test
-    public void testShouldNotActivateDefaultProfile()
+    void testShouldNotActivateDefaultProfile()
         throws Exception
     {
         Profile syspropActivated = new Profile();
@@ -125,7 +125,7 @@ public class DefaultProfileManagerTest
 
 
     @Test
-    public void testShouldNotActivateReversalOfPresentSystemProperty()
+    void testShouldNotActivateReversalOfPresentSystemProperty()
         throws Exception
     {
         Profile syspropActivated = new Profile();
@@ -153,7 +153,7 @@ public class DefaultProfileManagerTest
     }
 
     @Test
-    public void testShouldOverrideAndActivateInactiveProfile()
+    void testShouldOverrideAndActivateInactiveProfile()
         throws Exception
     {
         Profile syspropActivated = new Profile();
@@ -184,7 +184,7 @@ public class DefaultProfileManagerTest
     }
 
     @Test
-    public void testShouldOverrideAndDeactivateActiveProfile()
+    void testShouldOverrideAndDeactivateActiveProfile()
         throws Exception
     {
         Profile syspropActivated = new Profile();
@@ -215,7 +215,7 @@ public class DefaultProfileManagerTest
 
     @Test
     @Disabled
-    public void testOsActivationProfile()
+    void testOsActivationProfile()
         throws Exception
     {
         /*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index 74178d9..a24dab2 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -41,11 +41,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-public class ModelUtilsTest
+class ModelUtilsTest
 {
 
-    @Test
-    public void testShouldUseMainPluginDependencyVersionOverManagedDepVersion()
+
+    void testShouldUseMainPluginDependencyVersionOverManagedDepVersion()
     {
         Plugin mgtPlugin = createPlugin( "group", "artifact", "1", Collections.EMPTY_MAP );
         Dependency mgtDep = createDependency( "g", "a", "2" );
@@ -72,8 +72,8 @@ public class ModelUtilsTest
         return dep;
     }
 
-    @Test
-    public void testShouldNotInheritPluginWithInheritanceSetToFalse()
+
+    void testShouldNotInheritPluginWithInheritanceSetToFalse()
     {
         PluginContainer parent = new PluginContainer();
 
@@ -114,7 +114,7 @@ public class ModelUtilsTest
      * </pre>
      */
     @Test
-    public void testShouldPreserveChildOrderingOfPluginsAfterParentMerge()
+    void testShouldPreserveChildOrderingOfPluginsAfterParentMerge()
     {
         PluginContainer parent = new PluginContainer();
 
@@ -183,7 +183,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldInheritOnePluginWithExecution()
+    void testShouldInheritOnePluginWithExecution()
     {
         Plugin parent = new Plugin();
         parent.setArtifactId( "testArtifact" );
@@ -234,7 +234,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldMergeOnePluginWithInheritExecutionWithoutDuplicatingPluginInList()
+    void testShouldMergeOnePluginWithInheritExecutionWithoutDuplicatingPluginInList()
     {
         Plugin parent = new Plugin();
         parent.setArtifactId( "testArtifact" );
@@ -269,7 +269,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldMergePluginWithDifferentExecutionFromParentWithoutDuplicatingPluginInList()
+    void testShouldMergePluginWithDifferentExecutionFromParentWithoutDuplicatingPluginInList()
     {
         Plugin parent = new Plugin();
         parent.setArtifactId( "testArtifact" );
@@ -310,7 +310,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldNOTMergeInheritedPluginHavingInheritEqualFalse()
+    void testShouldNOTMergeInheritedPluginHavingInheritEqualFalse()
     {
         Plugin parent = new Plugin();
         parent.setArtifactId( "testArtifact" );
@@ -338,7 +338,7 @@ public class ModelUtilsTest
      * child list.
      */
     @Test
-    public void testShouldKeepOriginalPluginOrdering()
+    void testShouldKeepOriginalPluginOrdering()
     {
         Plugin parentPlugin1 = new Plugin();
         parentPlugin1.setArtifactId( "testArtifact" );
@@ -403,7 +403,7 @@ public class ModelUtilsTest
      * Verifies MNG-1499: The ordering of plugin executions should also be in the specified order.
      */
     @Test
-    public void testShouldKeepOriginalPluginExecutionOrdering()
+    void testShouldKeepOriginalPluginExecutionOrdering()
     {
         Plugin parent = new Plugin();
         parent.setArtifactId( "testArtifact" );
@@ -453,7 +453,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldOverwritePluginConfigurationSubItemsByDefault()
+    void testShouldOverwritePluginConfigurationSubItemsByDefault()
         throws XmlPullParserException, IOException
     {
         String parentConfigStr = "<configuration><items><item>one</item><item>two</item></items></configuration>";
@@ -480,7 +480,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldMergePluginConfigurationSubItemsWithMergeAttributeSet()
+    void testShouldMergePluginConfigurationSubItemsWithMergeAttributeSet()
         throws XmlPullParserException, IOException
     {
         String parentConfigStr = "<configuration><items><item>one</item><item>two</item></items></configuration>";
@@ -512,7 +512,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldNotMergePluginExecutionWhenExecInheritedIsFalseAndTreatAsInheritanceIsTrue()
+    void testShouldNotMergePluginExecutionWhenExecInheritedIsFalseAndTreatAsInheritanceIsTrue()
     {
         String gid = "group";
         String aid = "artifact";
@@ -553,7 +553,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldNotMergePluginExecutionWhenPluginInheritedIsFalseAndTreatAsInheritanceIsTrue()
+    void testShouldNotMergePluginExecutionWhenPluginInheritedIsFalseAndTreatAsInheritanceIsTrue()
     {
         String gid = "group";
         String aid = "artifact";
@@ -594,7 +594,7 @@ public class ModelUtilsTest
     }
 
     @Test
-    public void testShouldMergePluginExecutionWhenExecInheritedIsTrueAndTreatAsInheritanceIsTrue()
+    void testShouldMergePluginExecutionWhenExecInheritedIsTrueAndTreatAsInheritanceIsTrue()
     {
         String gid = "group";
         String aid = "artifact";
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
index ad4531c..100cc08 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
@@ -33,12 +33,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class ProjectClasspathTest
+class ProjectClasspathTest
     extends AbstractMavenProjectTestCase
 {
     static final String dir = "projects/scope/";
 
-    @Override
     @BeforeEach
     public void setUp()
             throws Exception
@@ -55,7 +54,7 @@ public class ProjectClasspathTest
     }
 
     @Test
-    public void testProjectClasspath()
+    void testProjectClasspath()
         throws Exception
     {
         File f = getFileForClasspathResource( dir + "project-with-scoped-dependencies.xml" );
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index 936424d..17737b7 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  * @author Jason van Zyl
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -54,7 +54,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testProjectInheritance()
+    void testProjectInheritance()
         throws Exception
     {
         MavenProject p4 = getProject( projectFile( "p4" ) );
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
index 8f8199e..b2f66ad 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  * @author Jason van Zyl
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -50,7 +50,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testProjectInheritance()
+    void testProjectInheritance()
         throws Exception
     {
         // ----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 61a3932..a0e09f0 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author Jason van Zyl
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -64,7 +64,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testProjectInheritance()
+    void testProjectInheritance()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
index 3c658d8..089788a 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  * @author Jason van Zyl
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -53,7 +53,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testProjectInheritance()
+    void testProjectInheritance()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
index 34a31d5..1e12d6b 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -57,7 +57,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagementOverridesTransitiveDependencyVersion()
+    void testDependencyManagementOverridesTransitiveDependencyVersion()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
index 8af4a2f..93ccba0 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="rgoers@apache.org">Ralph Goers</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -51,7 +51,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagement()
+    void testDependencyManagement()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
index bc37066..7afb957 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="rgoers@apache.org">Ralph Goers</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagement()
+    void testDependencyManagement()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
index 87b07d3..caf29d4 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author Jason van Zyl
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagement()
+    void testDependencyManagement()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
index c4562dc..d1fbcc7 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="rgoers@apache.org">Ralph Goers</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagement()
+    void testDependencyManagement()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
index dcc4e8b..c363a19 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -63,7 +63,7 @@ public class ProjectInheritanceTest
      * a &amp; b only.
      */
     @Test
-    public void testDependencyManagementExclusionsExcludeTransitively()
+    void testDependencyManagementExclusionsExcludeTransitively()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
@@ -100,7 +100,7 @@ public class ProjectInheritanceTest
      * @throws Exception
      */
     @Test
-    public void testDependencyManagementExclusionDoesNotOverrideGloballyForTransitives()
+    void testDependencyManagementExclusionDoesNotOverrideGloballyForTransitives()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
index b1e7408..d7e44c5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -58,7 +58,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagementOverridesTransitiveDependencyVersion()
+    void testDependencyManagementOverridesTransitiveDependencyVersion()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
index 3f21d5e..8aa9e87 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  * @author <a href="mailto:pschneider@gmail.com">Patrick Schneider</a>
  * @see <a href="https://issues.apache.org/jira/browse/MNG-2919">MNG-2919</a>
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -49,7 +49,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testDependencyManagementDoesNotOverrideScopeOfCurrentArtifact()
+    void testDependencyManagementDoesNotOverrideScopeOfCurrentArtifact()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
index 50f5f08..3d18d46 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  * Verifies that plugin execution sections in the parent POM that have
  * inherit == false are not inherited to the child POM.
  */
-public class ProjectInheritanceTest extends AbstractProjectInheritanceTestCase
+class ProjectInheritanceTest extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
     //
@@ -48,7 +48,7 @@ public class ProjectInheritanceTest extends AbstractProjectInheritanceTestCase
     // ----------------------------------------------------------------------
 
     @Test
-    public void testFalsePluginExecutionInheritValue() throws Exception
+    void testFalsePluginExecutionInheritValue() throws Exception
     {
         File localRepo = getLocalRepositoryPath();
 
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
index 82aee6c..863ff64 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  * @author jdcasey
  */
-public class ProjectInheritanceTest
+class ProjectInheritanceTest
     extends AbstractProjectInheritanceTestCase
 {
     // ----------------------------------------------------------------------
@@ -47,7 +47,7 @@ public class ProjectInheritanceTest
     // ----------------------------------------------------------------------
 
     @Test
-    public void testScmInfoCalculatedCorrectlyOnParentAndChildRead()
+    void testScmInfoCalculatedCorrectlyOnParentAndChildRead()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
@@ -81,7 +81,7 @@ public class ProjectInheritanceTest
     }
 
     @Test
-    public void testScmInfoCalculatedCorrectlyOnChildOnlyRead()
+    void testScmInfoCalculatedCorrectlyOnChildOnlyRead()
         throws Exception
     {
         File localRepo = getLocalRepositoryPath();
diff --git a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
index 022ccd5..b7b78dd 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
@@ -25,11 +25,11 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 @SuppressWarnings( "deprecation" )
-public class DefaultPathTranslatorTest
+class DefaultPathTranslatorTest
 {
 
     @Test
-    public void testAlignToBasedirWhereBasedirExpressionIsTheCompleteValue()
+    void testAlignToBasedirWhereBasedirExpressionIsTheCompleteValue()
     {
         File basedir = new File( System.getProperty( "java.io.tmpdir" ), "test" ).getAbsoluteFile();
 
@@ -39,7 +39,7 @@ public class DefaultPathTranslatorTest
     }
 
     @Test
-    public void testAlignToBasedirWhereBasedirExpressionIsTheValuePrefix()
+    void testAlignToBasedirWhereBasedirExpressionIsTheValuePrefix()
     {
         File basedir = new File( System.getProperty( "java.io.tmpdir" ), "test" ).getAbsoluteFile();
 
@@ -49,7 +49,7 @@ public class DefaultPathTranslatorTest
     }
 
     @Test
-    public void testUnalignToBasedirWherePathEqualsBasedir()
+    void testUnalignToBasedirWherePathEqualsBasedir()
     {
         File basedir = new File( System.getProperty( "java.io.tmpdir" ), "test" ).getAbsoluteFile();
 
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index 97687e3..fb5318a 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -25,10 +25,10 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-public class DefaultMirrorSelectorTest
+class DefaultMirrorSelectorTest
 {
     @Test
-    public void testMirrorWithMirrorOfPatternContainingANegationIsNotSelected()
+    void testMirrorWithMirrorOfPatternContainingANegationIsNotSelected()
     {
         ArtifactRepository repository = new DefaultArtifactRepository( "snapshots.repo", "http://whatever", null );
         String pattern = "external:*, !snapshots.repo";
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index f68a996..069bc16 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -52,7 +52,7 @@ import javax.inject.Inject;
  * @author Benjamin Bentmann
  */
 @PlexusTest
-public class LegacyRepositorySystemTest
+class LegacyRepositorySystemTest
 {
     @Inject
     private RepositorySystem repositorySystem;
@@ -89,7 +89,7 @@ public class LegacyRepositorySystemTest
     }
 
     @Test
-    public void testThatASystemScopedDependencyIsNotResolvedFromRepositories()
+    void testThatASystemScopedDependencyIsNotResolvedFromRepositories()
         throws Exception
     {
         //
@@ -172,7 +172,7 @@ public class LegacyRepositorySystemTest
     }
 
     @Test
-    public void testLocalRepositoryBasedir()
+    void testLocalRepositoryBasedir()
         throws Exception
     {
         File localRepoDir = new File( "" ).getAbsoluteFile();
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
index 9e8ab4e..00a6d12 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import javax.inject.Inject;
 
 @PlexusTest
-public class MirrorProcessorTest
+class MirrorProcessorTest
 {
     @Inject
     private DefaultMirrorSelector mirrorSelector;
@@ -46,7 +46,7 @@ public class MirrorProcessorTest
     private ArtifactRepositoryFactory repositorySystem;
 
     @Test
-    public void testExternalURL()
+    void testExternalURL()
     {
         assertTrue( DefaultMirrorSelector.isExternalRepo( getRepo( "foo", "http://somehost" ) ) );
         assertTrue( DefaultMirrorSelector.isExternalRepo( getRepo( "foo", "http://somehost:9090/somepath" ) ) );
@@ -69,7 +69,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testMirrorLookup()
+    void testMirrorLookup()
     {
         Mirror mirrorA = newMirror( "a", "a", "http://a" );
         Mirror mirrorB = newMirror( "b", "b", "http://b" );
@@ -84,7 +84,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testMirrorWildcardLookup()
+    void testMirrorWildcardLookup()
     {
         Mirror mirrorA = newMirror( "a", "a", "http://a" );
         Mirror mirrorB = newMirror( "b", "b", "http://b" );
@@ -100,7 +100,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testMirrorStopOnFirstMatch()
+    void testMirrorStopOnFirstMatch()
     {
         // exact matches win first
         Mirror mirrorA2 = newMirror( "a2", "a,b", "http://a2" );
@@ -129,7 +129,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testPatterns()
+    void testPatterns()
     {
         assertTrue( DefaultMirrorSelector.matchPattern( getRepo( "a" ), "*" ) );
         assertTrue( DefaultMirrorSelector.matchPattern( getRepo( "a" ), "*," ) );
@@ -166,7 +166,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testPatternsWithExternal()
+    void testPatternsWithExternal()
     {
         assertTrue( DefaultMirrorSelector.matchPattern( getRepo( "a", "http://localhost" ), "*" ) );
         assertFalse( DefaultMirrorSelector.matchPattern( getRepo( "a", "http://localhost" ), "external:*" ) );
@@ -201,7 +201,7 @@ public class MirrorProcessorTest
     }
 
     @Test
-    public void testMirrorLayoutConsideredForMatching()
+    void testMirrorLayoutConsideredForMatching()
     {
         ArtifactRepository repo = getRepo( "a" );
 
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
index e826505..67da6fb 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class DefaultUpdateCheckManagerTest
+class DefaultUpdateCheckManagerTest
     extends AbstractArtifactComponentTestCase
 {
 
@@ -56,7 +56,6 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @BeforeEach
-    @Override
     public void setUp()
         throws Exception
     {
@@ -66,7 +65,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testArtifact() throws Exception
+    void testArtifact() throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
 
@@ -96,7 +95,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testMissingArtifact()
+    void testMissingArtifact()
         throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
@@ -124,7 +123,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testPom() throws Exception
+    void testPom() throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
 
@@ -154,7 +153,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testMissingPom()
+    void testMissingPom()
         throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
@@ -182,7 +181,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testMetadata() throws Exception
+    void testMetadata() throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
 
@@ -210,7 +209,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testMissingMetadata() throws Exception
+    void testMissingMetadata() throws Exception
     {
         ArtifactRepository remoteRepository = remoteRepository();
 
@@ -236,7 +235,7 @@ public class DefaultUpdateCheckManagerTest
     }
 
     @Test
-    public void testArtifactTouchFileName() throws Exception
+    void testArtifactTouchFileName() throws Exception
     {
         ArtifactRepository localRepository = localRepository();
 
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 14961c1..06d0c19 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -61,7 +61,7 @@ import javax.inject.Inject;
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  */
 @PlexusTest
-public class DefaultWagonManagerTest
+class DefaultWagonManagerTest
 {
     @Inject
     private WagonManager wagonManager;
@@ -75,7 +75,7 @@ public class DefaultWagonManagerTest
     private ArtifactRepositoryFactory artifactRepositoryFactory;
 
     @Test
-    public void testUnnecessaryRepositoryLookup()
+    void testUnnecessaryRepositoryLookup()
         throws Exception
     {
         Artifact artifact = createTestPomArtifact( "target/test-data/get-missing-pom" );
@@ -111,7 +111,7 @@ public class DefaultWagonManagerTest
     }
 
     @Test
-    public void testGetMissingJar() throws TransferFailedException, UnsupportedProtocolException, IOException
+    void testGetMissingJar() throws IOException
     {
         Artifact artifact = createTestArtifact( "target/test-data/get-missing-jar", "jar" );
 
@@ -124,7 +124,7 @@ public class DefaultWagonManagerTest
     }
 
     @Test
-    public void testGetMissingJarForced() throws TransferFailedException, UnsupportedProtocolException, IOException
+    void testGetMissingJarForced() throws TransferFailedException, UnsupportedProtocolException, IOException
     {
         Artifact artifact = createTestArtifact( "target/test-data/get-missing-jar", "jar" );
 
@@ -137,7 +137,7 @@ public class DefaultWagonManagerTest
     }
 
     @Test
-    public void testGetRemoteJar()
+    void testGetRemoteJar()
         throws TransferFailedException, ResourceDoesNotExistException, UnsupportedProtocolException, IOException
     {
         Artifact artifact = createTestArtifact( "target/test-data/get-remote-jar", "jar" );
@@ -215,7 +215,7 @@ public class DefaultWagonManagerTest
     }
 
     @Test
-    public void testDefaultWagonManager()
+    void testDefaultWagonManager()
         throws Exception
     {
         assertWagon( "a" );
@@ -233,7 +233,7 @@ public class DefaultWagonManagerTest
      * Check that transfer listeners are properly removed after getArtifact and putArtifact
      */
     @Test
-    public void testWagonTransferListenerRemovedAfterGetArtifactAndPutArtifact()
+    void testWagonTransferListenerRemovedAfterGetArtifactAndPutArtifact()
         throws Exception
     {
         Artifact artifact = createTestArtifact( "target/test-data/transfer-listener", "jar" );
@@ -265,7 +265,7 @@ public class DefaultWagonManagerTest
      */
     @Disabled
     @Test
-    public void testChecksumVerification()
+    void testChecksumVerification()
         throws Exception
     {
         ArtifactRepositoryPolicy policy = new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL );
@@ -317,7 +317,7 @@ public class DefaultWagonManagerTest
     }
 
     @Test
-    public void testPerLookupInstantiation()
+    void testPerLookupInstantiation()
         throws Exception
     {
         String protocol = "perlookup";
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
index ab93995..085085e 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
@@ -36,13 +36,13 @@ import javax.inject.Inject;
  * @author Benjamin Bentmann
  */
 @PlexusTest
-public class LegacyRepositorySystemTest
+class LegacyRepositorySystemTest
 {
     @Inject
     private RepositorySystem repositorySystem;
 
     @Test
-    public void testThatLocalRepositoryWithSpacesIsProperlyHandled()
+    void testThatLocalRepositoryWithSpacesIsProperlyHandled()
         throws Exception
     {
         File basedir = new File( "target/spacy path" ).getAbsoluteFile();
@@ -51,7 +51,7 @@ public class LegacyRepositorySystemTest
     }
 
     @Test
-    public void testAuthenticationHandling()
+    void testAuthenticationHandling()
     {
         Server server = new Server();
         server.setId( "repository" );
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 56018d3..c9f527f 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -65,7 +65,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
 @PlexusTest
-public class DefaultArtifactCollectorTest
+class DefaultArtifactCollectorTest
 {
     @Inject
     private LegacyArtifactCollector artifactCollector;
@@ -90,8 +90,8 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled("works, but we don't fail on cycles presently")
-    public void testCircularDependencyNotIncludingCurrentProject()
-        throws ArtifactResolutionException, InvalidVersionSpecificationException
+    void testCircularDependencyNotIncludingCurrentProject()
+        throws InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
         ArtifactSpec b = a.addDependency( "b", "1.0" );
@@ -104,8 +104,8 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled("works, but we don't fail on cycles presently")
-    public void testCircularDependencyIncludingCurrentProject()
-        throws ArtifactResolutionException, InvalidVersionSpecificationException
+    void testCircularDependencyIncludingCurrentProject()
+        throws InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
         ArtifactSpec b = a.addDependency( "b", "1.0" );
@@ -117,7 +117,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveWithFilter()
+    void testResolveWithFilter()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -137,7 +137,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNearest()
+    void testResolveCorrectDependenciesWhenDifferentDependenciesOnNearest()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -157,7 +157,7 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled
-    public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewest()
+    void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewest()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         // TODO use newest conflict resolver
@@ -177,7 +177,7 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled
-    public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced()
+    void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         // TODO use newest conflict resolver
@@ -199,7 +199,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveNearestNewestIsNearest()
+    void testResolveNearestNewestIsNearest()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -214,7 +214,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveNearestOldestIsNearest()
+    void testResolveNearestOldestIsNearest()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -229,7 +229,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveLocalNewestIsLocal()
+    void testResolveLocalNewestIsLocal()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -242,7 +242,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveLocalOldestIsLocal()
+    void testResolveLocalOldestIsLocal()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -255,7 +255,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveLocalWithNewerVersionButLesserScope()
+    void testResolveLocalWithNewerVersionButLesserScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "commons-logging", "1.0" );
@@ -269,7 +269,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveLocalWithNewerVersionButLesserScopeResolvedFirst()
+    void testResolveLocalWithNewerVersionButLesserScopeResolvedFirst()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec b = createArtifactSpec( "junit", "3.8.1", Artifact.SCOPE_TEST );
@@ -283,7 +283,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveNearestWithRanges()
+    void testResolveNearestWithRanges()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -298,7 +298,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveRangeWithManagedVersion()
+    void testResolveRangeWithManagedVersion()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -312,7 +312,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testCompatibleRanges()
+    void testCompatibleRanges()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -328,7 +328,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testIncompatibleRanges()
+    void testIncompatibleRanges()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -343,7 +343,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testUnboundedRangeWhenVersionUnavailable()
+    void testUnboundedRangeWhenVersionUnavailable()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -357,7 +357,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testUnboundedRangeBelowLastRelease()
+    void testUnboundedRangeBelowLastRelease()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -373,7 +373,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testUnboundedRangeAboveLastRelease()
+    void testUnboundedRangeAboveLastRelease()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -386,7 +386,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveManagedVersion()
+    void testResolveManagedVersion()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -400,7 +400,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testCollectChangesVersionOfOriginatingArtifactIfInDependencyManagementHasDifferentVersion()
+    void testCollectChangesVersionOfOriginatingArtifactIfInDependencyManagementHasDifferentVersion()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -418,7 +418,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveCompileScopeOverTestScope()
+    void testResolveCompileScopeOverTestScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -437,7 +437,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveRuntimeScopeOverTestScope()
+    void testResolveRuntimeScopeOverTestScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -456,7 +456,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveCompileScopeOverRuntimeScope()
+    void testResolveCompileScopeOverRuntimeScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec root = createArtifactSpec( "root", "1.0" );
@@ -474,7 +474,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveCompileScopeOverProvidedScope()
+    void testResolveCompileScopeOverProvidedScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -493,7 +493,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testResolveRuntimeScopeOverProvidedScope()
+    void testResolveRuntimeScopeOverProvidedScope()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -512,7 +512,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testProvidedScopeNotTransitive()
+    void testProvidedScopeNotTransitive()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0", Artifact.SCOPE_PROVIDED );
@@ -524,7 +524,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testOptionalNotTransitive()
+    void testOptionalNotTransitive()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -536,7 +536,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testOptionalIncludedAtRoot()
+    void testOptionalIncludedAtRoot()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -548,7 +548,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testScopeUpdate()
+    void testScopeUpdate()
         throws InvalidVersionSpecificationException, ArtifactResolutionException
     {
         /* farthest = compile */
@@ -661,7 +661,7 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled
-    public void testOptionalNotTransitiveButVersionIsInfluential()
+    void testOptionalNotTransitiveButVersionIsInfluential()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -680,7 +680,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testTestScopeNotTransitive()
+    void testTestScopeNotTransitive()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0", Artifact.SCOPE_TEST );
@@ -692,7 +692,7 @@ public class DefaultArtifactCollectorTest
     }
 
     @Test
-    public void testSnapshotNotIncluded()
+    void testSnapshotNotIncluded()
         throws ArtifactResolutionException, InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
@@ -712,8 +712,8 @@ public class DefaultArtifactCollectorTest
 
     @Test
     @Disabled("that one does not work")
-    public void testOverConstrainedVersionException()
-        throws ArtifactResolutionException, InvalidVersionSpecificationException
+    void testOverConstrainedVersionException()
+        throws InvalidVersionSpecificationException
     {
         ArtifactSpec a = createArtifactSpec( "a", "1.0" );
         a.addDependency( "b", "[1.0, 2.0)" );
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
index 7b46ee3..c99e302 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @see FarthestConflictResolver
  */
-public class FarthestConflictResolverTest
+class FarthestConflictResolverTest
     extends AbstractConflictResolverTest
 {
     // constructors -----------------------------------------------------------
@@ -49,7 +49,7 @@ public class FarthestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepth()
+    void testDepth()
     {
         ResolutionNode a1n = createResolutionNode( a1);
         ResolutionNode b1n = createResolutionNode( b1);
@@ -66,7 +66,7 @@ public class FarthestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepthReversed()
+    void testDepthReversed()
     {
         ResolutionNode b1n = createResolutionNode( b1  );
         ResolutionNode a2n = createResolutionNode( a2, b1n );
@@ -83,7 +83,7 @@ public class FarthestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqual()
+    void testEqual()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode a2n = createResolutionNode( a2 );
@@ -99,7 +99,7 @@ public class FarthestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqualReversed()
+    void testEqualReversed()
     {
         ResolutionNode a2n = createResolutionNode( a2);
         ResolutionNode a1n = createResolutionNode( a1);
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
index 34026bc..2fe3662 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @see NearestConflictResolver
  */
-public class NearestConflictResolverTest
+class NearestConflictResolverTest
     extends AbstractConflictResolverTest
 {
     // constructors -----------------------------------------------------------
@@ -49,7 +49,7 @@ public class NearestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepth()
+    void testDepth()
     {
         ResolutionNode a1n = createResolutionNode( a1);
         ResolutionNode b1n = createResolutionNode( b1);
@@ -66,7 +66,7 @@ public class NearestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepthReversed()
+    void testDepthReversed()
     {
         ResolutionNode b1n = createResolutionNode( b1 );
         ResolutionNode a2n = createResolutionNode( a2, b1n );
@@ -83,7 +83,7 @@ public class NearestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqual()
+    void testEqual()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode a2n = createResolutionNode( a2 );
@@ -99,7 +99,7 @@ public class NearestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqualReversed()
+    void testEqualReversed()
     {
         ResolutionNode a2n = createResolutionNode( a2);
         ResolutionNode a1n = createResolutionNode( a1 );
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
index 874644a..bdbba60 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @see NewestConflictResolver
  */
-public class NewestConflictResolverTest
+class NewestConflictResolverTest
     extends AbstractConflictResolverTest
 {
     // constructors -----------------------------------------------------------
@@ -49,7 +49,7 @@ public class NewestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepth()
+    void testDepth()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode b1n = createResolutionNode( b1 );
@@ -66,7 +66,7 @@ public class NewestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepthReversed()
+    void testDepthReversed()
     {
         ResolutionNode b1n = createResolutionNode( b1 );
         ResolutionNode a2n = createResolutionNode( a2, b1n );
@@ -83,7 +83,7 @@ public class NewestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqual()
+    void testEqual()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode a2n = createResolutionNode( a2 );
@@ -99,7 +99,7 @@ public class NewestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqualReversed()
+    void testEqualReversed()
     {
         ResolutionNode a2n = createResolutionNode( a2 );
         ResolutionNode a1n = createResolutionNode( a1 );
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
index 76335f2..809d147 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @see OldestConflictResolver
  */
-public class OldestConflictResolverTest
+class OldestConflictResolverTest
     extends AbstractConflictResolverTest
 {
     // constructors -----------------------------------------------------------
@@ -49,7 +49,7 @@ public class OldestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepth()
+    void testDepth()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode b1n = createResolutionNode( b1);
@@ -67,7 +67,7 @@ public class OldestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testDepthReversed()
+    void testDepthReversed()
     {
         ResolutionNode b1n = createResolutionNode( b1 );
         ResolutionNode a2n = createResolutionNode( a2, b1n );
@@ -84,7 +84,7 @@ public class OldestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqual()
+    void testEqual()
     {
         ResolutionNode a1n = createResolutionNode( a1 );
         ResolutionNode a2n = createResolutionNode( a2 );
@@ -100,7 +100,7 @@ public class OldestConflictResolverTest
      * </pre>
      */
     @Test
-    public void testEqualReversed()
+    void testEqualReversed()
     {
         ResolutionNode a2n = createResolutionNode( a2);
         ResolutionNode a1n = createResolutionNode( a1 );
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
index 348dd97..9462fd9 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  *
  */
 @PlexusTest
-public class DefaultClasspathTransformationTest
+class DefaultClasspathTransformationTest
 {
     @Inject
     ClasspathTransformation transform;
@@ -43,8 +43,8 @@ public class DefaultClasspathTransformationTest
     MetadataGraphVertex v3;
     MetadataGraphVertex v4;
     //------------------------------------------------------------------------------------------
-	@BeforeEach
-    public void setUp() throws Exception
+	  @BeforeEach
+    void setUp() throws Exception
     {
         graph = new MetadataGraph( 4, 3 );
         /*
@@ -73,7 +73,7 @@ public class DefaultClasspathTransformationTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testCompileClasspathTransform()
+  void testCompileClasspathTransform()
     throws Exception
     {
         ClasspathContainer res;
@@ -86,7 +86,7 @@ public class DefaultClasspathTransformationTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testRuntimeClasspathTransform()
+  void testRuntimeClasspathTransform()
     throws Exception
     {
         ClasspathContainer res;
@@ -102,7 +102,7 @@ public class DefaultClasspathTransformationTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testTestClasspathTransform()
+  void testTestClasspathTransform()
     throws Exception
     {
         ClasspathContainer res;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
index ea4352e..5140391 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  *
  */
 
-public class DefaultGraphConflictResolutionPolicyTest
+class DefaultGraphConflictResolutionPolicyTest
 {
     GraphConflictResolutionPolicy policy;
     MetadataGraphEdge e1;
@@ -34,7 +34,7 @@ public class DefaultGraphConflictResolutionPolicyTest
     MetadataGraphEdge e3;
     //------------------------------------------------------------------------------------------
 	@BeforeEach
-    public void setUp() throws Exception
+  void setUp() throws Exception
 	{
 		policy = new DefaultGraphConflictResolutionPolicy();
     	e1 = new MetadataGraphEdge( "1.1", true, null, null, 2, 1 );
@@ -43,7 +43,7 @@ public class DefaultGraphConflictResolutionPolicyTest
 	}
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testDefaultPolicy()
+  void testDefaultPolicy()
         throws Exception
     {
         MetadataGraphEdge res;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
index 67a003a..21d8638 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  *
  */
 @PlexusTest
-public class DefaultGraphConflictResolverTest
+class DefaultGraphConflictResolverTest
 {
     @Inject
     GraphConflictResolver resolver;
@@ -44,7 +44,7 @@ public class DefaultGraphConflictResolverTest
     MetadataGraphVertex v4;
     //------------------------------------------------------------------------------------------
 	@BeforeEach
-    public void setUp() throws Exception
+    void setUp() throws Exception
     {
         /*
          *       v2
@@ -73,7 +73,7 @@ public class DefaultGraphConflictResolverTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testCompileResolution()
+  void testCompileResolution()
     throws Exception
     {
         MetadataGraph res;
@@ -99,7 +99,7 @@ public class DefaultGraphConflictResolverTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testRuntimeResolution()
+  void testRuntimeResolution()
     throws Exception
     {
         MetadataGraph res;
@@ -124,7 +124,7 @@ public class DefaultGraphConflictResolverTest
     }
     //------------------------------------------------------------------------------------------
 	@Test
-    public void testTestResolution()
+  void testTestResolution()
     throws Exception
     {
         MetadataGraph res;
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 9dd5cf1..b3178d4 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -33,13 +33,13 @@ import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @PlexusTest
-public class ArtifactHandlerTest
+class ArtifactHandlerTest
 {
     @Inject
     PlexusContainer container;
 
     @Test
-    public void testAptConsistency()
+    void testAptConsistency()
         throws Exception
     {
         File apt = getTestFile( "src/site/apt/artifact-handlers.apt" );
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
index 76b1654..9dc93e2 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
@@ -32,12 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ExclusionArtifactFilterTest
+class ExclusionArtifactFilterTest
 {
     private Artifact artifact;
 
     @BeforeEach
-    public void setup()
+    void setup()
     {
         artifact = mock( Artifact.class );
         when( artifact.getGroupId() ).thenReturn( "org.apache.maven" );
@@ -45,7 +45,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeExact()
+    void testExcludeExact()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "org.apache.maven" );
@@ -56,7 +56,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeNoMatch()
+    void testExcludeNoMatch()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "org.apache.maven" );
@@ -67,7 +67,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeGroupIdWildcard()
+    void testExcludeGroupIdWildcard()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "*" );
@@ -79,7 +79,7 @@ public class ExclusionArtifactFilterTest
 
 
     @Test
-    public void testExcludeGroupIdWildcardNoMatch()
+    void testExcludeGroupIdWildcardNoMatch()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "*" );
@@ -90,7 +90,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeArtifactIdWildcard()
+    void testExcludeArtifactIdWildcard()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "org.apache.maven" );
@@ -101,7 +101,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeArtifactIdWildcardNoMatch()
+    void testExcludeArtifactIdWildcardNoMatch()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "org.apache.groovy" );
@@ -112,7 +112,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testExcludeAllWildcard()
+    void testExcludeAllWildcard()
     {
         Exclusion exclusion = new Exclusion();
         exclusion.setGroupId( "*" );
@@ -123,7 +123,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testMultipleExclusionsExcludeArtifactIdWildcard()
+    void testMultipleExclusionsExcludeArtifactIdWildcard()
     {
         Exclusion exclusion1 = new Exclusion();
         exclusion1.setGroupId( "org.apache.groovy" );
@@ -139,7 +139,7 @@ public class ExclusionArtifactFilterTest
     }
 
     @Test
-    public void testMultipleExclusionsExcludeGroupIdWildcard()
+    void testMultipleExclusionsExcludeGroupIdWildcard()
     {
         Exclusion exclusion1 = new Exclusion();
         exclusion1.setGroupId( "*" );
diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
index 3dd3eff..3cd6ddf 100644
--- a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
@@ -36,21 +36,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 /**
  * @author Benjamin Bentmann
  */
-public class DefaultBeanConfiguratorTest
+class DefaultBeanConfiguratorTest
 {
 
     private BeanConfigurator configurator;
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         configurator = new DefaultBeanConfigurator();
     }
 
     @AfterEach
-    public void tearDown()
-        throws Exception
+    void tearDown()
     {
         configurator = null;
     }
@@ -68,7 +67,7 @@ public class DefaultBeanConfiguratorTest
     }
 
     @Test
-    public void testMinimal()
+    void testMinimal()
         throws BeanConfigurationException
     {
         SomeBean bean = new SomeBean();
@@ -84,7 +83,7 @@ public class DefaultBeanConfiguratorTest
     }
 
     @Test
-    public void testPreAndPostProcessing()
+    void testPreAndPostProcessing()
         throws BeanConfigurationException
     {
         SomeBean bean = new SomeBean();
@@ -112,7 +111,7 @@ public class DefaultBeanConfiguratorTest
     }
 
     @Test
-    public void testChildConfigurationElement()
+    void testChildConfigurationElement()
         throws BeanConfigurationException
     {
         SomeBean bean = new SomeBean();
diff --git a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index 48cdb2f..b4834e7 100644
--- a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 /**
  * @author <a href="mailto:baerrach@apache.org">Barrie Treloar</a>
  */
-public class DefaultExceptionHandlerTest
+class DefaultExceptionHandlerTest
 {
     /**
      * Running Maven under JDK7 may cause connection issues because IPv6 is used by default.
@@ -50,7 +50,7 @@ public class DefaultExceptionHandlerTest
      * </p>
      */
     @Test
-    public void testJdk7ipv6()
+    void testJdk7ipv6()
     {
         ConnectException connEx = new ConnectException( "Connection refused: connect" );
         IOException ioEx = new IOException( "Unable to establish loopback connection", connEx );
@@ -66,7 +66,7 @@ public class DefaultExceptionHandlerTest
     }
 
     @Test
-    public void testHandleExceptionAetherClassNotFound()
+    void testHandleExceptionAetherClassNotFound()
     {
         Throwable cause2 = new NoClassDefFoundError( "org/sonatype/aether/RepositorySystem" );
         Plugin plugin = new Plugin();
@@ -85,7 +85,7 @@ public class DefaultExceptionHandlerTest
     }
 
     @Test
-    public void testHandleExceptionNoClassDefFoundErrorNull()
+    void testHandleExceptionNoClassDefFoundErrorNull()
     {
         Throwable cause2 = new NoClassDefFoundError();
         Plugin plugin = new Plugin();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
index eba0e4d..dbd9593 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
@@ -32,19 +32,19 @@ import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-public class DefaultBuildResumptionAnalyzerTest
+class DefaultBuildResumptionAnalyzerTest
 {
     private final DefaultBuildResumptionAnalyzer analyzer = new DefaultBuildResumptionAnalyzer();
 
     private MavenExecutionResult executionResult;
 
     @BeforeEach
-    public void before() {
+    void before() {
         executionResult = new DefaultMavenExecutionResult();
     }
 
     @Test
-    public void resumeFromGetsDetermined()
+    void resumeFromGetsDetermined()
     {
         MavenProject projectA = createSucceededMavenProject( "A" );
         MavenProject projectB = createFailedMavenProject( "B" );
@@ -57,7 +57,7 @@ public class DefaultBuildResumptionAnalyzerTest
     }
 
     @Test
-    public void resumeFromIsIgnoredWhenFirstProjectFails()
+    void resumeFromIsIgnoredWhenFirstProjectFails()
     {
         MavenProject projectA = createFailedMavenProject( "A" );
         MavenProject projectB = createMavenProject( "B" );
@@ -69,7 +69,7 @@ public class DefaultBuildResumptionAnalyzerTest
     }
 
     @Test
-    public void projectsSucceedingAfterFailedProjectsAreExcluded()
+    void projectsSucceedingAfterFailedProjectsAreExcluded()
     {
         MavenProject projectA = createSucceededMavenProject( "A" );
         MavenProject projectB = createFailedMavenProject( "B" );
@@ -83,7 +83,7 @@ public class DefaultBuildResumptionAnalyzerTest
     }
 
     @Test
-    public void projectsDependingOnFailedProjectsAreNotExcluded()
+    void projectsDependingOnFailedProjectsAreNotExcluded()
     {
         MavenProject projectA = createSucceededMavenProject( "A" );
         MavenProject projectB = createFailedMavenProject( "B" );
@@ -98,7 +98,7 @@ public class DefaultBuildResumptionAnalyzerTest
     }
 
     @Test
-    public void projectsFailingAfterAnotherFailedProjectAreNotExcluded()
+    void projectsFailingAfterAnotherFailedProjectAreNotExcluded()
     {
         MavenProject projectA = createSucceededMavenProject( "A" );
         MavenProject projectB = createFailedMavenProject( "B" );
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
index ce7ab6a..c87cc3d 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
@@ -33,12 +33,12 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
 
-public class DefaultBuildResumptionDataRepositoryTest
+class DefaultBuildResumptionDataRepositoryTest
 {
     private final DefaultBuildResumptionDataRepository repository = new DefaultBuildResumptionDataRepository();
 
     @Test
-    public void resumeFromPropertyGetsApplied()
+    void resumeFromPropertyGetsApplied()
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         Properties properties = new Properties();
@@ -50,7 +50,7 @@ public class DefaultBuildResumptionDataRepositoryTest
     }
 
     @Test
-    public void resumeFromPropertyDoesNotOverrideExistingRequestParameters()
+    void resumeFromPropertyDoesNotOverrideExistingRequestParameters()
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         request.setResumeFrom( ":module-b" );
@@ -63,7 +63,7 @@ public class DefaultBuildResumptionDataRepositoryTest
     }
 
     @Test
-    public void projectsFromPropertyGetsAddedToExistingRequestParameters()
+    void projectsFromPropertyGetsAddedToExistingRequestParameters()
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         List<String> selectedProjects = new ArrayList<>();
@@ -78,7 +78,7 @@ public class DefaultBuildResumptionDataRepositoryTest
     }
 
     @Test
-    public void selectedProjectsAreNotAddedWhenPropertyValueIsEmpty()
+    void selectedProjectsAreNotAddedWhenPropertyValueIsEmpty()
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         Properties properties = new Properties();
@@ -90,7 +90,7 @@ public class DefaultBuildResumptionDataRepositoryTest
     }
 
     @Test
-    public void applyResumptionData_shouldLoadData()
+    void applyResumptionData_shouldLoadData()
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         Build build = new Build();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
index 02be60e..1b138ea 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
@@ -33,13 +33,13 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @PlexusTest
-public class DefaultMavenExecutionRequestPopulatorTest
+class DefaultMavenExecutionRequestPopulatorTest
 {
     @Inject
     MavenExecutionRequestPopulator testee;
 
     @Test
-    public void testPluginRepositoryInjection()
+    void testPluginRepositoryInjection()
         throws Exception
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
index 9a363ee..a2c39e6 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
@@ -32,10 +32,10 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Benjamin Bentmann
  */
-public class DefaultMavenExecutionTest
+class DefaultMavenExecutionTest
 {
     @Test
-    public void testCopyDefault()
+    void testCopyDefault()
     {
         MavenExecutionRequest original = new DefaultMavenExecutionRequest();
         MavenExecutionRequest copy = DefaultMavenExecutionRequest.copy( original );
@@ -44,7 +44,7 @@ public class DefaultMavenExecutionTest
     }
 
     @Test
-    public void testResultWithNullTopologicallySortedProjectsIsEmptyList()
+    void testResultWithNullTopologicallySortedProjectsIsEmptyList()
     {
         MavenExecutionResult result = new DefaultMavenExecutionResult();
         result.setTopologicallySortedProjects( null );
diff --git a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
index 0dda050..06502f2 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
@@ -26,10 +26,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class MojoExecutionScopeTest
+class MojoExecutionScopeTest
 {
     @Test
-    public void testNestedEnter()
+    void testNestedEnter()
         throws Exception
     {
         MojoExecutionScope scope = new MojoExecutionScope();
@@ -54,7 +54,7 @@ public class MojoExecutionScopeTest
     }
 
     @Test
-    public void testMultiKeyInstance()
+    void testMultiKeyInstance()
         throws Exception
     {
         MojoExecutionScope scope = new MojoExecutionScope();
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 8ff4711..d4d3b00 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -318,7 +318,7 @@ class DefaultGraphBuilderTest
     }
 
     @BeforeEach
-    public void before() throws Exception
+    void before() throws Exception
     {
         graphBuilder = new DefaultGraphBuilder(
                 mock( BuildResumptionDataRepository.class ),
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
index 94737fb..f0d4add 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 /**
  * @author Kristian Rosenvold
  */
-public class DefaultProjectDependencyGraphTest
+class DefaultProjectDependencyGraphTest
 {
 
     private final MavenProject aProject = createA();
@@ -47,7 +47,7 @@ public class DefaultProjectDependencyGraphTest
         createProject( Arrays.asList( toDependency( depender3 ) ), "depender5" );
 
     @Test
-    public void testGetSortedProjects()
+    void testGetSortedProjects()
         throws DuplicateProjectException, CycleDetectedException
     {
         ProjectDependencyGraph graph = new DefaultProjectDependencyGraph( Arrays.asList( depender1, aProject ) );
@@ -57,7 +57,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testVerifyExpectedParentStructure()
+    void testVerifyExpectedParentStructure()
         throws CycleDetectedException, DuplicateProjectException
     {
         // This test verifies the baseline structure used in subsequent tests. If this fails, the rest will fail.
@@ -70,7 +70,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testVerifyThatDownstreamProjectsComeInSortedOrder()
+    void testVerifyThatDownstreamProjectsComeInSortedOrder()
         throws CycleDetectedException, DuplicateProjectException
     {
         final List<MavenProject> downstreamProjects =
@@ -81,7 +81,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testTransitivesInOrder()
+    void testTransitivesInOrder()
         throws CycleDetectedException, DuplicateProjectException
     {
         final ProjectDependencyGraph graph =
@@ -95,7 +95,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testNonTransitivesInOrder()
+    void testNonTransitivesInOrder()
         throws CycleDetectedException, DuplicateProjectException
     {
         final ProjectDependencyGraph graph =
@@ -109,7 +109,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testWithTransitiveOnly()
+    void testWithTransitiveOnly()
         throws CycleDetectedException, DuplicateProjectException
     {
         final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph(
@@ -123,7 +123,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testWithMissingTransitiveOnly()
+    void testWithMissingTransitiveOnly()
         throws CycleDetectedException, DuplicateProjectException
     {
         final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph(
@@ -136,7 +136,7 @@ public class DefaultProjectDependencyGraphTest
     }
 
     @Test
-    public void testGetUpstreamProjects()
+    void testGetUpstreamProjects()
         throws CycleDetectedException, DuplicateProjectException
     {
         ProjectDependencyGraph graph = threeProjectsDependingOnASingle();
diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
index 5050623..e50f8ad 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
@@ -29,12 +29,12 @@ import org.apache.maven.model.building.TransformerContext;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-public class ConsumerModelSourceTransformerTest
+class ConsumerModelSourceTransformerTest
 {
     private ConsumerModelSourceTransformer transformer = new ConsumerModelSourceTransformer();
 
     @Test
-    public void transform() throws Exception
+    void transform() throws Exception
     {
         Path beforePomFile = Paths.get( "src/test/resources/projects/transform/before.pom").toAbsolutePath();
         Path afterPomFile = Paths.get( "src/test/resources/projects/transform/after.pom").toAbsolutePath();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
index 046227a..818faf9 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
@@ -35,13 +35,13 @@ import static org.hamcrest.Matchers.is;
  * @author Kristian Rosenvold
  */
 @PlexusTest
-public class DefaultLifecyclesTest
+class DefaultLifecyclesTest
 {
     @Inject
     private DefaultLifecycles defaultLifeCycles;
 
     @Test
-    public void testDefaultLifecycles()
+    void testDefaultLifecycles()
     {
         final List<Lifecycle> lifecycles = defaultLifeCycles.getLifeCycles();
         assertThat( lifecycles, hasSize( 4 ) );
@@ -49,7 +49,7 @@ public class DefaultLifecyclesTest
     }
 
     @Test
-    public void testDefaultLifecycle()
+    void testDefaultLifecycle()
     {
         final Lifecycle lifecycle = getLifeCycleById( "default" );
         assertThat( lifecycle.getId(), is( "default" )  );
@@ -57,7 +57,7 @@ public class DefaultLifecyclesTest
     }
 
     @Test
-    public void testCleanLifecycle()
+    void testCleanLifecycle()
     {
         final Lifecycle lifecycle = getLifeCycleById( "clean" );
         assertThat( lifecycle.getId(), is( "clean" )  );
@@ -65,7 +65,7 @@ public class DefaultLifecyclesTest
     }
 
     @Test
-    public void testSiteLifecycle()
+    void testSiteLifecycle()
     {
         final Lifecycle lifecycle = getLifeCycleById( "site" );
         assertThat( lifecycle.getId(), is( "site" )  );
@@ -73,7 +73,7 @@ public class DefaultLifecyclesTest
     }
 
     @Test
-    public void testWrapperLifecycle()
+    void testWrapperLifecycle()
     {
         final Lifecycle lifecycle = getLifeCycleById( "wrapper" );
         assertThat( lifecycle.getId(), is( "wrapper" )  );
@@ -81,7 +81,7 @@ public class DefaultLifecyclesTest
     }
 
     @Test
-    public void testCustomLifecycle()
+    void testCustomLifecycle()
     {
         List<Lifecycle> myLifecycles = new ArrayList<>();
         Lifecycle myLifecycle = new Lifecycle( "etl",
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
index cc2961f..0a935d7 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  * @author Kristian Rosenvold
  */
 
-public class LifecycleExecutorSubModulesTest
+class LifecycleExecutorSubModulesTest
     extends AbstractCoreMavenComponentTestCase
 {
     @Inject
@@ -69,7 +69,7 @@ public class LifecycleExecutorSubModulesTest
     }
 
     @Test
-    public void testCreation()
+    void testCreation()
         throws Exception
     {
         assertNotNull( defaultLifeCycles );
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index 6a112e8..b377396 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javax.inject.Inject;
 
-public class LifecycleExecutorTest
+class LifecycleExecutorTest
     extends AbstractCoreMavenComponentTestCase
 {
     @Inject
@@ -78,7 +78,7 @@ public class LifecycleExecutorTest
     // -----------------------------------------------------------------------------------------------
 
     @Test
-    public void testCalculationOfBuildPlanWithIndividualTaskWherePluginIsSpecifiedInThePom()
+    void testCalculationOfBuildPlanWithIndividualTaskWherePluginIsSpecifiedInThePom()
         throws Exception
     {
         // We are doing something like "mvn resources:resources" where no version is specified but this
@@ -99,7 +99,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanLifecycle()
+    void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanLifecycle()
         throws Exception
     {
         // We are doing something like "mvn clean:clean" where no version is specified but this
@@ -119,7 +119,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanCleanGoal()
+    void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanCleanGoal()
         throws Exception
     {
         // We are doing something like "mvn clean:clean" where no version is specified but this
@@ -242,7 +242,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testLifecycleQueryingUsingADefaultLifecyclePhase()
+    void testLifecycleQueryingUsingADefaultLifecyclePhase()
         throws Exception
     {
         File pom = getProject( "project-with-additional-lifecycle-elements" );
@@ -273,7 +273,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testLifecyclePluginsRetrievalForDefaultLifecycle()
+    void testLifecyclePluginsRetrievalForDefaultLifecycle()
         throws Exception
     {
         List<Plugin> plugins =
@@ -283,7 +283,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testPluginConfigurationCreation()
+    void testPluginConfigurationCreation()
         throws Exception
     {
         File pom = getProject( "project-with-additional-lifecycle-elements" );
@@ -313,7 +313,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testInvalidGoalName()
+    void testInvalidGoalName()
         throws Exception
     {
         File pom = getProject( "project-basic" );
@@ -333,7 +333,7 @@ public class LifecycleExecutorTest
 
 
     @Test
-    public void testPluginPrefixRetrieval()
+    void testPluginPrefixRetrieval()
         throws Exception
     {
         File pom = getProject( "project-basic" );
@@ -346,7 +346,7 @@ public class LifecycleExecutorTest
     // Prefixes
 
     @Test
-    public void testFindingPluginPrefixforCleanClean()
+    void testFindingPluginPrefixforCleanClean()
         throws Exception
     {
         File pom = getProject( "project-basic" );
@@ -356,7 +356,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testSetupMojoExecution()
+    void testSetupMojoExecution()
         throws Exception
     {
         File pom = getProject( "mojo-configuration" );
@@ -379,7 +379,7 @@ public class LifecycleExecutorTest
     }
 
     @Test
-    public void testExecutionListeners()
+    void testExecutionListeners()
         throws Exception
     {
         final File pom = getProject( "project-basic" );
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
index e077dc9..5d7ad1b 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
@@ -29,11 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 /**
  * @author Kristian Rosenvold
  */
-public class MavenExecutionPlanTest
+class MavenExecutionPlanTest
 {
 
     @Test
-    public void testFindLastInPhase()
+    void testFindLastInPhase()
         throws Exception
     {
         MavenExecutionPlan plan = LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan();
@@ -45,7 +45,7 @@ public class MavenExecutionPlanTest
     }
 
     @Test
-    public void testThreadSafeMojos()
+    void testThreadSafeMojos()
         throws Exception
     {
         MavenExecutionPlan plan = LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan();
@@ -57,7 +57,7 @@ public class MavenExecutionPlanTest
 
 
     @Test
-    public void testFindLastWhenFirst()
+    void testFindLastWhenFirst()
         throws Exception
     {
         MavenExecutionPlan plan = LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan();
@@ -68,7 +68,7 @@ public class MavenExecutionPlanTest
     }
 
     @Test
-    public void testFindLastInPhaseMisc()
+    void testFindLastInPhaseMisc()
         throws Exception
     {
         MavenExecutionPlan plan = LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
index 6a73160..d9effce 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
@@ -25,11 +25,11 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class BuildListCalculatorTest
+class BuildListCalculatorTest
 {
 
     @Test
-    public void testCalculateProjectBuilds()
+    void testCalculateProjectBuilds()
         throws Exception
     {
         LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator = getTaskSegmentCalculator();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
index c2971f1..b6dd31f 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
@@ -45,10 +45,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 /**
  * @author Kristian Rosenvold
  */
-public class ConcurrencyDependencyGraphTest
+class ConcurrencyDependencyGraphTest
 {
     @Test
-    public void testConcurrencyGraphPrimaryVersion()
+    void testConcurrencyGraphPrimaryVersion()
         throws InvalidPluginDescriptorException, PluginVersionResolutionException, PluginDescriptorParsingException,
         NoPluginFoundForPrefixException, MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
         LifecyclePhaseNotFoundException, LifecycleNotFoundException
@@ -79,7 +79,7 @@ public class ConcurrencyDependencyGraphTest
     }
 
     @Test
-    public void testConcurrencyGraphDifferentCompletionOrder()
+    void testConcurrencyGraphDifferentCompletionOrder()
         throws InvalidPluginDescriptorException, PluginVersionResolutionException, PluginDescriptorParsingException,
         NoPluginFoundForPrefixException, MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
         LifecyclePhaseNotFoundException, LifecycleNotFoundException
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
index 9413111..c1ebc2e 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentTestCase
+class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentTestCase
 {
     @Inject
     private LifecycleDependencyResolver resolver;
@@ -50,7 +50,7 @@ public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentT
     }
 
     @Test
-    public void testCachedReactorProjectDependencies() throws Exception
+    void testCachedReactorProjectDependencies() throws Exception
     {
         MavenSession session = createMavenSession( new File( "src/test/projects/lifecycle-dependency-resolver/pom.xml" ), new Properties(), true );
         Collection<String> scopesToCollect = null;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
index 28d552a..03a7c7c 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
@@ -35,7 +35,7 @@ public class LifecycleExecutionPlanCalculatorTest
 {
 
     @Test
-    public void testCalculateExecutionPlanWithGoalTasks()
+    void testCalculateExecutionPlanWithGoalTasks()
         throws Exception
     {
         MojoDescriptorCreator mojoDescriptorCreator = createMojoDescriptorCreator();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
index e5a44d6..543fdc1 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
@@ -32,10 +32,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 /**
  * @author Kristian Rosenvold
  */
-public class LifecycleTaskSegmentCalculatorImplTest
+class LifecycleTaskSegmentCalculatorImplTest
 {
     @Test
-    public void testCalculateProjectBuilds()
+    void testCalculateProjectBuilds()
         throws Exception
     {
         LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator = getTaskSegmentCalculator();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
index 1d0211f..6b23627 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
@@ -29,10 +29,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * @author Kristian Rosenvold
  */
-public class PhaseRecorderTest
+class PhaseRecorderTest
 {
     @Test
-    public void testObserveExecution() throws Exception {
+    void testObserveExecution() throws Exception {
         PhaseRecorder phaseRecorder = new PhaseRecorder( ProjectDependencyGraphStub.A);
         MavenExecutionPlan plan = LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan();
         final List<MojoExecution> executions = plan.getMojoExecutions();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
index 106c311..04960a1 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
@@ -27,10 +27,10 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Kristian Rosenvold
  */
-public class ProjectBuildListTest
+class ProjectBuildListTest
 {
     @Test
-    public void testGetByTaskSegment()
+    void testGetByTaskSegment()
         throws Exception
     {
         final MavenSession session = ProjectDependencyGraphStub.getMavenSession();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java
index e64d2f0..f2eea27 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java
@@ -34,12 +34,12 @@ import static org.mockito.Mockito.verify;
 /**
  * @author Kristian Rosenvold
  */
-public class BuilderCommonTest
+class BuilderCommonTest
 {
     private Logger logger = mock( Logger.class );
 
     @Test
-    public void testResolveBuildPlan()
+    void testResolveBuildPlan()
         throws Exception
     {
         MavenSession original = ProjectDependencyGraphStub.getMavenSession();
@@ -56,7 +56,7 @@ public class BuilderCommonTest
     }
 
     @Test
-    public void testDefaultBindingPluginsWarning()
+    void testDefaultBindingPluginsWarning()
         throws Exception
     {
         MavenSession original = ProjectDependencyGraphStub.getMavenSession();
@@ -80,19 +80,19 @@ public class BuilderCommonTest
     }
 
     @Test
-    public void testHandleBuildError()
+    void testHandleBuildError()
         throws Exception
     {
     }
 
     @Test
-    public void testAttachToThread()
+    void testAttachToThread()
         throws Exception
     {
     }
 
     @Test
-    public void testGetKey()
+    void testGetKey()
         throws Exception
     {
     }
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
index acad888..a87e5a7 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
@@ -25,10 +25,10 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ConcurrencyDependencyGraphTest {
+class ConcurrencyDependencyGraphTest {
 
     @Test
-    public void testGraph() throws Exception {
+    void testGraph() throws Exception {
 
         ProjectBuildList projectBuildList = ProjectDependencyGraphStub.getProjectBuildList(
                 ProjectDependencyGraphStub.getMavenSession() );
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
index 549e90b..3f54708 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java
@@ -58,7 +58,7 @@ public class ThreadOutputMuxerTest
     final String full = "Full";
 
     @Test
-    public void testSingleThreaded()
+    void testSingleThreaded()
         throws Exception
     {
         ProjectBuildList src = getProjectBuildList();
@@ -87,7 +87,7 @@ public class ThreadOutputMuxerTest
     }
 
     @Test
-    public void testMultiThreaded()
+    void testMultiThreaded()
         throws Exception
     {
         ProjectBuildList projectBuildList = getProjectBuildList();
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
index cd2d327..8215682 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java
@@ -29,19 +29,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @author Kristian Rosenvold
  */
 
-public class ProjectDependencyGraphStubTest
+class ProjectDependencyGraphStubTest
 {
     ProjectDependencyGraphStub stub = new ProjectDependencyGraphStub();
 
     @Test
-    public void testADependencies()
+    void testADependencies()
     {
         final List<MavenProject> mavenProjects = stub.getUpstreamProjects( ProjectDependencyGraphStub.A, false );
         assertEquals( 0, mavenProjects.size() );
     }
 
     @Test
-    public void testBDepenencies()
+    void testBDepenencies()
     {
         final List<MavenProject> bProjects = stub.getUpstreamProjects( ProjectDependencyGraphStub.B, false );
         assertEquals( 1, bProjects.size() );
@@ -49,7 +49,7 @@ public class ProjectDependencyGraphStubTest
     }
 
     @Test
-    public void testCDepenencies()
+    void testCDepenencies()
     {
         final List<MavenProject> cProjects = stub.getUpstreamProjects( ProjectDependencyGraphStub.C, false );
         assertEquals( 1, cProjects.size() );
@@ -57,7 +57,7 @@ public class ProjectDependencyGraphStubTest
     }
 
     @Test
-    public void testXDepenencies()
+    void testXDepenencies()
     {
         final List<MavenProject> cProjects = stub.getUpstreamProjects( ProjectDependencyGraphStub.X, false );
         assertEquals( 2, cProjects.size() );
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
index 677915f..37e2c80 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class LifecyclePhaseTest
 {
     @Test
-    public void testToString()
+    void testToString()
     {
         LifecyclePhase phase = new LifecyclePhase();
         assertEquals( "", phase.toString() );
@@ -46,7 +46,7 @@ public class LifecyclePhaseTest
     }
 
     @Test
-    public void testSet()
+    void testSet()
     {
         LifecyclePhase phase = new LifecyclePhase();
         assertNull( phase.getMojos() );
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
index a688c76..5cc3f92 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
@@ -52,7 +52,7 @@ public class PluginManagerTest
     }
 
     @Test
-    public void testPluginLoading()
+    void testPluginLoading()
         throws Exception
     {
         MavenSession session = createMavenSession( null );
@@ -67,7 +67,7 @@ public class PluginManagerTest
     }
 
     @Test
-    public void testMojoDescriptorRetrieval()
+    void testMojoDescriptorRetrieval()
         throws Exception
     {
         MavenSession session = createMavenSession( null );
@@ -104,7 +104,7 @@ public class PluginManagerTest
     //      the plugin manager provides.
 
     @Test
-    public void testRemoteResourcesPlugin()
+    void testRemoteResourcesPlugin()
         throws Exception
     {
         //TODO turn an equivalent back on when the RR plugin is released.
@@ -158,7 +158,7 @@ public class PluginManagerTest
     }
 
     @Test
-    public void testMojoConfigurationIsMergedCorrectly()
+    void testMojoConfigurationIsMergedCorrectly()
         throws Exception
     {
     }
@@ -169,7 +169,7 @@ public class PluginManagerTest
      * to use a specific version. We need to make sure the version that they specify takes precedence.
      */
     @Test
-    public void testMojoWhereInternallyStatedDependencyIsOverriddenByProject()
+    void testMojoWhereInternallyStatedDependencyIsOverriddenByProject()
         throws Exception
     {
     }
@@ -179,7 +179,7 @@ public class PluginManagerTest
      * the current build.
      */
     @Test
-    public void testMojoThatIsPresentInTheCurrentBuild()
+    void testMojoThatIsPresentInTheCurrentBuild()
         throws Exception
     {
     }
@@ -189,7 +189,7 @@ public class PluginManagerTest
      * with the results of each project.
      */
     @Test
-    public void testAggregatorMojo()
+    void testAggregatorMojo()
         throws Exception
     {
     }
@@ -199,7 +199,7 @@ public class PluginManagerTest
      * anything useful.
      */
     @Test
-    public void testMojoThatRequiresExecutionToAGivenPhaseBeforeExecutingItself()
+    void testMojoThatRequiresExecutionToAGivenPhaseBeforeExecutingItself()
         throws Exception
     {
     }
@@ -211,7 +211,7 @@ public class PluginManagerTest
     // test a build where projects use different versions of the same plugin
 
     @Test
-    public void testThatPluginDependencyThatHasSystemScopeIsResolved()
+    void testThatPluginDependencyThatHasSystemScopeIsResolved()
         throws Exception
     {
         MavenSession session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) );
@@ -255,7 +255,7 @@ public class PluginManagerTest
     }
 
     @Test
-    public void testPluginRealmCache()
+    void testPluginRealmCache()
         throws Exception
     {
         RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
@@ -300,7 +300,7 @@ public class PluginManagerTest
     }
 
     @Test
-    public void testBuildExtensionsPluginLoading()
+    void testBuildExtensionsPluginLoading()
         throws Exception
     {
         RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
index d270293..562d78c 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
@@ -34,13 +34,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  * @author Robert Scholte
  *
  */
-public class PluginParameterExceptionTest
+class PluginParameterExceptionTest
 {
 
     private final String LS = System.lineSeparator();
 
     @Test
-    public void testMissingRequiredStringArrayTypeParameter()
+    void testMissingRequiredStringArrayTypeParameter()
     {
         MojoDescriptor mojoDescriptor = new MojoDescriptor();
         mojoDescriptor.setGoal( "goal" );
@@ -71,7 +71,7 @@ public class PluginParameterExceptionTest
     }
 
     @Test
-    public void testMissingRequiredCollectionTypeParameter()
+    void testMissingRequiredCollectionTypeParameter()
     {
         MojoDescriptor mojoDescriptor = new MojoDescriptor();
         mojoDescriptor.setGoal( "goal" );
@@ -133,7 +133,7 @@ public class PluginParameterExceptionTest
     }
 
     @Test
-    public void testMissingRequiredPropertiesTypeParameter()
+    void testMissingRequiredPropertiesTypeParameter()
     {
         MojoDescriptor mojoDescriptor = new MojoDescriptor();
         mojoDescriptor.setGoal( "goal" );
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index 16deedd..c61d8f9 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -59,7 +59,7 @@ import javax.inject.Inject;
 /**
  * @author Jason van Zyl
  */
-public class PluginParameterExpressionEvaluatorTest
+class PluginParameterExpressionEvaluatorTest
     extends AbstractCoreMavenComponentTestCase
 {
     private static final String FS = File.separator;
@@ -68,7 +68,7 @@ public class PluginParameterExpressionEvaluatorTest
     private RepositorySystem factory;
 
     @Test
-    public void testPluginDescriptorExpressionReference()
+    void testPluginDescriptorExpressionReference()
         throws Exception
     {
         MojoExecution exec = newMojoExecution();
@@ -85,7 +85,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testPluginArtifactsExpressionReference()
+    void testPluginArtifactsExpressionReference()
         throws Exception
     {
         MojoExecution exec = newMojoExecution();
@@ -111,7 +111,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testPluginArtifactMapExpressionReference()
+    void testPluginArtifactMapExpressionReference()
         throws Exception
     {
         MojoExecution exec = newMojoExecution();
@@ -139,7 +139,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testPluginArtifactIdExpressionReference()
+    void testPluginArtifactIdExpressionReference()
         throws Exception
     {
         MojoExecution exec = newMojoExecution();
@@ -156,7 +156,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testValueExtractionWithAPomValueContainingAPath()
+    void testValueExtractionWithAPomValueContainingAPath()
         throws Exception
     {
         String expected = getTestFile( "target/test-classes/target/classes" ).getCanonicalPath();
@@ -179,7 +179,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testEscapedVariablePassthrough()
+    void testEscapedVariablePassthrough()
         throws Exception
     {
         String var = "${var}";
@@ -197,7 +197,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testEscapedVariablePassthroughInLargerExpression()
+    void testEscapedVariablePassthroughInLargerExpression()
         throws Exception
     {
         String var = "${var}";
@@ -216,7 +216,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testMultipleSubExpressionsInLargerExpression()
+    void testMultipleSubExpressionsInLargerExpression()
         throws Exception
     {
         String key = "${project.artifactId} with version: ${project.version}";
@@ -235,7 +235,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testMissingPOMPropertyRefInLargerExpression()
+    void testMissingPOMPropertyRefInLargerExpression()
         throws Exception
     {
         String expr = "/path/to/someproject-${baseVersion}";
@@ -250,7 +250,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testPOMPropertyExtractionWithMissingProject_WithDotNotation()
+    void testPOMPropertyExtractionWithMissingProject_WithDotNotation()
         throws Exception
     {
         String key = "m2.name";
@@ -272,7 +272,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testBasedirExtractionWithMissingProject()
+    void testBasedirExtractionWithMissingProject()
         throws Exception
     {
         ExpressionEvaluator ee = createExpressionEvaluator( null, null, new Properties() );
@@ -283,7 +283,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testValueExtractionFromSystemPropertiesWithMissingProject()
+    void testValueExtractionFromSystemPropertiesWithMissingProject()
         throws Exception
     {
         String sysprop = "PPEET_sysprop1";
@@ -303,7 +303,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testValueExtractionFromSystemPropertiesWithMissingProject_WithDotNotation()
+    void testValueExtractionFromSystemPropertiesWithMissingProject_WithDotNotation()
         throws Exception
     {
         String sysprop = "PPEET.sysprop2";
@@ -336,7 +336,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testLocalRepositoryExtraction()
+    void testLocalRepositoryExtraction()
         throws Exception
     {
         ExpressionEvaluator expressionEvaluator =
@@ -347,7 +347,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testTwoExpressions()
+    void testTwoExpressions()
         throws Exception
     {
         Build build = new Build();
@@ -366,7 +366,7 @@ public class PluginParameterExpressionEvaluatorTest
     }
 
     @Test
-    public void testShouldExtractPluginArtifacts()
+    void testShouldExtractPluginArtifacts()
         throws Exception
     {
         PluginDescriptor pd = new PluginDescriptor();
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
index 4cf01cf..21b6baa 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
@@ -30,12 +30,12 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 /**
  * @author Kristian Rosenvold
  */
-public class DefaultLegacySupportTest {
+class DefaultLegacySupportTest {
     final CountDownLatch latch = new CountDownLatch(1);
     final DefaultLegacySupport defaultLegacySupport = new DefaultLegacySupport();
 
     @Test
-    public void testSetSession() throws Exception {
+    void testSetSession() throws Exception {
 
         MavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest();
         MavenSession m1 = new MavenSession(null, null, mavenExecutionRequest, null);
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java
index 8728096..17886ef 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java
@@ -38,7 +38,7 @@ import javax.inject.Inject;
 /**
  * @author Michael Simacek
  */
-public class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
+class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
 {
     @Inject
     private MavenPluginValidator mavenPluginValidator;
@@ -49,7 +49,7 @@ public class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
     }
 
     @Test
-    public void testValidate()
+    void testValidate()
     {
         Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
                 "jar", null, new DefaultArtifactHandler( "ignore" ) );
@@ -63,7 +63,7 @@ public class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
     }
 
     @Test
-    public void testInvalidGroupId()
+    void testInvalidGroupId()
     {
         Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
                 "jar", null, new DefaultArtifactHandler( "ignore" ) );
@@ -77,7 +77,7 @@ public class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
     }
 
     @Test
-    public void testInvalidArtifactId()
+    void testInvalidArtifactId()
     {
         Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
                 "jar", null, new DefaultArtifactHandler( "ignore" ) );
@@ -91,7 +91,7 @@ public class MavenPluginValidatorTest extends AbstractCoreMavenComponentTestCase
     }
 
     @Test
-    public void testInvalidVersion()
+    void testInvalidVersion()
     {
         Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
                 "jar", null, new DefaultArtifactHandler( "ignore" ) );
diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 785958e..22b75f2 100644
--- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -54,7 +54,7 @@ public abstract class AbstractMavenProjectTestCase
     }
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) )
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 59cab5d..3c271bd 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-public class DefaultMavenProjectBuilderTest
+class DefaultMavenProjectBuilderTest
     extends AbstractMavenProjectTestCase
 {
     @TempDir
@@ -56,9 +56,8 @@ public class DefaultMavenProjectBuilderTest
     @TempDir
     Path projectRoot;
 
-    @Override
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         projectBuilder = getContainer().lookup( ProjectBuilder.class );
@@ -80,7 +79,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildFromMiddlePom() throws Exception
+    void testBuildFromMiddlePom() throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/grandchild-check/child/pom.xml");
         File f2 = getTestFile( "src/test/resources/projects/grandchild-check/child/grandchild/pom.xml");
@@ -94,7 +93,7 @@ public class DefaultMavenProjectBuilderTest
 
     @Disabled( "Maven 4 does not allow duplicate plugin declarations" )
     @Test
-    public void testDuplicatePluginDefinitionsMerged()
+    void testDuplicatePluginDefinitionsMerged()
         throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
@@ -106,7 +105,7 @@ public class DefaultMavenProjectBuilderTest
     }
 
     @Test
-    public void testFutureModelVersion()
+    void testFutureModelVersion()
         throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/future-model-version-pom.xml" );
@@ -119,7 +118,7 @@ public class DefaultMavenProjectBuilderTest
     }
 
     @Test
-    public void testPastModelVersion()
+    void testPastModelVersion()
         throws Exception
     {
         // a Maven 1.x pom will not even
@@ -134,7 +133,7 @@ public class DefaultMavenProjectBuilderTest
     }
 
     @Test
-    public void testFutureSchemaModelVersion()
+    void testFutureSchemaModelVersion()
         throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/future-schema-model-version-pom.xml" );
@@ -147,7 +146,7 @@ public class DefaultMavenProjectBuilderTest
     }
 
     @Test
-    public void testBuildStubModelForMissingRemotePom()
+    void testBuildStubModelForMissingRemotePom()
         throws Exception
     {
         Artifact pom = repositorySystem.createProjectArtifact( "org.apache.maven.its", "missing", "0.1" );
@@ -175,7 +174,7 @@ public class DefaultMavenProjectBuilderTest
     }
 
     @Test
-    public void testPartialResultUponBadDependencyDeclaration()
+    void testPartialResultUponBadDependencyDeclaration()
         throws Exception
     {
         File pomFile = getTestFile( "src/test/resources/projects/bad-dependency.xml" );
@@ -204,7 +203,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildValidParentVersionRangeLocally() throws Exception
+    void testBuildValidParentVersionRangeLocally() throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/parent-version-range-local-valid/child/pom.xml" );
 
@@ -224,7 +223,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildParentVersionRangeLocallyWithoutChildVersion() throws Exception
+    void testBuildParentVersionRangeLocallyWithoutChildVersion() throws Exception
     {
         File f1 =
             getTestFile( "src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml" );
@@ -242,7 +241,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildParentVersionRangeLocallyWithChildProjectVersionExpression() throws Exception
+    void testBuildParentVersionRangeLocallyWithChildProjectVersionExpression() throws Exception
     {
         File f1 =
             getTestFile(
@@ -301,7 +300,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildParentVersionRangeExternally() throws Exception
+    void testBuildParentVersionRangeExternally() throws Exception
     {
         File f1 = getTestFile( "src/test/resources/projects/parent-version-range-external-valid/pom.xml" );
 
@@ -321,7 +320,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildParentVersionRangeExternallyWithoutChildVersion() throws Exception
+    void testBuildParentVersionRangeExternallyWithoutChildVersion() throws Exception
     {
         File f1 =
             getTestFile(
@@ -340,7 +339,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testBuildParentVersionRangeExternallyWithChildProjectVersionExpression() throws Exception
+    void testBuildParentVersionRangeExternallyWithChildProjectVersionExpression() throws Exception
     {
         File f1 =
             getTestFile(
@@ -359,7 +358,7 @@ public class DefaultMavenProjectBuilderTest
      * @throws Exception in case of issue
      */
     @Test
-    public void rereadPom_mng7063() throws Exception
+    void rereadPom_mng7063() throws Exception
     {
         final Path pom = projectRoot.resolve( "pom.xml" );
         final ProjectBuildingRequest buildingRequest = newBuildingRequest();
diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
index 150eb6a..02c90a8 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
@@ -39,20 +39,20 @@ import static org.hamcrest.MatcherAssert.assertThat;
  *
  * @author Benjamin Bentmann
  */
-public class ExtensionDescriptorBuilderTest
+class ExtensionDescriptorBuilderTest
 {
 
     private ExtensionDescriptorBuilder builder;
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         builder = new ExtensionDescriptorBuilder();
     }
 
     @AfterEach
-    public void tearDown()
+    void tearDown()
         throws Exception
     {
         builder = null;
@@ -64,7 +64,7 @@ public class ExtensionDescriptorBuilderTest
     }
 
     @Test
-    public void testEmptyDescriptor()
+    void testEmptyDescriptor()
         throws Exception
     {
         String xml = "<extension></extension>";
@@ -79,7 +79,7 @@ public class ExtensionDescriptorBuilderTest
     }
 
     @Test
-    public void testCompleteDescriptor()
+    void testCompleteDescriptor()
         throws Exception
     {
         String xml =
diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
index d2cba20..f030d76 100644
--- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
@@ -36,12 +36,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class MavenProjectTest
+class MavenProjectTest
     extends AbstractMavenProjectTestCase
 {
 
     @Test
-    public void testShouldInterpretChildPathAdjustmentBasedOnModulePaths()
+    void testShouldInterpretChildPathAdjustmentBasedOnModulePaths()
         throws IOException
     {
         Model parentModel = new Model();
@@ -68,7 +68,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testIdentityProtoInheritance()
+    void testIdentityProtoInheritance()
     {
         Parent parent = new Parent();
 
@@ -92,7 +92,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testEmptyConstructor()
+    void testEmptyConstructor()
     {
         MavenProject project = new MavenProject();
 
@@ -101,7 +101,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testClone()
+    void testClone()
         throws Exception
     {
         File f = getFileForClasspathResource( "canonical-pom.xml" );
@@ -115,7 +115,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testCloneWithDependencyManagement()
+    void testCloneWithDependencyManagement()
         throws Exception
     {
         File f = getFileForClasspathResource( "dependencyManagement-pom.xml" );
@@ -139,7 +139,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testGetModulePathAdjustment()
+    void testGetModulePathAdjustment()
         throws IOException
     {
         Model moduleModel = new Model();
@@ -159,7 +159,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testCloneWithDistributionManagement()
+    void testCloneWithDistributionManagement()
         throws Exception
     {
 
@@ -171,7 +171,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testCloneWithActiveProfile()
+    void testCloneWithActiveProfile()
         throws Exception
     {
 
@@ -192,7 +192,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testCloneWithBaseDir()
+    void testCloneWithBaseDir()
         throws Exception
     {
         File f = getFileForClasspathResource( "canonical-pom.xml" );
@@ -204,7 +204,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testUndefinedOutputDirectory()
+    void testUndefinedOutputDirectory()
         throws Exception
     {
         MavenProject p = new MavenProject();
@@ -215,7 +215,7 @@ public class MavenProjectTest
     }
 
     @Test
-    public void testAddDotFile()
+    void testAddDotFile()
     {
         MavenProject project = new MavenProject();
 
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index a96583d..b2b7f4e 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @PlexusTest
-public class PomConstructionTest
+class PomConstructionTest
 {
     private static String BASE_DIR = "src/test";
 
@@ -72,7 +72,7 @@ public class PomConstructionTest
     private File testDirectory;
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         testDirectory = new File( getBasedir(), BASE_POM_DIR );
@@ -85,7 +85,7 @@ public class PomConstructionTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testEmptyUrl()
+    void testEmptyUrl()
         throws Exception
     {
         buildPom( "empty-distMng-repo-url" );
@@ -98,7 +98,7 @@ public class PomConstructionTest
      */
     /* MNG-786*/
     @Test
-    public void testProfileModules()
+    void testProfileModules()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-module", "a" );
@@ -116,7 +116,7 @@ public class PomConstructionTest
      * @throws Exception in case of issue
      */
     @Test
-    public void testParentInheritance()
+    void testParentInheritance()
         throws Exception
     {
         buildPom( "parent-inheritance/sub" );
@@ -124,7 +124,7 @@ public class PomConstructionTest
 
     /*MNG-3995*/
     @Test
-    public void testExecutionConfigurationJoin()
+    void testExecutionConfigurationJoin()
        throws Exception
     {
         PomTestWrapper pom = buildPom( "execution-configuration-join" );
@@ -133,7 +133,7 @@ public class PomConstructionTest
 
     /*MNG-3803*/
     @Test
-    public void testPluginConfigProperties()
+    void testPluginConfigProperties()
        throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-properties" );
@@ -142,7 +142,7 @@ public class PomConstructionTest
 
     /*MNG-3900*/
     @Test
-    public void testProfilePropertiesInterpolation()
+    void testProfilePropertiesInterpolation()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-properties-interpolation", "interpolation-profile" );
@@ -174,7 +174,7 @@ public class PomConstructionTest
 
     /*MNG- 4010*/
     @Test
-    public void testDuplicateExclusionsDependency()
+    void testDuplicateExclusionsDependency()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "duplicate-exclusions-dependency/sub" );
@@ -184,7 +184,7 @@ public class PomConstructionTest
 
     /*MNG- 4008*/
     @Test
-    public void testMultipleFilters()
+    void testMultipleFilters()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "multiple-filters" );
@@ -254,7 +254,7 @@ public class PomConstructionTest
     */
 
     @Test
-    public void testDuplicateDependenciesCauseLastDeclarationToBePickedInLenientMode()
+    void testDuplicateDependenciesCauseLastDeclarationToBePickedInLenientMode()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "unique-dependency-key/deps", true, null, null );
@@ -264,7 +264,7 @@ public class PomConstructionTest
 
     /* MNG-3567*/
     @Test
-    public void testParentInterpolation()
+    void testParentInterpolation()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "parent-interpolation/sub" );
@@ -416,7 +416,7 @@ public class PomConstructionTest
 
     /** MNG-3965 */
     @Test
-    public void testMultipleExecutionIds()
+    void testMultipleExecutionIds()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "dual-execution-ids/sub" );
@@ -425,14 +425,14 @@ public class PomConstructionTest
 
     /** MNG-3997 */
     @Test
-    public void testConsecutiveEmptyElements()
+    void testConsecutiveEmptyElements()
         throws Exception
     {
         buildPom( "consecutive_empty_elements" );
     }
 
     @Test
-    public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
+    void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-goals-order/wo-plugin-mgmt" );
@@ -446,7 +446,7 @@ public class PomConstructionTest
 
     /* MNG-3886*/
     @Test
-    public void testOrderOfGoalsFromPluginExecutionWithPluginManagement()
+    void testOrderOfGoalsFromPluginExecutionWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-goals-order/w-plugin-mgmt" );
@@ -459,7 +459,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfPluginExecutionsWithoutPluginManagement()
+    void testOrderOfPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-order/wo-plugin-mgmt" );
@@ -473,7 +473,7 @@ public class PomConstructionTest
 
     /* MNG-3887 */
     @Test
-    public void testOrderOfPluginExecutionsWithPluginManagement()
+    void testOrderOfPluginExecutionsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-order/w-plugin-mgmt" );
@@ -486,7 +486,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testMergeOfPluginExecutionsWhenChildInheritsPluginVersion()
+    void testMergeOfPluginExecutionsWhenChildInheritsPluginVersion()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-merging-wo-version/sub" );
@@ -495,7 +495,7 @@ public class PomConstructionTest
 
     /* MNG-3943*/
     @Test
-    public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
+    void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" );
@@ -504,7 +504,7 @@ public class PomConstructionTest
 
 
     @Test
-    public void testInterpolationWithXmlMarkup()
+    void testInterpolationWithXmlMarkup()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "xml-markup-interpolation" );
@@ -513,7 +513,7 @@ public class PomConstructionTest
 
     /* MNG-3925 */
     @Test
-    public void testOrderOfMergedPluginExecutionsWithoutPluginManagement()
+    void testOrderOfMergedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-exec-order/wo-plugin-mgmt/sub" );
@@ -526,7 +526,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfMergedPluginExecutionsWithPluginManagement()
+    void testOrderOfMergedPluginExecutionsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-exec-order/w-plugin-mgmt/sub" );
@@ -540,7 +540,7 @@ public class PomConstructionTest
 
     /* MNG-3984*/
     @Test
-    public void testDifferentContainersWithSameId()
+    void testDifferentContainersWithSameId()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "join-different-containers-same-id" );
@@ -550,7 +550,7 @@ public class PomConstructionTest
 
     /* MNG-3937*/
     @Test
-    public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()
+    void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/wo-plugin-mgmt/sub" );
@@ -564,7 +564,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfMergedPluginExecutionGoalsWithPluginManagement()
+    void testOrderOfMergedPluginExecutionGoalsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/w-plugin-mgmt/sub" );
@@ -578,7 +578,7 @@ public class PomConstructionTest
 
     /*MNG-3938*/
     @Test
-    public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
+    void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-merging/wo-plugin-mgmt/sub" );
@@ -589,7 +589,7 @@ public class PomConstructionTest
 
     /* MNG-3938 */
     @Test
-    public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
+    void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mgmt/sub" );
@@ -601,7 +601,7 @@ public class PomConstructionTest
 
     /* MNG-3906*/
     @Test
-    public void testOrderOfMergedPluginDependenciesWithoutPluginManagement()
+    void testOrderOfMergedPluginDependenciesWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mgmt/sub" );
@@ -621,7 +621,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfMergedPluginDependenciesWithPluginManagement()
+    void testOrderOfMergedPluginDependenciesWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/w-plugin-mgmt/sub" );
@@ -639,7 +639,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testInterpolationOfNestedBuildDirectories()
+    void testInterpolationOfNestedBuildDirectories()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "nested-build-dir-interpolation" );
@@ -652,7 +652,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testAppendArtifactIdOfChildToInheritedUrls()
+    void testAppendArtifactIdOfChildToInheritedUrls()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "url-inheritance/sub" );
@@ -672,7 +672,7 @@ public class PomConstructionTest
 
     /* MNG-3846*/
     @Test
-    public void testAppendArtifactIdOfParentAndChildToInheritedUrls()
+    void testAppendArtifactIdOfParentAndChildToInheritedUrls()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "url-inheritance/another-parent/sub" );
@@ -691,7 +691,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testNonInheritedElementsInSubtreesOverriddenByChild()
+    void testNonInheritedElementsInSubtreesOverriddenByChild()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "limited-inheritance/child" );
@@ -714,7 +714,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testXmlTextCoalescing()
+    void testXmlTextCoalescing()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "xml-coalesce-text" );
@@ -725,7 +725,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testFullInterpolationOfNestedExpressions()
+    void testFullInterpolationOfNestedExpressions()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "full-interpolation" );
@@ -737,7 +737,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testInterpolationOfLegacyExpressionsThatDontIncludeTheProjectPrefix()
+    void testInterpolationOfLegacyExpressionsThatDontIncludeTheProjectPrefix()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "unprefixed-expression-interpolation/child" );
@@ -772,7 +772,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testInterpolationWithBasedirAlignedDirectories()
+    void testInterpolationWithBasedirAlignedDirectories()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "basedir-aligned-interpolation" );
@@ -794,7 +794,7 @@ public class PomConstructionTest
 
     /* MNG-3944*/
     @Test
-    public void testInterpolationOfBasedirInPomWithUnusualName()
+    void testInterpolationOfBasedirInPomWithUnusualName()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "basedir-interpolation/pom-with-unusual-name.xml" );
@@ -804,7 +804,7 @@ public class PomConstructionTest
 
     /* MNG-3979 */
     @Test
-    public void testJoiningOfContainersWhenChildHasEmptyElements()
+    void testJoiningOfContainersWhenChildHasEmptyElements()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "id-container-joining-with-empty-elements/sub" );
@@ -812,7 +812,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfPluginConfigurationElementsWithoutPluginManagement()
+    void testOrderOfPluginConfigurationElementsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-order/wo-plugin-mgmt" );
@@ -824,7 +824,7 @@ public class PomConstructionTest
 
     /* MNG-3827*/
     @Test
-    public void testOrderOfPluginConfigurationElementsWithPluginManagement()
+    void testOrderOfPluginConfigurationElementsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-order/w-plugin-mgmt" );
@@ -835,7 +835,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testOrderOfPluginExecutionConfigurationElementsWithoutPluginManagement()
+    void testOrderOfPluginExecutionConfigurationElementsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-config-order/wo-plugin-mgmt" );
@@ -850,7 +850,7 @@ public class PomConstructionTest
 
     /* MNG-3864*/
     @Test
-    public void testOrderOfPluginExecutionConfigurationElementsWithPluginManagement()
+    void testOrderOfPluginExecutionConfigurationElementsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-config-order/w-plugin-mgmt" );
@@ -865,7 +865,7 @@ public class PomConstructionTest
 
     /* MNG-3836*/
     @Test
-    public void testMergeOfInheritedPluginConfiguration()
+    void testMergeOfInheritedPluginConfiguration()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-merging/child" );
@@ -885,7 +885,7 @@ public class PomConstructionTest
 
     /* MNG-2591 */
     @Test
-    public void testAppendOfInheritedPluginConfigurationWithNoProfile()
+    void testAppendOfInheritedPluginConfigurationWithNoProfile()
         throws Exception
     {
         testAppendOfInheritedPluginConfiguration( "no-profile" );
@@ -893,7 +893,7 @@ public class PomConstructionTest
 
     /* MNG-2591*/
     @Test
-    public void testAppendOfInheritedPluginConfigurationWithActiveProfile()
+    void testAppendOfInheritedPluginConfigurationWithActiveProfile()
         throws Exception
     {
         testAppendOfInheritedPluginConfiguration( "with-profile" );
@@ -926,7 +926,7 @@ public class PomConstructionTest
 
     /* MNG-4000 */
     @Test
-    public void testMultiplePluginExecutionsWithAndWithoutIdsWithoutPluginManagement()
+    void testMultiplePluginExecutionsWithAndWithoutIdsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/wo-plugin-mgmt" );
@@ -936,7 +936,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testMultiplePluginExecutionsWithAndWithoutIdsWithPluginManagement()
+    void testMultiplePluginExecutionsWithAndWithoutIdsWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/w-plugin-mgmt" );
@@ -946,7 +946,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDependencyOrderWithoutPluginManagement()
+    void testDependencyOrderWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "dependency-order/wo-plugin-mgmt" );
@@ -958,7 +958,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDependencyOrderWithPluginManagement()
+    void testDependencyOrderWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "dependency-order/w-plugin-mgmt" );
@@ -970,7 +970,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testBuildDirectoriesUsePlatformSpecificFileSeparator()
+    void testBuildDirectoriesUsePlatformSpecificFileSeparator()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "platform-file-separator" );
@@ -987,7 +987,7 @@ public class PomConstructionTest
 
     /* MNG-4008 */
     @Test
-    public void testMergedFilterOrder()
+    void testMergedFilterOrder()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "merged-filter-order/sub" );
@@ -1004,7 +1004,7 @@ public class PomConstructionTest
 
     /** MNG-4027*/
     @Test
-    public void testProfileInjectedDependencies()
+    void testProfileInjectedDependencies()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-injected-dependencies" );
@@ -1017,7 +1017,7 @@ public class PomConstructionTest
 
     /** IT-0021*/
     @Test
-    public void testProfileDependenciesMultipleProfiles()
+    void testProfileDependenciesMultipleProfiles()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" );
@@ -1025,7 +1025,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDependencyInheritance()
+    void testDependencyInheritance()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "dependency-inheritance/sub" );
@@ -1035,7 +1035,7 @@ public class PomConstructionTest
 
     /** MNG-4034 */
     @Test
-    public void testManagedProfileDependency()
+    void testManagedProfileDependency()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "managed-profile-dependency/sub", "maven-core-it" );
@@ -1050,7 +1050,7 @@ public class PomConstructionTest
 
     /** MNG-4040 */
     @Test
-    public void testProfileModuleInheritance()
+    void testProfileModuleInheritance()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "profile-module-inheritance/sub", "dist" );
@@ -1059,7 +1059,7 @@ public class PomConstructionTest
 
     /** MNG-3621 */
     @Test
-    public void testUncPath()
+    void testUncPath()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "unc-path/sub" );
@@ -1068,7 +1068,7 @@ public class PomConstructionTest
 
     /** MNG-2006 */
     @Test
-    public void testUrlAppendWithChildPathAdjustment()
+    void testUrlAppendWithChildPathAdjustment()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "url-append/child" );
@@ -1081,7 +1081,7 @@ public class PomConstructionTest
 
     /** MNG-0479 */
     @Test
-    public void testRepoInheritance()
+    void testRepoInheritance()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "repo-inheritance" );
@@ -1090,7 +1090,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testEmptyScm()
+    void testEmptyScm()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "empty-scm" );
@@ -1098,7 +1098,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginConfigurationUsingAttributesWithoutPluginManagement()
+    void testPluginConfigurationUsingAttributesWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-attributes/wo-plugin-mgmt" );
@@ -1111,7 +1111,7 @@ public class PomConstructionTest
 
     /** MNG-4053*/
     @Test
-    public void testPluginConfigurationUsingAttributesWithPluginManagement()
+    void testPluginConfigurationUsingAttributesWithPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-attributes/w-plugin-mgmt" );
@@ -1123,7 +1123,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginConfigurationUsingAttributesWithPluginManagementAndProfile()
+    void testPluginConfigurationUsingAttributesWithPluginManagementAndProfile()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-config-attributes/w-profile", "maven-core-it" );
@@ -1135,7 +1135,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPomEncoding()
+    void testPomEncoding()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "pom-encoding/utf-8" );
@@ -1146,7 +1146,7 @@ public class PomConstructionTest
 
     /* MNG-4070 */
     @Test
-    public void testXmlWhitespaceHandling()
+    void testXmlWhitespaceHandling()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "xml-whitespace/sub" );
@@ -1155,7 +1155,7 @@ public class PomConstructionTest
 
     /* MNG-3760*/
     @Test
-    public void testInterpolationOfBaseUri()
+    void testInterpolationOfBaseUri()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "baseuri-interpolation/pom.xml" );
@@ -1164,7 +1164,7 @@ public class PomConstructionTest
 
     /* MNG-6386 */
     @Test
-    public void testInterpolationOfRfc3986BaseUri()
+    void testInterpolationOfRfc3986BaseUri()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "baseuri-interpolation/pom.xml" );
@@ -1175,7 +1175,7 @@ public class PomConstructionTest
 
     /* MNG-3811*/
     @Test
-    public void testReportingPluginConfig()
+    void testReportingPluginConfig()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "reporting-plugin-config/sub" );
@@ -1188,7 +1188,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPropertiesNoDuplication()
+    void testPropertiesNoDuplication()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "properties-no-duplication/sub" );
@@ -1197,7 +1197,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPomInheritance()
+    void testPomInheritance()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "pom-inheritance/sub" );
@@ -1206,7 +1206,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testCompleteModelWithoutParent()
+    void testCompleteModelWithoutParent()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "complete-model/wo-parent" );
@@ -1215,7 +1215,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testCompleteModelWithParent()
+    void testCompleteModelWithParent()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "complete-model/w-parent/sub" );
@@ -1431,7 +1431,7 @@ public class PomConstructionTest
 
     /* MNG-2309*/
     @Test
-    public void testProfileInjectionOrder()
+    void testProfileInjectionOrder()
         throws Exception
     {
         PomTestWrapper pom =
@@ -1440,7 +1440,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPropertiesInheritance()
+    void testPropertiesInheritance()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "properties-inheritance/sub" );
@@ -1451,7 +1451,7 @@ public class PomConstructionTest
 
     /* MNG-4102*/
     @Test
-    public void testInheritedPropertiesInterpolatedWithValuesFromChildWithoutProfiles()
+    void testInheritedPropertiesInterpolatedWithValuesFromChildWithoutProfiles()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "inherited-properties-interpolation/no-profile/sub" );
@@ -1462,7 +1462,7 @@ public class PomConstructionTest
 
     /* MNG-4102 */
     @Test
-    public void testInheritedPropertiesInterpolatedWithValuesFromChildWithActiveProfiles()
+    void testInheritedPropertiesInterpolatedWithValuesFromChildWithActiveProfiles()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "inherited-properties-interpolation/active-profile/sub" );
@@ -1476,7 +1476,7 @@ public class PomConstructionTest
 
     /* MNG-3545 */
     @Test
-    public void testProfileDefaultActivation()
+    void testProfileDefaultActivation()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-default-deactivation", "profile4" );
@@ -1487,7 +1487,7 @@ public class PomConstructionTest
 
     /* MNG-1995 */
     @Test
-    public void testBooleanInterpolation()
+    void testBooleanInterpolation()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "boolean-interpolation" );
@@ -1498,7 +1498,7 @@ public class PomConstructionTest
 
     /* MNG-3899 */
     @Test
-    public void testBuildExtensionInheritance()
+    void testBuildExtensionInheritance()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" );
@@ -1511,7 +1511,7 @@ public class PomConstructionTest
 
     /*MNG-1957*/
     @Test
-    public void testJdkActivation()
+    void testJdkActivation()
         throws Exception
     {
         Properties props = new Properties();
@@ -1526,7 +1526,7 @@ public class PomConstructionTest
 
     /* MNG-2174 */
     @Test
-    public void testProfilePluginMngDependencies()
+    void testProfilePluginMngDependencies()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub", "maven-core-it" );
@@ -1535,7 +1535,7 @@ public class PomConstructionTest
 
     /** MNG-4116 */
     @Test
-    public void testPercentEncodedUrlsMustNotBeDecoded()
+    void testPercentEncodedUrlsMustNotBeDecoded()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "url-no-decoding" );
@@ -1554,7 +1554,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginManagementInheritance()
+    void testPluginManagementInheritance()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" );
@@ -1563,7 +1563,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testProfilePlugins()
+    void testProfilePlugins()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "profile-plugins", "standard" );
@@ -1572,7 +1572,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginInheritanceSimple()
+    void testPluginInheritanceSimple()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub" );
@@ -1580,7 +1580,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginManagementDuplicate()
+    void testPluginManagementDuplicate()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" );
@@ -1588,7 +1588,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDistributionManagement()
+    void testDistributionManagement()
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "distribution-management" );
@@ -1596,7 +1596,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDependencyScopeInheritance()
+    void testDependencyScopeInheritance()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
@@ -1605,7 +1605,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDependencyScope()
+    void testDependencyScope()
         throws Exception
     {
         buildPom( "dependency-scope/sub" );
@@ -1619,7 +1619,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testInterpolationWithSystemProperty()
+    void testInterpolationWithSystemProperty()
         throws Exception
     {
         Properties sysProps = new Properties();
@@ -1630,7 +1630,7 @@ public class PomConstructionTest
 
     /* MNG-4129 */
     @Test
-    public void testPluginExecutionInheritanceWhenChildDoesNotDeclarePlugin()
+    void testPluginExecutionInheritanceWhenChildDoesNotDeclarePlugin()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-inheritance/wo-merge" );
@@ -1642,7 +1642,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginExecutionInheritanceWhenChildDoesDeclarePluginAsWell()
+    void testPluginExecutionInheritanceWhenChildDoesDeclarePluginAsWell()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-inheritance/w-merge" );
@@ -1655,7 +1655,7 @@ public class PomConstructionTest
 
     /* MNG-4193 */
     @Test
-    public void testValidationErrorUponNonUniqueArtifactRepositoryId()
+    void testValidationErrorUponNonUniqueArtifactRepositoryId()
         throws Exception
     {
         assertThrows(
@@ -1666,7 +1666,7 @@ public class PomConstructionTest
 
     /* MNG-4193 */
     @Test
-    public void testValidationErrorUponNonUniquePluginRepositoryId()
+    void testValidationErrorUponNonUniquePluginRepositoryId()
         throws Exception
     {
         assertThrows(
@@ -1677,7 +1677,7 @@ public class PomConstructionTest
 
     /* MNG-4193 */
     @Test
-    public void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile()
+    void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile()
         throws Exception
     {
         assertThrows(
@@ -1688,7 +1688,7 @@ public class PomConstructionTest
 
     /* MNG-4193 */
     @Test
-    public void testValidationErrorUponNonUniquePluginRepositoryIdInProfile()
+    void testValidationErrorUponNonUniquePluginRepositoryIdInProfile()
         throws Exception
     {
         assertThrows(
@@ -1699,7 +1699,7 @@ public class PomConstructionTest
 
     /** MNG-3843 */
     @Test
-    public void testPrerequisitesAreNotInherited()
+    void testPrerequisitesAreNotInherited()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "prerequisites-inheritance/child" );
@@ -1707,7 +1707,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testLicensesAreInheritedButNotAggregated()
+    void testLicensesAreInheritedButNotAggregated()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "licenses-inheritance/child-2" );
@@ -1717,7 +1717,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDevelopersAreInheritedButNotAggregated()
+    void testDevelopersAreInheritedButNotAggregated()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "developers-inheritance/child-2" );
@@ -1726,7 +1726,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testContributorsAreInheritedButNotAggregated()
+    void testContributorsAreInheritedButNotAggregated()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "contributors-inheritance/child-2" );
@@ -1735,7 +1735,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testMailingListsAreInheritedButNotAggregated()
+    void testMailingListsAreInheritedButNotAggregated()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "mailing-lists-inheritance/child-2" );
@@ -1744,7 +1744,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginInheritanceOrder()
+    void testPluginInheritanceOrder()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-inheritance-order/child" );
@@ -1759,7 +1759,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testCliPropsDominateProjectPropsDuringInterpolation()
+    void testCliPropsDominateProjectPropsDuringInterpolation()
         throws Exception
     {
         Properties props = new Properties();
@@ -1770,7 +1770,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testParentPomPackagingMustBePom()
+    void testParentPomPackagingMustBePom()
         throws Exception
     {
         assertThrows(
@@ -1781,7 +1781,7 @@ public class PomConstructionTest
 
     /** MNG-522, MNG-3018 */
     @Test
-    public void testManagedPluginConfigurationAppliesToImplicitPluginsIntroducedByPackaging()
+    void testManagedPluginConfigurationAppliesToImplicitPluginsIntroducedByPackaging()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-management-for-implicit-plugin/child" );
@@ -1792,7 +1792,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testDefaultPluginsExecutionContributedByPackagingExecuteBeforeUserDefinedExecutions()
+    void testDefaultPluginsExecutionContributedByPackagingExecuteBeforeUserDefinedExecutions()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-order-and-default-exec" );
@@ -1808,7 +1808,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testPluginDeclarationsRetainPomOrderAfterInjectionOfDefaultPlugins()
+    void testPluginDeclarationsRetainPomOrderAfterInjectionOfDefaultPlugins()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-exec-order-with-lifecycle" );
@@ -1835,7 +1835,7 @@ public class PomConstructionTest
 
     /** MNG-4415 */
     @Test
-    public void testPluginOrderAfterMergingWithInheritedPlugins()
+    void testPluginOrderAfterMergingWithInheritedPlugins()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-inheritance-merge-order/sub" );
@@ -1865,7 +1865,7 @@ public class PomConstructionTest
 
     /** MNG-4416 */
     @Test
-    public void testPluginOrderAfterMergingWithInjectedPlugins()
+    void testPluginOrderAfterMergingWithInjectedPlugins()
         throws Exception
     {
         PomTestWrapper pom = buildPom( "plugin-injection-merge-order" );
@@ -1894,7 +1894,7 @@ public class PomConstructionTest
     }
 
     @Test
-    public void testProjectArtifactIdIsNotInheritedButMandatory()
+    void testProjectArtifactIdIsNotInheritedButMandatory()
         throws Exception
     {
         assertThrows(
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 5590b9f..d08d8c4 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -52,8 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
-public class ProjectBuilderTest
+class ProjectBuilderTest
     extends AbstractCoreMavenComponentTestCase
 {
     @Override
@@ -63,7 +62,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
+    void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
         throws Exception
     {
         File pom = getProject( "it0063" );
@@ -81,7 +80,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testBuildFromModelSource()
+    void testBuildFromModelSource()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/modelsource/module01/pom.xml" );
@@ -96,7 +95,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testVersionlessManagedDependency()
+    void testVersionlessManagedDependency()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/versionless-managed-dependency.xml" );
@@ -112,7 +111,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testResolveDependencies()
+    void testResolveDependencies()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/basic-resolveDependencies.xml" );
@@ -146,7 +145,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testDontResolveDependencies()
+    void testDontResolveDependencies()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/basic-resolveDependencies.xml" );
@@ -166,7 +165,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testReadModifiedPoms() throws Exception {
+    void testReadModifiedPoms() throws Exception {
         // TODO a similar test should be created to test the dependency management (basically all usages
         // of DefaultModelBuilder.getCache() are affected by MNG-6530
 
@@ -198,7 +197,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testReadErroneousMavenProjectContainsReference()
+    void testReadErroneousMavenProjectContainsReference()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/artifactMissingVersion.xml" ).getAbsoluteFile();
@@ -232,7 +231,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testReadInvalidPom()
+    void testReadInvalidPom()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/badPom.xml" ).getAbsoluteFile();
@@ -258,7 +257,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testReadParentAndChildWithRegularVersionSetParentFile()
+    void testReadParentAndChildWithRegularVersionSetParentFile()
         throws Exception
     {
         List<File> toRead = new ArrayList<>( 2 );
@@ -319,7 +318,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testBuildProperties()
+    void testBuildProperties()
             throws Exception
     {
         File file = new File( getProject( "MNG-6716" ).getParentFile(), "project/pom.xml" );
@@ -337,7 +336,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testPropertyInPluginManagementGroupId()
+    void testPropertyInPluginManagementGroupId()
             throws Exception
     {
         File pom = getProject( "MNG-6983" );
@@ -351,7 +350,7 @@ public class ProjectBuilderTest
     }
 
     @Test
-    public void testBuildFromModelSourceResolvesBasedir()
+    void testBuildFromModelSourceResolvesBasedir()
         throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/modelsourcebasedir/pom.xml" );
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index 709b88c..63a7e10 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -48,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  * @author Christian Schulte
  * @since 3.5.0
  */
-public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
+class ProjectModelResolverTest extends AbstractMavenProjectTestCase
 {
 
     /**
@@ -60,7 +60,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+    void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
     {
         final Parent parent = new Parent();
         parent.setGroupId( "org.apache" );
@@ -76,7 +76,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+    void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
     {
         final Parent parent = new Parent();
         parent.setGroupId( "org.apache" );
@@ -92,7 +92,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+    void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
     {
         final Parent parent = new Parent();
         parent.setGroupId( "org.apache" );
@@ -108,7 +108,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
+    void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
     {
         final Parent parent = new Parent();
         parent.setGroupId( "org.apache" );
@@ -120,7 +120,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
+    void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
     {
         final Parent parent = new Parent();
         parent.setGroupId( "org.apache" );
@@ -132,7 +132,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+    void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
     {
         final Dependency dependency = new Dependency();
         dependency.setGroupId( "org.apache" );
@@ -148,7 +148,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+    void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
     {
         final Dependency dependency = new Dependency();
         dependency.setGroupId( "org.apache" );
@@ -164,7 +164,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+    void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
     {
         final Dependency dependency = new Dependency();
         dependency.setGroupId( "org.apache" );
@@ -180,7 +180,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
+    void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
     {
         final Dependency dependency = new Dependency();
         dependency.setGroupId( "org.apache" );
@@ -192,7 +192,7 @@ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
     }
 
     @Test
-    public void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
+    void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
     {
         final Dependency dependency = new Dependency();
         dependency.setGroupId( "org.apache" );
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
index ec15951..c0aeadd 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ProjectSorterTest
+class ProjectSorterTest
 {
     private Parent createParent( MavenProject project )
     {
@@ -106,7 +106,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testShouldNotFailWhenPluginDepReferencesCurrentProject()
+    void testShouldNotFailWhenPluginDepReferencesCurrentProject()
         throws Exception
     {
         MavenProject project = createProject( "group", "artifact", "1.0" );
@@ -125,7 +125,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testShouldNotFailWhenManagedPluginDepReferencesCurrentProject()
+    void testShouldNotFailWhenManagedPluginDepReferencesCurrentProject()
         throws Exception
     {
         MavenProject project = createProject( "group", "artifact", "1.0" );
@@ -148,7 +148,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testShouldNotFailWhenProjectReferencesNonExistentProject()
+    void testShouldNotFailWhenProjectReferencesNonExistentProject()
         throws Exception
     {
         MavenProject project = createProject( "group", "artifact", "1.0" );
@@ -163,7 +163,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testMatchingArtifactIdsDifferentGroupIds()
+    void testMatchingArtifactIdsDifferentGroupIds()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -180,7 +180,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testMatchingGroupIdsDifferentArtifactIds()
+    void testMatchingGroupIdsDifferentArtifactIds()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -197,7 +197,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testMatchingIdsAndVersions()
+    void testMatchingIdsAndVersions()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -213,7 +213,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testMatchingIdsAndDifferentVersions()
+    void testMatchingIdsAndDifferentVersions()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -228,7 +228,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testPluginDependenciesInfluenceSorting()
+    void testPluginDependenciesInfluenceSorting()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -272,7 +272,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testPluginDependenciesInfluenceSorting_DeclarationInParent()
+    void testPluginDependenciesInfluenceSorting_DeclarationInParent()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -308,7 +308,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testPluginVersionsAreConsidered()
+    void testPluginVersionsAreConsidered()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -328,7 +328,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testDependencyPrecedesProjectThatUsesSpecificDependencyVersion()
+    void testDependencyPrecedesProjectThatUsesSpecificDependencyVersion()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
@@ -347,7 +347,7 @@ public class ProjectSorterTest
     }
 
     @Test
-    public void testDependencyPrecedesProjectThatUsesUnresolvedDependencyVersion()
+    void testDependencyPrecedesProjectThatUsesUnresolvedDependencyVersion()
         throws Exception
     {
         List<MavenProject> projects = new ArrayList<>();
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
index 2d5c1ba..4e3e316 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
@@ -39,26 +39,26 @@ import static org.junit.jupiter.api.Assertions.assertNotSame;
 /**
  * @author Igor Fedorenko
  */
-public class DefaultMavenMetadataCacheTest
+class DefaultMavenMetadataCacheTest
 {
     private RepositorySystem repositorySystem;
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         repositorySystem = new TestRepositorySystem( null, null );
     }
 
     @AfterEach
-    public void tearDown()
+    void tearDown()
         throws Exception
     {
         repositorySystem = null;
     }
 
     @Test
-    public void testCacheKey()
+    void testCacheKey()
         throws Exception
     {
         Artifact a1 = repositorySystem.createArtifact( "testGroup", "testArtifact", "1.2.3", "jar" );
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
index 16317ff..a715c22 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
@@ -28,20 +28,21 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class DefaultProjectArtifactsCacheTest
+
+class DefaultProjectArtifactsCacheTest
 {
 
     private ProjectArtifactsCache cache;
 
     @BeforeEach
-    public void setUp()
+    void setUp()
         throws Exception
     {
         cache = new DefaultProjectArtifactsCache();
     }
 
     @Test
-    public void testProjectDependencyOrder() throws Exception
+    void testProjectDependencyOrder() throws Exception
     {
         ProjectArtifactsCache.Key project1 = new ProjectArtifactsCache.Key(){};
 
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
index 7d5150d..515bffa 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @PlexusTest
-public class MavenMetadataSourceTest
+class MavenMetadataSourceTest
 {
     @Inject
     private RepositorySystem repositorySystem;
@@ -38,7 +38,7 @@ public class MavenMetadataSourceTest
 
     @Test
     @Disabled
-    public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
+    void testShouldNotCarryExclusionsOverFromDependencyToDependency()
         throws Exception
     {
         /*
@@ -88,7 +88,7 @@ public class MavenMetadataSourceTest
 
     @Test
     @Disabled("TODO restore these if it makes sense")
-    public void testShouldUseCompileScopeIfDependencyScopeEmpty()
+    void testShouldUseCompileScopeIfDependencyScopeEmpty()
         throws Exception
     {
         /*
@@ -128,7 +128,7 @@ public class MavenMetadataSourceTest
 
     @Test
     @Disabled
-    public void testShouldUseInjectedTestScopeFromDependencyManagement()
+    void testShouldUseInjectedTestScopeFromDependencyManagement()
         throws Exception
     {
         /*
diff --git a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
index f966237..18f751f 100644
--- a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
@@ -35,11 +35,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 /**
  * @author Jason van Zyl
  */
-public class CanonicalProjectBuilderTest
+class CanonicalProjectBuilderTest
     extends AbstractMavenProjectTestCase
 {
     @Test
-    public void testProjectBuilder()
+    void testProjectBuilder()
         throws Exception
     {
         File f = getFileForClasspathResource( "canonical-pom.xml" );