This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch fix/spotless-its-formatting-steps in repository https://gitbox.apache.org/repos/asf/maven.git
commit ea15980f6e0275f6831b780a0f40c3e8bb474b25 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jun 19 08:53:29 2026 +0200 Fix Spotless config in its/core-it-suite to enforce formatting rules The pluginManagement override for spotless-maven-plugin in its/core-it-suite/pom.xml only had <includes> and <excludes>, which wiped out the formatting steps (palantirJavaFormat, removeUnusedImports, importOrder, licenseHeader, sortPom) since the its/ parent chain (apache:38) does not inherit from maven-parent where these steps are defined. Add the formatting steps explicitly and the maven-shared-resources dependency (for importOrder and licenseHeader config files), then apply formatting to all files in the module. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- its/core-it-suite/pom.xml | 30 ++++++-- .../MavenITConsumerPomBomFromSettingsRepoTest.java | 5 +- .../maven/it/MavenITMissingNamespaceTest.java | 3 +- ...enITgh11356InvalidTransitiveRepositoryTest.java | 1 + .../it/MavenITgh11381ResourceTargetPathTest.java | 1 - ...venITgh11384RecursiveVariableReferenceTest.java | 1 - ...MavenITgh11399FlattenPluginParentCycleTest.java | 1 - .../maven/it/MavenITgh11409ProfileSourceTest.java | 1 - .../maven/it/MavenITgh11427BomConsumerPomTest.java | 22 +++--- .../it/MavenITgh11456MixinsConsumerPomTest.java | 10 +-- .../it/MavenITgh11485AtSignInJvmConfigTest.java | 1 - .../maven/it/MavenITgh11772ConsumerPom410Test.java | 12 ++-- ...nITgh11798ConsumerPomProfileActivationTest.java | 3 +- .../maven/it/MavenITgh2576ItrNotHonoredTest.java | 4 +- .../org/apache/maven/it/TestSuiteOrdering.java | 1 + .../com/gitlab/tkslaw/ditests/TestProviders.java | 2 +- .../gh-11314-v3-mojo-injection/consumer/pom.xml | 4 +- .../org/apache/maven/its/gh11314/TestMojo.java | 2 - .../resources/gh-11314-v3-mojo-injection/pom.xml | 8 +-- .../gh-11356-invalid-transitive-repository/pom.xml | 36 +++++----- .../gh-11378-sealed-parameter-config/pom.xml | 8 +-- .../src/test/resources/gh-11381/pom.xml | 6 +- .../src/test/resources/gh-11384/pom.xml | 1 - .../gh-11399-flatten-plugin-parent-cycle/pom.xml | 83 ++++++++++------------ .../src/test/resources/gh-11409/pom.xml | 5 +- .../src/test/resources/gh-11409/subproject/pom.xml | 5 +- .../gh-11427-bom-consumer-pom/bom/pom.xml | 13 ++-- .../gh-11427-bom-consumer-pom/module/pom.xml | 27 ++++--- .../resources/gh-11427-bom-consumer-pom/pom.xml | 5 +- .../gh-11456-mixins-consumer-pom/flattened/pom.xml | 1 - .../flattened/src/main/java/Test.java | 1 - .../non-flattened/pom.xml | 1 - .../non-flattened/src/main/java/Test.java | 1 - .../preserve-model-version/pom.xml | 3 +- .../preserve-model-version/src/main/java/Test.java | 1 - .../src/test/resources/gh-11485-at-sign/pom.xml | 13 ++-- .../src/test/resources/gh-11715/pom.xml | 4 +- .../resources/gh-11772-consumer-pom-410/pom.xml | 8 +-- .../gh-12305-invalid-collect-request/pom.xml | 4 +- .../gh-2576-itr-not-honored/consumer/pom.xml | 24 +++---- .../resources/gh-2576-itr-not-honored/dep/pom.xml | 36 +++++----- .../gh-2576-itr-not-honored/parent/pom.xml | 12 ++-- .../settings-profile-aether-properties/pom.xml | 6 +- 43 files changed, 194 insertions(+), 222 deletions(-) diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index 10c59d2225..f1b5c92b2c 100644 --- a/its/core-it-suite/pom.xml +++ b/its/core-it-suite/pom.xml @@ -375,28 +375,50 @@ under the License. <artifactId>spotless-maven-plugin</artifactId> <configuration> <java> - <includes> + <palantirJavaFormat> + <version>2.90.0</version> + </palantirJavaFormat> + <removeUnusedImports /> + <importOrder> + <file>config/maven-eclipse-importorder.txt</file> + </importOrder> + <licenseHeader> + <file>config/maven-header-plain.txt</file> + </licenseHeader> + <includes combine.children="append"> <include>src/main/java/**/*.java</include> <include>src/test/java/**/*.java</include> <include>src/test/resources/**/src/main/java/**/*.java</include> <include>src/test/resources/**/src/test/java/**/*.java</include> </includes> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/mng-5208/project/sub-2/src/main/java/Bad.java</exclude> </excludes> </java> <pom> - <includes> + <sortPom> + <expandEmptyElements>false</expandEmptyElements> + <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> + <quiet>true</quiet> + </sortPom> + <includes combine.children="append"> <include>pom.xml</include> <include>src/test/resources/**/pom.xml</include> </includes> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/mng-2254/latin-1/pom.xml</exclude> <exclude>src/test/resources/mng-2362/latin-1/pom.xml</exclude> <exclude>src/test/resources/mng-3839/pom.xml</exclude> </excludes> </pom> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-resources</artifactId> + <version>6</version> + </dependency> + </dependencies> </plugin> </plugins> </pluginManagement> 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 22f9139109..1aa956d2f5 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 f0d735dad0..711ec8fcc1 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 1b00323acd..6a47cae3af 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 33d68092f1..67cfff4b91 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 5c60d90820..41087c8f8f 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("<url>https://github.com/slackapi/java-slack-sdk</url>"); } } - 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 b5ecf4e420..efd05fcc27 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 c7aec3f6e8..68dac99a46 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 81efacfded..a1f10c6d64 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("<version>1.0.0-SNAPSHOT</version>") || content.contains("<version>${"), "Consumer pom should have version for module dependency"); assertTrue( - content.contains("<version>4.13.2</version>"), - "Consumer pom should have version for junit dependency"); + content.contains("<version>4.13.2</version>"), "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 1d70146ced..60927e700e 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 c23128946e..9a7ef9f34d 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 d238e7a97d..f133cc6aae 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 4e4f11a3ba..a533c2b849 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 294cd20ed2..2b87899ec2 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 dc173a18a1..9221dcfe26 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 8799bc8ea3..2b1447503d 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 f3541ec219..0db47a2a01 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 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.maven.its.gh11314</groupId> <artifactId>test-project</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - + <artifactId>consumer</artifactId> <packaging>jar</packaging> 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 003248ad6d..3442f20701 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 facffae04d..559548cea8 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 @@ <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <modules> <module>plugin</module> <module>consumer</module> </modules> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> 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 75627b32c3..a84ec3ffc7 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. --> <project xmlns="http://maven.apache.org/POM/4.1.0"; root="true"> - <groupId>org.apache.maven.reproducer</groupId> - <artifactId>reproducer-debezium</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>jar</packaging> + <groupId>org.apache.maven.reproducer</groupId> + <artifactId>reproducer-debezium</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> - <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <debezium-version>3.3.1.Final</debezium-version> - </properties> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <debezium-version>3.3.1.Final</debezium-version> + </properties> - <dependencies> - <dependency> - <groupId>io.debezium</groupId> - <artifactId>debezium-connector-db2</artifactId> - <version>${debezium-version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file + <dependencies> + <dependency> + <groupId>io.debezium</groupId> + <artifactId>debezium-connector-db2</artifactId> + <version>${debezium-version}</version> + </dependency> + </dependencies> +</project> 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 94ddd9d135..4728d7ffbd 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 @@ <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <modules> <module>plugin</module> <module>consumer</module> </modules> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> 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 fcfde0d56b..30b2f5e960 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.gh11381</groupId> @@ -32,8 +31,8 @@ under the License. <build> <resources> <resource> - <directory>${project.basedir}/rest</directory> <targetPath>target-dir</targetPath> + <directory>${project.basedir}/rest</directory> <includes> <include>**/*.yml</include> </includes> @@ -41,4 +40,3 @@ under the License. </resources> </build> </project> - 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 0c23b6b95c..4aff34d4ad 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 @@ <project.url>https://github.com/slackapi/java-slack-sdk</project.url> </properties> </project> - 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 36aee9c658..7ce01ae3b7 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>35</version> - </parent> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>35</version> + </parent> - <groupId>org.apache.maven.its.gh11399</groupId> - <artifactId>test-project</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>jar</packaging> + <groupId>org.apache.maven.its.gh11399</groupId> + <artifactId>test-project</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> - <name>GH-11399 Flatten Plugin Parent Cycle Test</name> - <description> - Test project to verify that flatten-maven-plugin with updatePomFile=true - does not cause a false parent cycle detection error. - </description> + <name>GH-11399 Flatten Plugin Parent Cycle Test</name> + <description>Test project to verify that flatten-maven-plugin with updatePomFile=true + does not cause a false parent cycle detection error.</description> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>flatten-maven-plugin</artifactId> - <version>1.7.3</version> - <executions> - <execution> - <id>flatten</id> - <phase>process-resources</phase> - <goals> - <goal>flatten</goal> - </goals> - <configuration> - <outputDirectory>target</outputDirectory> - <updatePomFile>true</updatePomFile> - <pomElements> - <parent>expand</parent> - </pomElements> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.7.3</version> + <executions> + <execution> + <id>flatten</id> + <goals> + <goal>flatten</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <outputDirectory>target</outputDirectory> + <updatePomFile>true</updatePomFile> + <pomElements> + <parent>expand</parent> + </pomElements> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> - 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 427a9926e9..fe19bbce79 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>test.gh11409</groupId> @@ -46,4 +44,3 @@ under the License. </profile> </profiles> </project> - 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 97880768d6..f024eadf9e 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -45,4 +43,3 @@ under the License. </profile> </profiles> </project> - 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 8b83130b30..ce090bb120 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -33,11 +31,11 @@ under the License. <name>GH-11427 BOM</name> - <properties> - <junit.version>4.13.2</junit.version> - </properties> + <properties> + <junit.version>4.13.2</junit.version> + </properties> - <dependencyManagement> + <dependencyManagement> <dependencies> <dependency> <groupId>org.apache.maven.its.gh-11427</groupId> @@ -52,4 +50,3 @@ under the License. </dependencies> </dependencyManagement> </project> - 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 e90f5c3bb3..e681525d81 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -33,16 +31,15 @@ under the License. <name>GH-11427 Module</name> - <properties> - <junit.version>4.13.2</junit.version> - </properties> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - </dependencies> + <properties> + <junit.version>4.13.2</junit.version> + </properties> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + </dependencies> </project> - 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 08d3c3babd..03ecb028fb 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.gh-11427</groupId> @@ -34,4 +32,3 @@ under the License. <module>module</module> </modules> </project> - 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 20bb8dcffd..67c7d14788 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. </mixin> </mixins> </project> - 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 fccbf31fcd..2fc2e941a2 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 693c612c72..8e944ca21f 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. </mixin> </mixins> </project> - 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 fccbf31fcd..2fc2e941a2 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 b4f4ef6813..05026364ca 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. --> -<project xmlns="http://maven.apache.org/POM/4.2.0"; root="true" preserve.model.version="true"> +<project xmlns="http://maven.apache.org/POM/4.2.0"; preserve.model.version="true" root="true"> <modelVersion>4.2.0</modelVersion> <groupId>org.apache.maven.its.gh11456</groupId> <artifactId>preserve-model-version</artifactId> @@ -35,4 +35,3 @@ under the License. </mixin> </mixins> </project> - 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 fccbf31fcd..2fc2e941a2 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 9fdbc2444b..2b852ca80e 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.gh11485</groupId> @@ -28,10 +26,8 @@ under the License. <packaging>pom</packaging> <name>Test @ character in jvm.config</name> - <description> - Verify that @ character in jvm.config values is handled correctly. - This is important for Jenkins workspaces like workspace/project_PR-350@2 - </description> + <description>Verify that @ character in jvm.config values is handled correctly. + This is important for Jenkins workspaces like workspace/project_PR-350@2</description> <properties> <pathWithAtProp>${path.with.at}</pathWithAtProp> @@ -48,10 +44,10 @@ under the License. <version>2.1-SNAPSHOT</version> <executions> <execution> - <phase>validate</phase> <goals> <goal>eval</goal> </goals> + <phase>validate</phase> <configuration> <outputFile>target/pom.properties</outputFile> <expressions> @@ -67,4 +63,3 @@ under the License. </plugins> </build> </project> - 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 212040f339..e56c0b9237 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://maven.apache.org/POM/4.1.0"; - xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd";> <modelVersion>4.1.0</modelVersion> <groupId>org.apache.maven.its.gh11715</groupId> <artifactId>effective-pom-namespace</artifactId> 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 e6061f9242..d2ffabfab7 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. <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <subprojects> - <subproject>child</subproject> - </subprojects> - <dependencyManagement> <dependencies> <dependency> @@ -38,4 +34,8 @@ under the License. </dependencies> </dependencyManagement> + <subprojects> + <subproject>child</subproject> + </subprojects> + </project> 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 abac948631..9f460ea205 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.gh12305</groupId> <artifactId>test</artifactId> 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 fd5afce185..08d712e912 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 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven.its.gh2576</groupId> - <artifactId>consumer</artifactId> - <version>1.0-SNAPSHOT</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.its.gh2576</groupId> + <artifactId>consumer</artifactId> + <version>1.0-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.gh2576</groupId> - <artifactId>dep</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> \ No newline at end of file + <dependencies> + <dependency> + <groupId>org.apache.maven.its.gh2576</groupId> + <artifactId>dep</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> 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 866560cdf1..ffd331789f 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 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.maven.its.gh2576</groupId> - <artifactId>parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.its.gh2576</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <artifactId>dep</artifactId> + <artifactId>dep</artifactId> - <repositories> - <repository> - <id>foo</id> - <url>file:///${basedir}/../repo</url> - <snapshots> - <checksumPolicy>ignore</checksumPolicy> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> -</project> \ No newline at end of file + <repositories> + <repository> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + <id>foo</id> + <url>file:///${basedir}/../repo</url> + </repository> + </repositories> +</project> 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 31ac88e50d..c4220d12de 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 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven.its.gh2576</groupId> - <artifactId>parent</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> -</project> \ No newline at end of file + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.its.gh2576</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> +</project> 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 4e3e07381b..bba79e4cc0 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. <packaging>pom</packaging> <name>Maven Integration Test :: Settings Profile Aether Properties</name> - <description> - Minimal project for proving that aether.enhancedLocalRepository.* + <description>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. - </description> + by the resolver at local repository manager initialization.</description> </project>
