diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index c5ded2eec01f..5871a3570f4e 100644 --- a/its/core-it-suite/pom.xml +++ b/its/core-it-suite/pom.xml @@ -93,6 +93,8 @@ under the License. 2.1-SNAPSHOT + 2.90.0 + 6 0.75C @@ -356,12 +358,12 @@ under the License. maven-it-plugin-plexus-lifecycle ${core-it-support-version} - - commons-jxpath - commons-jxpath - 1.4.0 - test - + + commons-jxpath + commons-jxpath + 1.4.0 + test + @@ -381,6 +383,16 @@ under the License. spotless-maven-plugin + + ${version.palantirJavaFormat} + + + + config/maven-eclipse-importorder.txt + + + config/maven-header-plain.txt + src/main/java/**/*.java src/test/java/**/*.java @@ -392,6 +404,11 @@ under the License. + + false + true + true + pom.xml src/test/resources/**/pom.xml @@ -403,6 +420,13 @@ under the License. + + + org.apache.maven.shared + maven-shared-resources + ${version.maven-shared-resources} + + diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java index 8f91c6184bd8..c5bdffa1fc11 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java @@ -18,6 +18,10 @@ */ package org.apache.maven.it; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -25,9 +29,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java index 3ea43aa95394..72bef537c88e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java @@ -22,10 +22,10 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardOpenOption; import java.nio.file.attribute.FileTime; import java.security.DigestInputStream; import java.security.MessageDigest; + import org.codehaus.plexus.util.FileUtils; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java index ca15013c586c..bd469df53a5e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index 67b857ed9613..3430032196d2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -38,7 +39,8 @@ public void testit0063() throws Exception { Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.getSystemProperties().setProperty("jre.home", testDir.resolve("jdk/jre").toString()); + verifier.getSystemProperties() + .setProperty("jre.home", testDir.resolve("jdk/jre").toString()); verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); verifier.execute(); @@ -46,8 +48,6 @@ public void testit0063() throws Exception { List lines = verifier.loadLines("target/compile.txt"); assertEquals(2, lines.size()); - ItUtils.assertCanonicalFileEquals( - testDir.resolve("jdk/lib/tools.jar"), - Path.of((String) lines.get(1))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("jdk/lib/tools.jar"), Path.of((String) lines.get(1))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index c71ebac43155..a469689f04c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -26,6 +26,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -93,9 +94,7 @@ public void testSnapshotUpdated() throws Exception { @Test public void testSnapshotUpdatedWithMetadata() throws Exception { Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); - Files.writeString( - metadata, - constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); + Files.writeString(metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); verifier.addCliArgument("package"); verifier.execute(); @@ -106,8 +105,7 @@ public void testSnapshotUpdatedWithMetadata() throws Exception { Files.writeString(artifact, "updatedArtifact"); metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); - Files.writeString( - metadata, constructMetadata("2", System.currentTimeMillis(), true)); + Files.writeString(metadata, constructMetadata("2", System.currentTimeMillis(), true)); verifier.addCliArgument("package"); verifier.execute(); @@ -126,9 +124,7 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { Files.createDirectories(localMetadata.getParent()); Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); - Files.writeString( - metadata, - constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); + Files.writeString(metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); verifier.addCliArgument("package"); verifier.execute(); @@ -157,8 +153,7 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { Files.writeString( localMetadata, constructLocalMetadata("org.apache.maven", "maven-core-it-support", cal.getTimeInMillis(), true)); - Files.writeString( - metadata, constructMetadata("2", System.currentTimeMillis() - 2000, true)); + Files.writeString(metadata, constructMetadata("2", System.currentTimeMillis() - 2000, true)); Files.setLastModifiedTime(artifact, FileTime.fromMillis(System.currentTimeMillis())); verifier.addCliArgument("package"); @@ -172,9 +167,7 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { @Test public void testSnapshotUpdatedWithMetadataUsingFileTimestamp() throws Exception { Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); - Files.writeString( - metadata, - constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, false)); + Files.writeString(metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, false)); Files.setLastModifiedTime(metadata, FileTime.fromMillis(System.currentTimeMillis() - TIME_OFFSET)); verifier.addCliArgument("package"); @@ -186,8 +179,7 @@ public void testSnapshotUpdatedWithMetadataUsingFileTimestamp() throws Exception Files.writeString(artifact, "updatedArtifact"); metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); - Files.writeString( - metadata, constructMetadata("2", System.currentTimeMillis(), false)); + Files.writeString(metadata, constructMetadata("2", System.currentTimeMillis(), false)); verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java index b6da8c2d4acd..b8577afe75f7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java index 0d4fe2136dc0..b29e3b0441c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java index 2734e74afeb1..591d7086e4ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java @@ -22,6 +22,7 @@ import java.net.InetAddress; import java.nio.file.Path; import java.util.Map; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java index b67ee15aa839..9ca205f91941 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java index 079173f781ba..05be1fa3c7ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java @@ -26,7 +26,6 @@ import org.apache.maven.model.v4.MavenStaxReader; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -100,8 +99,8 @@ void testConsumerPomWithBomFromSettingsProfileRepo() throws Exception { && "2.0".equals(d.getVersion())); assertTrue( hasLibA, - "Consumer POM should contain lib-a with version 2.0 resolved from the BOM. " - + "Actual dependencies: " + consumerPomModel.getDependencies()); + "Consumer POM should contain lib-a with version 2.0 resolved from the BOM. " + "Actual dependencies: " + + consumerPomModel.getDependencies()); // The BOM import should NOT appear in the consumer POM (it's been flattened) if (consumerPomModel.getDependencyManagement() != null) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java index 64fde45f8a8c..53a015d35c31 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java @@ -19,12 +19,12 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITMissingNamespaceTest extends AbstractMavenIntegrationTestCase { - public MavenITMissingNamespaceTest() { - } + public MavenITMissingNamespaceTest() {} /** * Test when project element does not have an xmlns attribute. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java index fc8152f2842b..c0f8401b3f94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; + import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java index ac371829e7ff..6b9c6dc11411 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java index 73d614dcc076..4d72d305dbe7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java @@ -37,8 +37,7 @@ class MavenITgh10937QuotedPipesInMavenOptsTest extends AbstractMavenIntegrationT */ @Test void testIt() throws Exception { - Path basedir = - extractResources("gh-10937-pipes-maven-opts"); + Path basedir = extractResources("gh-10937-pipes-maven-opts"); Verifier verifier = newVerifier(basedir); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dprop.maven-opts=\"foo|bar\""); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java index 84c7235e7db9..667a83cfc54b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java index 1ce9ed20d7d9..3123d1602d93 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java @@ -35,8 +35,8 @@ class MavenITgh11181CoreExtensionsMetaVersionsTest extends AbstractMavenIntegrat */ @Test void pwMetaVersionIsInvalid() throws Exception { - Path testDir = extractResources("gh-11181-core-extensions-meta-versions") - .resolve("pw-metaversion-is-invalid"); + Path testDir = + extractResources("gh-11181-core-extensions-meta-versions").resolve("pw-metaversion-is-invalid"); Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setAutoclean(false); @@ -55,8 +55,8 @@ void pwMetaVersionIsInvalid() throws Exception { */ @Test void uwMetaVersionIsValid() throws Exception { - Path testDir = extractResources("gh-11181-core-extensions-meta-versions") - .resolve("uw-metaversion-is-valid"); + Path testDir = + extractResources("gh-11181-core-extensions-meta-versions").resolve("uw-metaversion-is-valid"); Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setHandleLocalRepoTail(false); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java index 3cf5c0a70236..eefbdcd3d7dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java index cb60292a98db..19ba08d1a60a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java index 7702810e69a2..fac40490661c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.apache.maven.api.Constants; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java index 44d3bbed29f0..6225f24994bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java index 0b048d1af070..48e4412003a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** @@ -57,4 +58,3 @@ void testRelativeTargetPathInResources() throws Exception { verifier.verifyFileNotPresent("target-dir/subdir/another.yml"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java index eacfd1bf5e8e..9c552dc74b86 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java @@ -49,4 +49,3 @@ void testIt() throws Exception { verifier.verifyTextInLog("https://github.com/slackapi/java-slack-sdk"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java index e3f614a72b22..2525c31c1c59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** @@ -57,4 +58,3 @@ void testFlattenPluginWithParentExpansionDoesNotCauseCycle() throws Exception { verifier.verifyFilePresent("target/.flattened-pom.xml"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11409ProfileSourceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11409ProfileSourceTest.java index 4848ca13c3ca..46e14e5e670c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11409ProfileSourceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11409ProfileSourceTest.java @@ -53,4 +53,3 @@ void testProfileSourceInMultiModuleProject() throws Exception { verifier.verifyTextInLog("child-profile (source: test.gh11409:subproject:1.0-SNAPSHOT)"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11427BomConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11427BomConsumerPomTest.java index 271181341a3c..70521162bf5e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11427BomConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11427BomConsumerPomTest.java @@ -115,8 +115,6 @@ void testBomConsumerPomWithFlatten() throws Exception { content.contains("1.0.0-SNAPSHOT") || content.contains("${"), "Consumer pom should have version for module dependency"); assertTrue( - content.contains("4.13.2"), - "Consumer pom should have version for junit dependency"); + content.contains("4.13.2"), "Consumer pom should have version for junit dependency"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11456MixinsConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11456MixinsConsumerPomTest.java index 93f4ce569b78..352b4083acca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11456MixinsConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11456MixinsConsumerPomTest.java @@ -122,4 +122,3 @@ void testMixinsWithPreserveModelVersion() throws Exception { "Mixins should be kept in consumer POM when preserveModelVersion is enabled"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11485AtSignInJvmConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11485AtSignInJvmConfigTest.java index 4ab2e2f40dbf..e20961fcb646 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11485AtSignInJvmConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11485AtSignInJvmConfigTest.java @@ -37,8 +37,7 @@ public void testAtSignInJvmConfig() throws Exception { Path testDir = extractResources("/gh-11485-at-sign"); Verifier verifier = newVerifier(testDir); - verifier.addCliArgument( - "-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); verifier.setForkJvm(true); // custom .mvn/jvm.config // Enable debug logging for launcher script to diagnose jvm.config parsing issues verifier.setEnvironmentVariable("MAVEN_DEBUG_SCRIPT", "1"); @@ -63,8 +62,7 @@ public void testAtSignInCommandLineProperty() throws Exception { Path testDir = extractResources("/gh-11485-at-sign"); Verifier verifier = newVerifier(testDir); - verifier.addCliArgument( - "-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); verifier.setForkJvm(true); // custom .mvn/jvm.config // Pass a path with @ character via command line (simulating Jenkins workspace) String jenkinsPath = testDir.toString().replace('\\', '/') + "/jenkins.workspace/proj@2"; @@ -85,4 +83,3 @@ public void testAtSignInCommandLineProperty() throws Exception { "Command-line value with @ character should be preserved"); } } - diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java index 4ccf4b217539..5bfc46d4b21c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java @@ -55,15 +55,13 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { verifier.verifyErrorFreeLog(); // Verify parent consumer POM (main artifact) is 4.0.0 - Path parentConsumerPom = - verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom"); + Path parentConsumerPom = verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom"); assertTrue(Files.exists(parentConsumerPom), "Parent consumer POM should exist"); Model parentConsumer = readModel(parentConsumerPom); assertEquals("4.0.0", parentConsumer.getModelVersion(), "Parent consumer POM should be 4.0.0"); // Verify parent build POM retains 4.1.0 features - Path parentBuildPom = - verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom", "build"); + Path parentBuildPom = verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom", "build"); assertTrue(Files.exists(parentBuildPom), "Parent build POM should exist"); Model parentBuild = readModel(parentBuildPom); // Build POM should retain subprojects (4.1.0 feature) @@ -71,8 +69,7 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { assertTrue(!parentBuild.getSubprojects().isEmpty(), "Build POM should retain subprojects"); // Verify child consumer POM is 4.0.0 - Path childConsumerPom = - verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom"); + Path childConsumerPom = verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom"); assertTrue(Files.exists(childConsumerPom), "Child consumer POM should exist"); Model childConsumer = readModel(childConsumerPom); assertEquals("4.0.0", childConsumer.getModelVersion(), "Child consumer POM should be 4.0.0"); @@ -83,8 +80,7 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { assertEquals("parent", childConsumer.getParent().getArtifactId()); // Verify child build POM exists - Path childBuildPom = - verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom", "build"); + Path childBuildPom = verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom", "build"); assertTrue(Files.exists(childBuildPom), "Child build POM should exist"); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java index 87431e066a6d..7b758d093293 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java index 25136424c4fb..3f9da336044e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -40,7 +41,8 @@ void testItrNotHonored() throws Exception { verifier.deleteArtifacts("org.apache.maven.its.gh2576"); verifier = newVerifier(testDir.resolve("parent")); - verifier.addCliArguments("install:install-file", "-Dfile=pom.xml", "-DpomFile=pom.xml", "-DlocalRepositoryPath=../repo/"); + verifier.addCliArguments( + "install:install-file", "-Dfile=pom.xml", "-DpomFile=pom.xml", "-DlocalRepositoryPath=../repo/"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index 675307a42b5c..10bb5e4a0fa7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -20,7 +20,6 @@ import java.nio.file.Path; -import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index a3d6ccc5a9ec..3755b7692a94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index fc34fbd38828..3eb05b9cdf29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -160,8 +161,7 @@ public void testitRelocation() throws Exception { // NOTE: The selection of the Turkish language for the JVM locale is essential part of the test verifier.setEnvironmentVariable( "MAVEN_OPTS", - "-Dsettings.security=" + testDir.resolve("settings~security.xml") - + " -Duser.language=tr"); + "-Dsettings.security=" + testDir.resolve("settings~security.xml") + " -Duser.language=tr"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java index 3fbe159d4b35..f6fa8095f1f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 511f43e1b4f0..6b31a9c24a4f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java index eff32cb162bf..55a8dc946b3b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java @@ -22,6 +22,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -87,10 +88,7 @@ public void testitMNG0828() throws Exception { // Map items order is not guaranteed, so only check begin of params ... checkLog(log, "[DEBUG] (f) mapParam = {key"); - checkLog( - log, - "[DEBUG] (f) propertiesFile = " - + testDir.resolve("target/plugin-config.properties")); + checkLog(log, "[DEBUG] (f) propertiesFile = " + testDir.resolve("target/plugin-config.properties")); // Properties item order is not guaranteed, so only check begin of params ... checkLog(log, "[DEBUG] (f) propertiesParam = {key"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index e621cc132dfc..905620d0499e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -77,8 +78,7 @@ public void testitMNG1021() throws Exception { private String getSnapshotVersion(Path artifactDir) throws IOException { try (var stream = Files.list(artifactDir)) { - return stream - .filter(Files::isRegularFile) + return stream.filter(Files::isRegularFile) .map(Path::getFileName) .map(Path::toString) .filter(name -> name.endsWith(".pom")) @@ -86,4 +86,5 @@ private String getSnapshotVersion(Path artifactDir) throws IOException { .map(pomName -> pomName.substring("test-".length(), pomName.length() - ".pom".length())) .orElseThrow(() -> new IllegalStateException("POM not found in " + artifactDir)); } - }} + } +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11133MixinsPrecedenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11133MixinsPrecedenceTest.java index b60d5abf7598..852c99f5694c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11133MixinsPrecedenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11133MixinsPrecedenceTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index e5e5bf1278f2..ad0ff44968cd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index 1094d26a583f..63f531211a81 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java index 8705cecf19f7..f51476cdf41c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index 3eca5494db6e..cf044430752e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java index 95548cc78055..5717b8efea55 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,8 +47,7 @@ public void testitMNG2136() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.addCliArgument( - "-Dexpression.outputFile=" + testDir.resolve("target/expression.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + testDir.resolve("target/expression.properties")); verifier.addCliArgument("-Dexpression.expressions=project/properties"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index 139e02817d3b..4aedc99b2b25 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -50,8 +51,7 @@ public void testitMNG2201() throws Exception { ItUtils.assertCanonicalFileEquals(testDir.resolve("target"), Path.of(props.getProperty("stringParam"))); ItUtils.assertCanonicalFileEquals( testDir.resolve("target"), Path.of(props.getProperty("propertiesParam.buildDir"))); - ItUtils.assertCanonicalFileEquals( - testDir.resolve("target"), Path.of(props.getProperty("mapParam.buildDir"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("target"), Path.of(props.getProperty("mapParam.buildDir"))); assertEquals("4.0.0", props.getProperty("domParam.children.modelVersion.0.value")); assertEquals("org.apache.maven.its.it0104", props.getProperty("domParam.children.groupId.0.value")); assertEquals("1.0-SNAPSHOT", props.getProperty("domParam.children.version.0.value")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index 51be7edd56b7..cecd1ab291f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -18,13 +18,15 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; import java.nio.file.Path; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.NetworkConnector; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java index 659d0da82e46..9269a1a7620c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index 0a1414be0962..780dfef65e09 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -21,6 +21,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java index 315d3424db91..88ca698e2841 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java @@ -21,6 +21,7 @@ import java.net.InetAddress; import java.nio.file.Path; import java.util.Map; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; @@ -68,7 +69,8 @@ protected void setUp() throws Exception { System.out.println("Bound server socket to the HTTP port " + port); resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(testDir.resolve("proxy").toAbsolutePath().toString()); + resourceHandler.setResourceBase( + testDir.resolve("proxy").toAbsolutePath().toString()); handlers = new HandlerList(); handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index f6df341f1d35..5f1f3f8ed449 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 7058602e2f05..08dabfa15af4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index 380bf3bde0bc..ab7484aea79a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -23,6 +23,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -58,8 +59,7 @@ public void testitMNG2790() throws Exception { Path metadataArtifactVersionFile = verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT"); - Path metadataArtifactFile = - verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project"); + Path metadataArtifactFile = verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project"); Date artifactVersionLastUpdated1 = getLastUpdated(metadataArtifactVersionFile); Date artifactLastUpdated1 = getLastUpdated(metadataArtifactFile); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 748051d7318c..c250dd2c87c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java index 16c59534d0fa..12fda9c18310 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -50,8 +51,6 @@ public void testitMNG2871() throws Exception { List compileClassPath = verifier.loadLines("consumer/target/compile.txt"); assertEquals(2, compileClassPath.size()); - ItUtils.assertCanonicalFileEquals( - testDir.resolve("ejbs/target/classes"), - Path.of(compileClassPath.get(1))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("ejbs/target/classes"), Path.of(compileClassPath.get(1))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java index d79efccef4d4..a6042edc53ef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** @@ -47,12 +48,15 @@ public void testitMNG2926() throws Exception { verifier.deleteArtifacts("org.apache.maven.plugins", "mng-2926", "0.1"); verifier.deleteArtifacts("org.apache.maven.plugins", "mng-2926", "0.1"); Files.deleteIfExists(verifier.getArtifactMetadataPath( - "org.apache.maven.plugins", null, null, "maven-metadata-maven-core-it.xml")); - Files.deleteIfExists(verifier.getArtifactMetadataPath("org.apache.maven.plugins", null, null, "resolver-status.properties")); + "org.apache.maven.plugins", null, null, "maven-metadata-maven-core-it.xml")); + Files.deleteIfExists( + verifier.getArtifactMetadataPath("org.apache.maven.plugins", null, null, "resolver-status.properties")); verifier.deleteArtifacts("org.codehaus.mojo", "mng-2926", "0.1"); verifier.deleteArtifacts("org.codehaus.mojo", "mng-2926", "0.1"); - Files.deleteIfExists(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "maven-metadata-maven-core-it.xml")); - Files.deleteIfExists(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "resolver-status.properties")); + Files.deleteIfExists( + verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "maven-metadata-maven-core-it.xml")); + Files.deleteIfExists( + verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "resolver-status.properties")); verifier = newVerifier(testDir); verifier.setAutoclean(false); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index 65803b0cf71f..572153f6d41b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index 03c4b4263c85..d7faf01ec0a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index 90d5202b8c8e..d0ccbee40d86 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index d2f87c6a3c48..e3b826182bb0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index d80e127af8eb..ce9477ad071a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index 686e257d47b2..215adb1a1ca3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index 354b5482f3bb..10a83b3d7cb1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index ed25c71843b1..74a0dbae7011 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java index 3d62be758c9f..b575e4ff46f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index ba869846a6e2..277f40736369 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -18,6 +18,9 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -25,8 +28,7 @@ import java.util.Deque; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; @@ -240,9 +242,7 @@ public void handle( private void assertMetadataMissing(Verifier verifier) { Path metadata = getMetadataFile(verifier); - assertFalse( - Files.exists(metadata), - "Metadata file should NOT be present in local repository: " + metadata); + assertFalse(Files.exists(metadata), "Metadata file should NOT be present in local repository: " + metadata); } private void setupDummyDependency(Verifier verifier, Path testDir, boolean resetUpdateInterval) throws IOException { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index bb06c16bd961..95a05aac6a2d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -22,6 +22,7 @@ import java.io.Reader; import java.nio.file.Files; import java.nio.file.Path; + import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java index bca0022bb202..246067ea0be8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java @@ -21,8 +21,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.Map; import org.eclipse.jetty.server.Handler; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index c234e1c9cd0d..667c153c471b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java index d7c15b88d0c1..a7a6d4608dd8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java index 9476d5675646..e13be707f11c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index f9ef5ec89f38..19010c284161 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -18,11 +18,13 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index 490768bf0535..3fed4b9b105b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java index f7425be7fe33..98c3d4cb95c8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.net.URI; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 8d7794194566..c4d927f57347 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index b70369b04395..b60ca43326c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -18,12 +18,14 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index d119c4ea353a..51c83ccb8a0c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 5bf317846d93..531227976a7b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -65,7 +66,8 @@ public void testitMNG3710POMInheritance() throws Exception { assertTrue(Files.exists(midLevelTouchFile), "Mid-level touch file should have been created in projects tree."); Path childLevelTouchFile = projectsDir.resolve("middle/child/target/touch.txt"); - assertTrue(Files.exists(childLevelTouchFile), "Child-level touch file should have been created in projects tree."); + assertTrue( + Files.exists(childLevelTouchFile), "Child-level touch file should have been created in projects tree."); } @Test diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index c294131b576a..d894fc50de46 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.Map; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -69,7 +70,7 @@ public void testitMNG3714() throws Exception { if (tool.endsWith(".exe")) { tool = tool.substring(0, tool.length() - 4); } - assertEquals(javaHome.resolve( "bin/javac"), Path.of(tool)); + assertEquals(javaHome.resolve("bin/javac"), Path.of(tool)); verifier.verifyFilePresent("target/tool.properties"); Properties toolProps = verifier.loadProperties("target/tool.properties"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 00fa634b843d..e781cb273e68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index 43dee862b2c1..bfd4185f9d90 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -50,8 +50,6 @@ public void testitMNG3747() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/config.properties"); - assertEquals( - "path is: " + testDir.resolve("relative") + "/somepath", - props.getProperty("stringParam")); + assertEquals("path is: " + testDir.resolve("relative") + "/somepath", props.getProperty("stringParam")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index 1d72a0cea1af..dcac3ee50fdf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java index a93ec1862691..795220fe7632 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index 1ff1353c642a..289ba9de0802 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java index 87b7ec687b3a..f88aba758956 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index 07d929d1269b..50415a5c2d59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Properties; import java.util.TreeSet; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -65,7 +66,7 @@ public void testitMNG3843() throws Exception { Properties props; Path basedir; - basedir = verifier.getBasedir().resolve( "test-1"); + basedir = verifier.getBasedir().resolve("test-1"); props = verifier.loadProperties("test-1/target/pom.properties"); assertEquals("org.apache.maven.its.mng3843", props.getProperty("project.groupId")); assertEquals("test-1", props.getProperty("project.artifactId")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java index 012ba0b6da09..34be2bf62f1d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index bd38e122ebcc..546566cf3a8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index 3ccf34a4cc68..9f69bc59c543 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java index adcf309d0221..85ebaba3ee3c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index cfc80feb749f..92cd9a0aa0e6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Locale; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index a8c691a45da4..50affe38f513 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java index 39e3339a63bb..2fa08b17a359 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -58,7 +59,7 @@ public void testitWithPluginMngt() throws Exception { private void testitMNG3925(String project) throws Exception { Path testDir = extractResources("mng-3925"); - Verifier verifier = newVerifier(testDir.resolve(project).resolve( "sub")); + Verifier verifier = newVerifier(testDir.resolve(project).resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java index f5884fb5199d..b948510eaf90 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index 7c50ae1d93fa..737ffd32070f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index 6a4a50064345..6f69d2f0ffa8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -21,6 +21,7 @@ import java.io.File; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; /** @@ -65,10 +66,8 @@ public void testitMNG3951() throws Exception { verifier.verifyFilePresent("target/path.properties"); Properties props = verifier.loadProperties("target/path.properties"); - ItUtils.assertCanonicalFileEquals( - testDir.resolve("tmp"), Path.of(props.getProperty("fileParams.0"))); - ItUtils.assertCanonicalFileEquals( - getRoot(testDir).resolve("tmp"), Path.of(props.getProperty("fileParams.1"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("tmp"), Path.of(props.getProperty("fileParams.0"))); + ItUtils.assertCanonicalFileEquals(getRoot(testDir).resolve("tmp"), Path.of(props.getProperty("fileParams.1"))); ItUtils.assertCanonicalFileEquals(repoDir, Path.of(props.getProperty("stringParams.0"))); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index 479a887ece43..77103a0937ea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java index e19939dbaf90..5ec9aae5b4bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; + import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java index 28c1d14cdf47..63a65e25683c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 0e225c889b5a..b6d766527de0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -18,13 +18,13 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Deque; import java.util.HashMap; import java.util.Map; @@ -158,7 +158,7 @@ public void testit() throws Exception { } private void assertHash(Verifier verifier, String dataFile, String hashExt, String algo) throws Exception { - String actualHash = ItUtils.calcHash(verifier.getBasedir().resolve( dataFile), algo); + String actualHash = ItUtils.calcHash(verifier.getBasedir().resolve(dataFile), algo); String expectedHash = verifier.loadLines(dataFile + hashExt).get(0).trim(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java index 201fea7af183..5760857267ee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index 316a3c8cdfdc..7230d810f463 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java index ac67e9b1bbdf..434e19143056 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index 464d71429225..9d42ff8eb0f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -51,7 +52,6 @@ public void testit() throws Exception { Properties props = verifier.loadProperties("target/basedir.properties"); // NOTE: This deliberately compares the paths on the String level, not via File.equals() - assertEquals( - verifier.getLocalRepository().toString(), props.getProperty("localRepositoryBasedir")); + assertEquals(verifier.getLocalRepository().toString(), props.getProperty("localRepositoryBasedir")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index 86cfa3cbdbce..8eba6fd3237c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index a850fff8c56e..2bbb029edc00 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.Date; import java.util.Deque; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java index 69f327b40dde..1dadf3ff7cf9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java @@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.Deque; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index c70f4c8d4d39..5290a7664b01 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.Map; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java index 3361f8729b2a..07c13a0a3418 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java @@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index a86677b3f550..95bc19464dda 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -62,8 +63,7 @@ public void testitPomPackaging() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - Path installedPom = - verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom"); + Path installedPom = verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom"); String pom = Files.readString(installedPom); assertTrue(pom.indexOf("Branch-A") > 0); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index 79b8a3084bf8..ee9a2cec6414 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -43,8 +43,7 @@ public void testit() throws Exception { Path testDir = extractResources("mng-4381"); // First, build the test plugin - Verifier verifier = - newVerifier(testDir.resolve("sub-a/maven-it-plugin-extension-consumer")); + Verifier verifier = newVerifier(testDir.resolve("sub-a/maven-it-plugin-extension-consumer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index 8023d19db9b0..98e4867b00df 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -20,7 +20,6 @@ import java.nio.file.Path; -import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 5c57b81181d1..e7f187e7b002 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Map; + import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index 8bc69e6b9999..1d33e2a3e316 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -18,13 +18,15 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; import java.nio.file.Path; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index 46da8a54e369..93405f4dae68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index cb68bd158ce4..c0667101630e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -47,7 +48,9 @@ public void testit() throws Exception { verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.getSystemProperties() - .setProperty("settings.security", testDir.resolve("settings-security.xml").toString()); + .setProperty( + "settings.security", + testDir.resolve("settings-security.xml").toString()); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index aac539391066..c62703bba0ee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index 6ed8de4c79d3..4452b63c27bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -21,8 +21,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.util.Base64; import java.util.Collections; import java.util.Deque; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index 29b8190798d6..6cc6832f0597 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -18,6 +18,9 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -25,8 +28,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -92,7 +94,7 @@ public void handle( } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(Files.exists(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; @@ -170,7 +172,7 @@ public void handle( } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(Files.exists(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; @@ -251,7 +253,7 @@ public void handle( } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) assertFalse(Files.exists(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java index 60e14205803f..7e027c531478 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java index b044c57882da..22966aeaf080 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java @@ -37,8 +37,7 @@ class MavenITmng4559SpacesInJvmOptsTest extends AbstractMavenIntegrationTestCase */ @Test void testIt() throws Exception { - Path basedir = - extractResources("mng-4559-spaces-jvm-opts"); + Path basedir = extractResources("mng-4559-spaces-jvm-opts"); Verifier verifier = newVerifier(basedir); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dprop.maven-opts=\"foo bar\""); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java index dfed584206cf..bba1bf13875c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java index a5765eea90a9..f1cc4824c94e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java @@ -25,6 +25,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; + import org.junit.jupiter.api.Test; import static java.nio.file.FileVisitResult.CONTINUE; @@ -58,8 +59,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { verifier1.addCliArgument("package"); verifier1.execute(); - Path module1Jar = - testDir.resolve("module-a/target/module-a-1.0.jar").toAbsolutePath(); + Path module1Jar = testDir.resolve("module-a/target/module-a-1.0.jar").toAbsolutePath(); verifier1.verifyErrorFreeLog(); verifier1.verifyFilePresent(module1Jar.toString()); @@ -83,16 +83,14 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { verifier2.addCliArgument("compile"); verifier2.execute(); - Path module1PropertiesFile = testDir - .resolve("module-a/target/classes/example.properties") - .toAbsolutePath(); + Path module1PropertiesFile = + testDir.resolve("module-a/target/classes/example.properties").toAbsolutePath(); verifier2.verifyFilePresent(module1PropertiesFile.toString()); assertTrue( Files.getLastModifiedTime(module1PropertiesFile).compareTo(Files.getLastModifiedTime(module1Jar)) >= 0); - Path module1Class = testDir - .resolve("module-a/target/classes/org/apache/maven/it/Example.class") + Path module1Class = testDir.resolve("module-a/target/classes/org/apache/maven/it/Example.class") .toAbsolutePath(); verifier2.verifyErrorFreeLog(); verifier2.verifyFilePresent(module1Class.toString()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 8e61fff16953..0680cf7957bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Map; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index 182164d26f80..eeeb902927f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.Map; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index e8a7fcd495a8..c01991c11a90 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index af24096b19ce..0accc0df4965 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 7e3184f4d7e0..05f52eef7fc0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.net.InetAddress; +import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java index c781a89d11a1..a1225d3a522e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -53,12 +54,8 @@ public void testit() throws Exception { assertEquals("0", props.getProperty("stringParams")); assertEquals("2", props.getProperty("fileParams")); - ItUtils.assertCanonicalFileEquals( - testDir.resolve("foo"), - Path.of(props.getProperty("fileParams.0"))); - assertEquals( - testDir.resolve("bar"), - Path.of(props.getProperty("fileParams.1"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("foo"), Path.of(props.getProperty("fileParams.0"))); + assertEquals(testDir.resolve("bar"), Path.of(props.getProperty("fileParams.1"))); assertEquals("5", props.getProperty("listParam")); assertEquals("", props.getProperty("listParam.0", "")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java index 70d393afdc8b..e86b63f737eb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; + import org.junit.jupiter.api.Test; /** @@ -47,7 +48,6 @@ public void testit() throws Exception { Properties props = verifier.loadProperties("target/config.properties"); ItUtils.assertCanonicalFileEquals( - testDir.resolve("src/main/java"), - Paths.get(props.getProperty("stringParams.0"))); + testDir.resolve("src/main/java"), Paths.get(props.getProperty("stringParams.0"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index 4fc3304091ff..57be8426cec7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index 9c83c023f92a..06308a40cd86 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -23,6 +23,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; + import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index 5acbe5bf79bc..0eab7ef24095 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -18,6 +18,9 @@ */ package org.apache.maven.it; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -25,8 +28,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index 568d004e88c6..b23e6476a85c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index cca490145e88..b2280805c490 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java index 87a892577c06..5bd1eb4ea2e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index 9bcd4e0f7d80..89745540310a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index 8e69b7c99ff8..1590355b8f42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index 0b562ee463fe..d7038c870178 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java index 33baa11561e9..e70ee6c31c55 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase { @@ -47,8 +48,8 @@ public void testWorkspaceReader() throws Exception { // compile the test project verifier = newVerifier(projectDir); - verifier.addCliArgument("-Dmaven.ext.class.path=" - + extensionDir.resolve("target/mng-5591-workspace-reader-extension-0.1.jar")); + verifier.addCliArgument( + "-Dmaven.ext.class.path=" + extensionDir.resolve("target/mng-5591-workspace-reader-extension-0.1.jar")); verifier.addCliArgument("compile"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java index 8951ed078287..cc067dce2816 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java index d365cd242b95..18e39031df18 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java index 34c06638a196..7d85294cbfef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -56,9 +57,12 @@ void testAfterPhaseExecutionOnFailure() throws Exception { verifier.verifyFilePresent("target/after-verify.txt"); // Verify the execution order through timestamps - long beforeTime = Files.getLastModifiedTime(testDir.resolve("target/before-verify.txt")).toMillis(); - long failTime = Files.getLastModifiedTime(testDir.resolve("target/verify-failed.txt")).toMillis(); - long afterTime = Files.getLastModifiedTime(testDir.resolve("target/after-verify.txt")).toMillis(); + long beforeTime = Files.getLastModifiedTime(testDir.resolve("target/before-verify.txt")) + .toMillis(); + long failTime = Files.getLastModifiedTime(testDir.resolve("target/verify-failed.txt")) + .toMillis(); + long afterTime = Files.getLastModifiedTime(testDir.resolve("target/after-verify.txt")) + .toMillis(); assertTrue(beforeTime <= failTime); assertTrue(failTime <= afterTime); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java index d35a0546e4da..117ba5f685c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java @@ -25,6 +25,7 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,7 +46,8 @@ public void testWithoutBuildConsumer() throws Exception { Verifier verifier = newVerifier(testDir); Map filterProperties = Collections.singletonMap( "${javaAgentJar}", - verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar").toString()); + verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar") + .toString()); verifier.filterFile(".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties); verifier.setForkJvm(true); // pick up agent @@ -80,7 +82,8 @@ public void testWithBuildConsumer() throws Exception { Verifier verifier = newVerifier(testDir); Map filterProperties = Collections.singletonMap( "${javaAgentJar}", - verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar").toString()); + verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar") + .toString()); verifier.filterFile(".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties); verifier.setLogFileName("log-bc.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index ba1a4c196d74..6428513a950f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.Map; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java index 9df90fb51bdd..c8d7872a63f3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index 1f927fb12879..87717724e2f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java index 74e6876b2f83..010e39cc2d32 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index fca8437745a9..335af7791e4b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Map; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index f6de3092dd26..af28a40d7b62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index 831936bf6888..753063b37775 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -89,8 +90,7 @@ protected void runCoreExtensionWithOption(String option, String subdir, boolean } Verifier verifier = newVerifier(basedir); - verifier.addCliArgument( - "-Dexpression.outputFile=" + basedir.resolve("expression.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve("expression.properties")); verifier.addCliArgument(option); // -f/--file client/pom.xml verifier.addCliArgument((pom ? testDir.resolve("pom.xml") : testDir).toString()); verifier.setForkJvm(true); // force forked JVM since we need the shell script to detect .mvn/ location diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java index 8f6cf57d3983..f2c44036296c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java index 59edc2fc11ee..6a8519034876 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java index ec38c8d876bb..65ffa91e8849 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index ab550f587a4d..8f8cf12c7ccc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java index 35a35a2f5d32..1f2e3260a105 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -90,8 +91,7 @@ protected void runCoreExtensionWithOption(String option, String subdir, boolean } Verifier verifier = newVerifier(basedir); - verifier.addCliArgument( - "-Dexpression.outputFile=" + basedir.resolve("expression.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve("expression.properties")); verifier.addCliArgument(option); // -f/--file client/pom.xml verifier.addCliArgument((pom ? testDir.resolve("pom.xml") : testDir).toString()); verifier.setForkJvm(true); // force forked JVM since we need the shell script to detect .mvn/ location diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java index f7563df45a82..e1211be92e47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -77,8 +78,8 @@ protected void runWithLineEndings(String lineEndings, String test) throws Except Verifier verifier = newVerifier(baseDir); verifier.setLogFileName("log-" + test + ".txt"); - verifier.addCliArgument( - "-Dexpression.outputFile=" + baseDir.resolve("expression-" + test + ".properties").toAbsolutePath()); + verifier.addCliArgument("-Dexpression.outputFile=" + + baseDir.resolve("expression-" + test + ".properties").toAbsolutePath()); verifier.setForkJvm(true); // custom .mvn/jvm.config verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java index bd6820245f65..15e90d4e991b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java index 8b2ea7e9774f..281b7b451910 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java index 1bea7f2e2f64..3321e0b5d854 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java index 14d8267af692..9b75898b2dfd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -69,8 +70,7 @@ public void testPublishedPoms() throws Exception { assertTextEquals( testDir.resolve("expected/parent.pom"), - verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom")); + verifier.getArtifactPath("org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom")); assertTextEquals( testDir.resolve("expected/parent-build.pom"), @@ -107,14 +107,10 @@ static void assertTextEquals(Path file1, Path file2) throws IOException { assertEquals( String.join( "\n", - Files.readAllLines(file1).stream() - .map(String::trim) - .toList()), + Files.readAllLines(file1).stream().map(String::trim).toList()), String.join( "\n", - Files.readAllLines(file2).stream() - .map(String::trim) - .toList()), + Files.readAllLines(file2).stream().map(String::trim).toList()), "pom files differ " + file1 + " " + file2); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index e243826965ea..4ad7c3726526 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -52,14 +52,14 @@ void testItShouldWaitForConcurrentModulesToFinish() throws Exception { // expected } - List module1Lines = verifier.loadFile( - testDir.resolve("module-1/target/surefire-reports/mng6720.Module1Test-output.txt")); + List module1Lines = + verifier.loadFile(testDir.resolve("module-1/target/surefire-reports/mng6720.Module1Test-output.txt")); assertTrue(module1Lines.contains("Module1"), "module-1 should be executed"); - List module2Lines = verifier.loadFile( - testDir.resolve("module-2/target/surefire-reports/mng6720.Module2Test-output.txt")); + List module2Lines = + verifier.loadFile(testDir.resolve("module-2/target/surefire-reports/mng6720.Module2Test-output.txt")); assertTrue(module2Lines.contains("Module2"), "module-2 should be executed"); - List module3Lines = verifier.loadFile( - testDir.resolve("module-3/target/surefire-reports/mng6720.Module3Test-output.txt")); + List module3Lines = + verifier.loadFile(testDir.resolve("module-3/target/surefire-reports/mng6720.Module3Test-output.txt")); assertTrue(module3Lines.isEmpty(), "module-3 should be skipped"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index 52cb8aa2c4db..b92a55b600df 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -24,6 +24,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; + import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java index 8f9bedfcd0d2..c81bc0f25f71 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java @@ -20,6 +20,7 @@ import java.net.URI; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** @@ -41,8 +42,7 @@ public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTr Path testDir = extractResources(RESOURCE_PATH); // First, build the test plugin - Verifier verifier = - newVerifier(testDir.resolve("mng6759-plugin-resolves-project-dependencies")); + Verifier verifier = newVerifier(testDir.resolve("mng6759-plugin-resolves-project-dependencies")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -59,7 +59,8 @@ public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTr private void installDependencyCInCustomRepo() throws Exception { Path dependencyCProjectDir = extractResources(RESOURCE_PATH + "/dependency-in-custom-repo"); - URI customRepoUri = dependencyCProjectDir.resolve("target").resolve("repo").toUri(); + URI customRepoUri = + dependencyCProjectDir.resolve("target").resolve("repo").toUri(); Verifier verifier = newVerifier(dependencyCProjectDir); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java index 2ddf411fc5f7..e38c7bc01c46 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java @@ -20,7 +20,6 @@ import java.nio.file.Path; - import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java index d3a76ac9b30b..dbaa93cd296d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -69,8 +70,7 @@ public void testPublishedPoms() throws Exception { assertTextEquals( testDir.resolve("expected/parent.pom"), - verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom")); + verifier.getArtifactPath("org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( testDir.resolve("expected/parent-build.pom"), @@ -132,14 +132,10 @@ static void assertTextEquals(Path file1, Path file2) throws IOException { assertEquals( String.join( "\n", - Files.readAllLines(file1).stream() - .map(String::trim) - .toList()), + Files.readAllLines(file1).stream().map(String::trim).toList()), String.join( "\n", - Files.readAllLines(file2).stream() - .map(String::trim) - .toList()), + Files.readAllLines(file2).stream().map(String::trim).toList()), "pom files differ " + file1 + " " + file2); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index a503c4fbe0c5..7bc35496cd3b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** @@ -45,13 +46,13 @@ public void testit() throws Exception { verifier.deleteArtifact("mng-6972-allow-access-to-graph-package", "build-plugin", "1.0", "jar"); verifier.deleteArtifact("mng-6972-allow-access-to-graph-package", "using-module", "1.0", "jar"); - verifier = newVerifier(testDir.resolve( "build-plugin")); + verifier = newVerifier(testDir.resolve("build-plugin")); verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.toString()); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.resolve( "using-module")); + verifier = newVerifier(testDir.resolve("using-module")); verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.toString()); verifier.addCliArgument("install"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java index 5d19eef9a5b7..7dee2259117e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,10 +44,7 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("target/pom.properties"); props = verifier.loadProperties("target/pom.properties"); - assertEquals( - testDir.toString(), - props.getProperty("project.properties.rootdir"), - "project.properties.rootdir"); + assertEquals(testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); @@ -91,10 +89,7 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-b/target/pom.properties"); props = verifier.loadProperties("module-b/target/pom.properties"); - assertEquals( - testDir.toString(), - props.getProperty("project.properties.rootdir"), - "project.properties.rootdir"); + assertEquals(testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); @@ -105,10 +100,7 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-b/module-b-1/target/pom.properties"); props = verifier.loadProperties("module-b/module-b-1/target/pom.properties"); - assertEquals( - testDir.toString(), - props.getProperty("project.properties.rootdir"), - "project.properties.rootdir"); + assertEquals(testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); @@ -189,10 +181,7 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc verifier.verifyFilePresent("target/pom.properties"); props = verifier.loadProperties("target/pom.properties"); - assertEquals( - testDir.toString(), - props.getProperty("project.properties.rootdir"), - "project.properties.rootdir"); + assertEquals(testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals( testDir.resolve("module-b"), @@ -206,10 +195,7 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc verifier.verifyFilePresent("module-b-1/target/pom.properties"); props = verifier.loadProperties("module-b-1/target/pom.properties"); - assertEquals( - testDir.toString(), - props.getProperty("project.properties.rootdir"), - "project.properties.rootdir"); + assertEquals(testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals( testDir.resolve("module-b"), diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java index b8b6a800c951..2e40107ac68c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java index 7928bdae9e5d..ecdfd956a44e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng7051OptionalProfileActivationTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java index f2c490349ee7..efe12668b175 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java @@ -23,6 +23,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java index aefcc6ee763a..0359d1f70446 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng7112ProjectsWithNonRecursiveTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java index 987a685cd84b..e7a20f25d023 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java index be065e945dce..b062306ae31f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng7160ExtensionClassloader extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java index 31770ffbdcc3..dd30b03a9c47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java index 2a17727900a1..e40e4204e892 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java index 6b61c74492b9..b57caf448243 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java index 6bad0ac0fa9b..9982bf720408 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java index 13ed4239e6c2..80d60a1eb80b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index 6b72a0416cf4..6be4d0cb335f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java index a3b59b469304..c5381aeb6923 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index e2452149f402..78dcc2bb2de4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 24c9e7111795..6c63e5c11ec3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.file.Path; + import org.junit.jupiter.api.Test; public class MavenITmng7487DeadlockTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java index d24bb84b087b..7432cafd2d72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java index 1fbf63f54a4c..ec719cdeac8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java index 85d775fc3fc6..426e674603cc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java index 34d0a9868588..5fad8c1472ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import org.junit.jupiter.api.Test; import static org.junit.Assert.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java index fbbd09a1eaa3..73fe43b23b59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java index af32e75fe17c..0636d69bdd59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java index 17998bdbd30e..b5cc44200191 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java @@ -22,6 +22,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java index 9b110fd96dfe..bada5543332f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; @@ -36,7 +37,8 @@ public MavenITmng8106OverlappingDirectoryRolesTest() { public void testDirectoryOverlap() throws Exception { Path testDir = extractResources("mng-8106"); String repo = testDir.resolve("repo").toString(); - String tailRepo = Path.of(System.getProperty("user.home"), ".m2", "repository").toString(); + String tailRepo = + Path.of(System.getProperty("user.home"), ".m2", "repository").toString(); Verifier verifier = newVerifier(testDir.resolve("plugin")); verifier.addCliArgument("-X"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java index 37cef6177473..28c934e5be5e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java index f9e1f67ad173..0dfcb5a1f4e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java index a52d9b57cc95..fb5f3f432969 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java @@ -20,7 +20,6 @@ import java.nio.file.Path; -import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java index 845933cb5e59..dbec8b07e7c8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java @@ -19,7 +19,6 @@ package org.apache.maven.it; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java index 978fb8e37a79..788da081fb32 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java index e864962b5503..51c2f5e24c60 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java @@ -42,8 +42,7 @@ class MavenITmng8414ConsumerPomWithNewFeaturesTest extends AbstractMavenIntegrat */ @Test void testNotPreserving() throws Exception { - Path basedir = - extractResources("mng-8414-consumer-pom-with-new-features"); + Path basedir = extractResources("mng-8414-consumer-pom-with-new-features"); Verifier verifier = newVerifier(basedir.toString(), null); verifier.addCliArguments("package", "-Dmaven.consumer.pom.flatten=true"); @@ -73,8 +72,7 @@ void testNotPreserving() throws Exception { */ @Test void testPreserving() throws Exception { - Path basedir = - extractResources("mng-8414-consumer-pom-with-new-features"); + Path basedir = extractResources("mng-8414-consumer-pom-with-new-features"); Verifier verifier = newVerifier(basedir.toString(), null); verifier.setLogFileName("log-preserving.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java index 4dcf2055dcf5..5b57bb553513 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.List; import java.util.stream.Stream; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -38,8 +39,7 @@ class MavenITmng8523ModelPropertiesTest extends AbstractMavenIntegrationTestCase */ @Test void testIt() throws Exception { - Path basedir = - extractResources("mng-8523-model-properties"); + Path basedir = extractResources("mng-8523-model-properties"); Verifier verifier = newVerifier(basedir); verifier.addCliArguments("install", "-DmavenVersion=4.0.0-rc-2", "-Dmaven.consumer.pom.flatten=true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java index 8bba770bd9a5..470bef850592 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java @@ -19,6 +19,7 @@ package org.apache.maven.it; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java index daba239c79bb..856fd558b161 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.List; import java.util.stream.Stream; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,8 +40,7 @@ class MavenITmng8527ConsumerPomTest extends AbstractMavenIntegrationTestCase { */ @Test void testIt() throws Exception { - Path basedir = - extractResources("mng-8527-consumer-pom"); + Path basedir = extractResources("mng-8527-consumer-pom"); Verifier verifier = newVerifier(basedir); verifier.addCliArguments("install", "-Dmaven.consumer.pom.flatten=true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java index d7df607dba89..3c82395d6628 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Properties; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -36,8 +37,7 @@ public void testProjectBasedirSubstitution() throws Exception { Path testDir = extractResources("mng-8598"); Verifier verifier = newVerifier(testDir); - verifier.addCliArgument( - "-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); + verifier.addCliArgument("-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); verifier.setForkJvm(true); // custom .mvn/jvm.config verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java index 1ea61f448a32..4f6a1b296f44 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java @@ -20,6 +20,7 @@ import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.Test; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java index f851c62012dd..7b72e998a87d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 75b586a3b1f1..fac0b2630003 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -24,6 +24,7 @@ import java.util.Comparator; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.junit.jupiter.api.ClassDescriptor; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.ClassOrdererContext; diff --git a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java index 8799bc8ea313..2b1447503dcb 100644 --- a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java +++ b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/test/java/com/gitlab/tkslaw/ditests/TestProviders.java @@ -24,13 +24,13 @@ import org.apache.maven.api.di.Priority; import org.apache.maven.api.di.Provides; import org.apache.maven.api.di.Singleton; -import org.apache.maven.testing.plugin.stubs.SessionMock; import org.apache.maven.api.services.DependencyResolver; import org.apache.maven.api.services.OsService; import org.apache.maven.api.services.ToolchainManager; import org.apache.maven.impl.DefaultToolchainManager; import org.apache.maven.impl.InternalSession; import org.apache.maven.impl.model.DefaultOsService; +import org.apache.maven.testing.plugin.stubs.SessionMock; import org.mockito.Mockito; import static org.apache.maven.testing.plugin.MojoExtension.getBasedir; diff --git a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/consumer/pom.xml b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/consumer/pom.xml index f3541ec21975..0db47a2a013b 100644 --- a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/consumer/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - + org.apache.maven.its.gh11314 test-project 0.0.1-SNAPSHOT - + consumer jar diff --git a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/plugin/src/main/java/org/apache/maven/its/gh11314/TestMojo.java b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/plugin/src/main/java/org/apache/maven/its/gh11314/TestMojo.java index 003248ad6d64..3442f2070136 100644 --- a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/plugin/src/main/java/org/apache/maven/its/gh11314/TestMojo.java +++ b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/plugin/src/main/java/org/apache/maven/its/gh11314/TestMojo.java @@ -18,14 +18,12 @@ */ package org.apache.maven.its.gh11314; -import java.util.Map; import javax.inject.Inject; import javax.inject.Named; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.toolchain.ToolchainFactory; /** diff --git a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/pom.xml b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/pom.xml index facffae04ddf..559548cea8e3 100644 --- a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/pom.xml @@ -6,12 +6,12 @@ 0.0.1-SNAPSHOT pom - - UTF-8 - - plugin consumer + + + UTF-8 + diff --git a/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml b/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml index 75627b32c314..a84ec3ffc716 100644 --- a/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml @@ -19,23 +19,23 @@ under the License. --> - org.apache.maven.reproducer - reproducer-debezium - 1.0-SNAPSHOT - jar + org.apache.maven.reproducer + reproducer-debezium + 1.0-SNAPSHOT + jar - - 11 - 11 - UTF-8 - 3.3.1.Final - + + 11 + 11 + UTF-8 + 3.3.1.Final + - - - io.debezium - debezium-connector-db2 - ${debezium-version} - - - \ No newline at end of file + + + io.debezium + debezium-connector-db2 + ${debezium-version} + + + diff --git a/its/core-it-suite/src/test/resources/gh-11378-sealed-parameter-config/pom.xml b/its/core-it-suite/src/test/resources/gh-11378-sealed-parameter-config/pom.xml index 94ddd9d13534..4728d7ffbd0c 100644 --- a/its/core-it-suite/src/test/resources/gh-11378-sealed-parameter-config/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11378-sealed-parameter-config/pom.xml @@ -6,12 +6,12 @@ 0.0.1-SNAPSHOT pom - - UTF-8 - - plugin consumer + + + UTF-8 + diff --git a/its/core-it-suite/src/test/resources/gh-11381/pom.xml b/its/core-it-suite/src/test/resources/gh-11381/pom.xml index fcfde0d56bbb..30b2f5e96035 100644 --- a/its/core-it-suite/src/test/resources/gh-11381/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11381/pom.xml @@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.maven.its.gh11381 @@ -32,8 +31,8 @@ under the License. - ${project.basedir}/rest target-dir + ${project.basedir}/rest **/*.yml @@ -41,4 +40,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11384/pom.xml b/its/core-it-suite/src/test/resources/gh-11384/pom.xml index 0c23b6b95c84..4aff34d4ad20 100644 --- a/its/core-it-suite/src/test/resources/gh-11384/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11384/pom.xml @@ -15,4 +15,3 @@ https://github.com/slackapi/java-slack-sdk - diff --git a/its/core-it-suite/src/test/resources/gh-11399-flatten-plugin-parent-cycle/pom.xml b/its/core-it-suite/src/test/resources/gh-11399-flatten-plugin-parent-cycle/pom.xml index 36aee9c658ad..7ce01ae3b768 100644 --- a/its/core-it-suite/src/test/resources/gh-11399-flatten-plugin-parent-cycle/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11399-flatten-plugin-parent-cycle/pom.xml @@ -17,52 +17,47 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.apache - apache - 35 - + + org.apache + apache + 35 + - org.apache.maven.its.gh11399 - test-project - 1.0-SNAPSHOT - jar + org.apache.maven.its.gh11399 + test-project + 1.0-SNAPSHOT + jar - GH-11399 Flatten Plugin Parent Cycle Test - - Test project to verify that flatten-maven-plugin with updatePomFile=true - does not cause a false parent cycle detection error. - + GH-11399 Flatten Plugin Parent Cycle Test + Test project to verify that flatten-maven-plugin with updatePomFile=true + does not cause a false parent cycle detection error. - - - - org.codehaus.mojo - flatten-maven-plugin - 1.7.3 - - - flatten - process-resources - - flatten - - - target - true - - expand - - - - - - - + + + + org.codehaus.mojo + flatten-maven-plugin + 1.7.3 + + + flatten + + flatten + + process-resources + + target + true + + expand + + + + + + + - diff --git a/its/core-it-suite/src/test/resources/gh-11409/pom.xml b/its/core-it-suite/src/test/resources/gh-11409/pom.xml index 427a9926e9d4..fe19bbce79f9 100644 --- a/its/core-it-suite/src/test/resources/gh-11409/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11409/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 test.gh11409 @@ -46,4 +44,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11409/subproject/pom.xml b/its/core-it-suite/src/test/resources/gh-11409/subproject/pom.xml index 97880768d6fd..f024eadf9e36 100644 --- a/its/core-it-suite/src/test/resources/gh-11409/subproject/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11409/subproject/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -45,4 +43,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/bom/pom.xml b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/bom/pom.xml index 8b83130b30d1..ce090bb12040 100644 --- a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/bom/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/bom/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -33,11 +31,11 @@ under the License. GH-11427 BOM - - 4.13.2 - + + 4.13.2 + - + org.apache.maven.its.gh-11427 @@ -52,4 +50,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/module/pom.xml b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/module/pom.xml index e90f5c3bb31b..e681525d8123 100644 --- a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/module/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/module/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -33,16 +31,15 @@ under the License. GH-11427 Module - - 4.13.2 - - - - - junit - junit - ${junit.version} - - + + 4.13.2 + + + + + junit + junit + ${junit.version} + + - diff --git a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/pom.xml b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/pom.xml index 08d3c3babdb6..03ecb028fb47 100644 --- a/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11427-bom-consumer-pom/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.maven.its.gh-11427 @@ -34,4 +32,3 @@ under the License. module - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml index 20bb8dcffd4f..67c7d1478870 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml @@ -35,4 +35,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/src/main/java/Test.java b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/src/main/java/Test.java index fccbf31fcd08..2fc2e941a20f 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/src/main/java/Test.java +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/src/main/java/Test.java @@ -17,4 +17,3 @@ * under the License. */ public class Test {} - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml index 693c612c72f1..8e944ca21fd0 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml @@ -35,4 +35,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/src/main/java/Test.java b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/src/main/java/Test.java index fccbf31fcd08..2fc2e941a20f 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/src/main/java/Test.java +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/src/main/java/Test.java @@ -17,4 +17,3 @@ * under the License. */ public class Test {} - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml index b4f4ef681319..05026364ca9c 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.2.0 org.apache.maven.its.gh11456 preserve-model-version @@ -35,4 +35,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/src/main/java/Test.java b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/src/main/java/Test.java index fccbf31fcd08..2fc2e941a20f 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/src/main/java/Test.java +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/src/main/java/Test.java @@ -17,4 +17,3 @@ * under the License. */ public class Test {} - diff --git a/its/core-it-suite/src/test/resources/gh-11485-at-sign/pom.xml b/its/core-it-suite/src/test/resources/gh-11485-at-sign/pom.xml index 9fdbc2444b6e..2b852ca80ee6 100644 --- a/its/core-it-suite/src/test/resources/gh-11485-at-sign/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11485-at-sign/pom.xml @@ -17,9 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.maven.its.gh11485 @@ -28,10 +26,8 @@ under the License. pom Test @ character in jvm.config - - Verify that @ character in jvm.config values is handled correctly. - This is important for Jenkins workspaces like workspace/project_PR-350@2 - + Verify that @ character in jvm.config values is handled correctly. + This is important for Jenkins workspaces like workspace/project_PR-350@2 ${path.with.at} @@ -48,10 +44,10 @@ under the License. 2.1-SNAPSHOT - validate eval + validate target/pom.properties @@ -67,4 +63,3 @@ under the License. - diff --git a/its/core-it-suite/src/test/resources/gh-11715/pom.xml b/its/core-it-suite/src/test/resources/gh-11715/pom.xml index 212040f339ab..e56c0b9237e2 100644 --- a/its/core-it-suite/src/test/resources/gh-11715/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11715/pom.xml @@ -1,7 +1,5 @@ - + 4.1.0 org.apache.maven.its.gh11715 effective-pom-namespace diff --git a/its/core-it-suite/src/test/resources/gh-11772-consumer-pom-410/pom.xml b/its/core-it-suite/src/test/resources/gh-11772-consumer-pom-410/pom.xml index e6061f924212..d2ffabfab758 100644 --- a/its/core-it-suite/src/test/resources/gh-11772-consumer-pom-410/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11772-consumer-pom-410/pom.xml @@ -24,10 +24,6 @@ under the License. 1.0.0-SNAPSHOT pom - - child - - @@ -38,4 +34,8 @@ under the License. + + child + + diff --git a/its/core-it-suite/src/test/resources/gh-12305-invalid-collect-request/pom.xml b/its/core-it-suite/src/test/resources/gh-12305-invalid-collect-request/pom.xml index abac94863142..9f460ea205a6 100644 --- a/its/core-it-suite/src/test/resources/gh-12305-invalid-collect-request/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-12305-invalid-collect-request/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.apache.maven.its.gh12305 test diff --git a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/consumer/pom.xml b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/consumer/pom.xml index fd5afce18514..08d712e912c8 100644 --- a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/consumer/pom.xml @@ -1,15 +1,15 @@ - 4.0.0 - org.apache.maven.its.gh2576 - consumer - 1.0-SNAPSHOT + 4.0.0 + org.apache.maven.its.gh2576 + consumer + 1.0-SNAPSHOT - - - org.apache.maven.its.gh2576 - dep - 1.0-SNAPSHOT - - - \ No newline at end of file + + + org.apache.maven.its.gh2576 + dep + 1.0-SNAPSHOT + + + diff --git a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/dep/pom.xml b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/dep/pom.xml index 866560cdf13b..ffd331789f6a 100644 --- a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/dep/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/dep/pom.xml @@ -1,22 +1,22 @@ - 4.0.0 - - org.apache.maven.its.gh2576 - parent - 1.0-SNAPSHOT - + 4.0.0 + + org.apache.maven.its.gh2576 + parent + 1.0-SNAPSHOT + - dep + dep - - - foo - file:///${basedir}/../repo - - ignore - true - - - - \ No newline at end of file + + + + true + ignore + + foo + file:///${basedir}/../repo + + + diff --git a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/parent/pom.xml b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/parent/pom.xml index 31ac88e50dfc..c4220d12de5c 100644 --- a/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-2576-itr-not-honored/parent/pom.xml @@ -1,8 +1,8 @@ - 4.0.0 - org.apache.maven.its.gh2576 - parent - 1.0-SNAPSHOT - pom - \ No newline at end of file + 4.0.0 + org.apache.maven.its.gh2576 + parent + 1.0-SNAPSHOT + pom + diff --git a/its/core-it-suite/src/test/resources/settings-profile-aether-properties/pom.xml b/its/core-it-suite/src/test/resources/settings-profile-aether-properties/pom.xml index 4e3e07381b5e..bba79e4cc03a 100644 --- a/its/core-it-suite/src/test/resources/settings-profile-aether-properties/pom.xml +++ b/its/core-it-suite/src/test/resources/settings-profile-aether-properties/pom.xml @@ -26,9 +26,7 @@ under the License. pom Maven Integration Test :: Settings Profile Aether Properties - - Minimal project for proving that aether.enhancedLocalRepository.* + Minimal project for proving that aether.enhancedLocalRepository.* properties set in an active-by-default settings.xml profile are honored - by the resolver at local repository manager initialization. - + by the resolver at local repository manager initialization.