diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index 10c59d222577..bd890f2559aa 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 @@ -375,6 +377,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 @@ -386,6 +398,11 @@ under the License. + + false + true + true + pom.xml src/test/resources/**/pom.xml @@ -397,6 +414,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/MavenITConsumerPomBomFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java index 22f913910967..1aa956d2f5f8 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; @@ -102,8 +101,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 f0d735dad0da..711ec8fcc1ac 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 @@ -24,8 +24,7 @@ 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/MavenITgh11356InvalidTransitiveRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java index 1b00323acdab..6a47cae3af7f 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.io.File; + 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 33d68092f11c..67cfff4b91ff 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 @@ -58,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 5c60d9082091..41087c8f8f87 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 b5ecf4e42011..efd05fcc27ae 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 @@ -58,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 c7aec3f6e85e..68dac99a4637 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 81efacfdeda0..a1f10c6d647a 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 @@ -44,17 +44,16 @@ class MavenITgh11427BomConsumerPomTest extends AbstractMavenIntegrationTestCase */ @Test void testBomConsumerPomWithoutFlatten() throws Exception { - Path basedir = extractResources("/gh-11427-bom-consumer-pom") - .getAbsoluteFile() - .toPath(); + Path basedir = + extractResources("/gh-11427-bom-consumer-pom").getAbsoluteFile().toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArguments("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - Path consumerPomPath = Paths.get( - verifier.getArtifactPath("org.apache.maven.its.gh-11427", "bom", "1.0.0-SNAPSHOT", "pom")); + Path consumerPomPath = + Paths.get(verifier.getArtifactPath("org.apache.maven.its.gh-11427", "bom", "1.0.0-SNAPSHOT", "pom")); assertTrue(Files.exists(consumerPomPath), "consumer pom not found at " + consumerPomPath); @@ -82,17 +81,16 @@ void testBomConsumerPomWithoutFlatten() throws Exception { */ @Test void testBomConsumerPomWithFlatten() throws Exception { - Path basedir = extractResources("/gh-11427-bom-consumer-pom") - .getAbsoluteFile() - .toPath(); + Path basedir = + extractResources("/gh-11427-bom-consumer-pom").getAbsoluteFile().toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArguments("install", "-Dmaven.consumer.pom.flatten=true"); verifier.execute(); verifier.verifyErrorFreeLog(); - Path consumerPomPath = Paths.get( - verifier.getArtifactPath("org.apache.maven.its.gh-11427", "bom", "1.0.0-SNAPSHOT", "pom")); + Path consumerPomPath = + Paths.get(verifier.getArtifactPath("org.apache.maven.its.gh-11427", "bom", "1.0.0-SNAPSHOT", "pom")); assertTrue(Files.exists(consumerPomPath), "consumer pom not found at " + consumerPomPath); @@ -120,8 +118,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 1d70146ced1e..60927e700e5d 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 @@ -41,7 +41,8 @@ class MavenITgh11456MixinsConsumerPomTest extends AbstractMavenIntegrationTestCa */ @Test void testMixinsWithoutFlattening() throws Exception { - Path basedir = extractResources("/gh-11456-mixins-consumer-pom/non-flattened").toPath(); + Path basedir = + extractResources("/gh-11456-mixins-consumer-pom/non-flattened").toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArgument("-Dmaven.repo.local=" + basedir.resolve("repo")); @@ -61,7 +62,8 @@ void testMixinsWithoutFlattening() throws Exception { */ @Test void testMixinsWithFlattening() throws Exception { - Path basedir = extractResources("/gh-11456-mixins-consumer-pom/flattened").toPath(); + Path basedir = + extractResources("/gh-11456-mixins-consumer-pom/flattened").toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArgument("-Dmaven.repo.local=" + basedir.resolve("repo").toString()); @@ -94,7 +96,8 @@ void testMixinsWithFlattening() throws Exception { */ @Test void testMixinsWithPreserveModelVersion() throws Exception { - Path basedir = extractResources("/gh-11456-mixins-consumer-pom/preserve-model-version").toPath(); + Path basedir = extractResources("/gh-11456-mixins-consumer-pom/preserve-model-version") + .toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArgument("-Dmaven.repo.local=" + basedir.resolve("repo").toString()); @@ -122,4 +125,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 c23128946ea7..9a7ef9f34d2d 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 @@ -85,4 +85,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 d238e7a97d83..f133cc6aae60 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 @@ -56,15 +56,13 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { verifier.verifyErrorFreeLog(); // Verify parent consumer POM (main artifact) is 4.0.0 - Path parentConsumerPom = - Path.of(verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom")); + Path parentConsumerPom = Path.of(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 = - Path.of(verifier.getArtifactPath(GROUP_ID, "parent", "1.0.0-SNAPSHOT", "pom", "build")); + Path parentBuildPom = Path.of(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) @@ -72,8 +70,7 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { assertTrue(!parentBuild.getSubprojects().isEmpty(), "Build POM should retain subprojects"); // Verify child consumer POM is 4.0.0 - Path childConsumerPom = - Path.of(verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom")); + Path childConsumerPom = Path.of(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"); @@ -84,8 +81,7 @@ void testConsumerPomsAre400BuildPomsAre410() throws Exception { assertEquals("parent", childConsumer.getParent().getArtifactId()); // Verify child build POM exists - Path childBuildPom = - Path.of(verifier.getArtifactPath(GROUP_ID, "child", "1.0.0-SNAPSHOT", "pom", "build")); + Path childBuildPom = Path.of(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/MavenITgh11798ConsumerPomProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java index 4e4f11a3baa1..a533c2b84975 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java @@ -34,7 +34,8 @@ class MavenITgh11798ConsumerPomProfileActivationTest extends AbstractMavenIntegr @Test void testConsumerPomResolvesParentProfileProperties() throws Exception { - Path basedir = extractResources("/gh-11798-consumer-pom-profile-activation").toPath(); + Path basedir = + extractResources("/gh-11798-consumer-pom-profile-activation").toPath(); Verifier verifier = newVerifier(basedir.toString()); verifier.addCliArgument("install"); 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 294cd20ed2b5..2b87899ec214 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.io.File; + 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 = new Verifier(new File(testDir, "parent").toString()); - 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/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index dc173a18a1c4..9221dcfe26fe 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.