From e6af8ffeee14f9cc5b7090f7379a20c38e3f53d7 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 11 Sep 2024 19:19:53 +0200 Subject: [PATCH] [MNG-8190] Fix ITs (#359) --- .../it/MavenITmng1021EqualAttachmentBuildNumberTest.java | 2 +- ...g3396DependencyManagementForOverConstrainedRangesTest.java | 3 --- .../org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java | 4 ++-- .../java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java | 4 ++-- .../it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java | 4 ++-- .../org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 4 ++-- .../mng-6957-buildconsumer/expected/parent-build.pom | 3 +-- .../mng-6957-buildconsumer/expected/simple-parent-build.pom | 3 +-- .../expected/simple-testutils-build.pom | 3 +-- .../mng-6957-buildconsumer/expected/simple-weather-build.pom | 3 +-- .../mng-6957-buildconsumer/expected/simple-webapp-build.pom | 3 +-- .../mng-6957-buildconsumer/expected/utils-parent-build.pom | 3 +-- .../src/test/resources/mng-6957-buildconsumer/pom.xml | 3 +-- .../resources/mng-6957-buildconsumer/simple-parent/pom.xml | 3 +-- .../simple-parent/simple-testutils/pom.xml | 3 +-- .../simple-parent/simple-weather/pom.xml | 3 +-- .../simple-parent/simple-webapp/pom.xml | 3 +-- .../mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml | 3 +-- .../src/test/resources/mng-7360-build-consumer/pom.xml | 4 +--- 19 files changed, 22 insertions(+), 39 deletions(-) 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 d2519e8f84..67d4613b83 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 @@ -48,7 +48,7 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest extends AbstractMavenI verifier.setAutoclean(false); verifier.deleteDirectory("repo"); verifier.deleteArtifacts("org.apache.maven.its.mng1021"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); + verifier.addCliArgument("-Dmaven.consumer.pom=false"); verifier.addCliArgument("initialize"); verifier.execute(); verifier.verifyErrorFreeLog(); 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 9b5f3f357d..83e1c3c478 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 @@ -46,7 +46,6 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar"); verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "B", "1.0", "jar"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -60,7 +59,6 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte verifier.deleteArtifact(GROUP_ID, "A", "3.0", "jar"); verifier.deleteArtifact(GROUP_ID, "plugin", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "plugin", "1.0", "jar"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -70,7 +68,6 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte verifier = newVerifier(testDir.getAbsolutePath(), "remote"); verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index e76d00dc3e..a7f0489687 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -50,7 +50,7 @@ public class MavenITmng5576CdFriendlyVersions extends AbstractMavenIntegrationTe verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dchangelist=changelist"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); + verifier.addCliArgument("-Dmaven.consumerpom=false"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -83,7 +83,7 @@ public class MavenITmng5576CdFriendlyVersions extends AbstractMavenIntegrationTe verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dchangelist=changelist"); - verifier.addCliArgument("-Dmaven.buildconsumer=true"); + verifier.addCliArgument("-Dmaven.consumerpom=true"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); 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 41de0828e9..f8dc860720 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 @@ -57,7 +57,7 @@ public class MavenITmng5669ReadPomsOnce extends AbstractMavenIntegrationTestCase verifier.setAutoclean(false); verifier.addCliArgument("-q"); verifier.addCliArgument("-U"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); + verifier.addCliArgument("-Dmaven.consumerpom=false"); verifier.addCliArgument("verify"); verifier.execute(); @@ -93,7 +93,7 @@ public class MavenITmng5669ReadPomsOnce extends AbstractMavenIntegrationTestCase verifier.setAutoclean(false); verifier.addCliArgument("-q"); verifier.addCliArgument("-U"); - verifier.addCliArgument("-Dmaven.buildconsumer=true"); + verifier.addCliArgument("-Dmaven.consumerpom=true"); verifier.addCliArgument("verify"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 2115822793..219a0b0934 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -58,7 +58,7 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest extends AbstractMaven // verifier.setLogFileName( "log-only.txt" ); verifier.addCliArgument("-Drevision=1.2"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); + verifier.addCliArgument("-Dmaven.consumerpom=false"); verifier.addCliArgument("clean"); verifier.execute(); verifier.addCliArgument("package"); @@ -76,7 +76,7 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest extends AbstractMaven verifier.setLogFileName("log-bc.txt"); verifier.addCliArgument("-Drevision=1.2"); - verifier.addCliArgument("-Dmaven.buildconsumer=true"); + verifier.addCliArgument("-Dmaven.consumerpom=true"); verifier.addCliArgument("clean"); verifier.execute(); verifier.addCliArgument("package"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java index 49e7477ef3..eeb68d1206 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -56,7 +56,7 @@ public class MavenITmng6090CIFriendlyTest extends AbstractMavenIntegrationTestCa verifier.setAutoclean(false); verifier.addCliArgument("-Drevision=1.2"); - verifier.addCliArgument("-Dmaven.buildconsumer=false"); + verifier.addCliArgument("-Dmaven.consumerpom=false"); verifier.setLogFileName("install-log.txt"); verifier.addCliArguments("clean", "install"); verifier.execute(); @@ -82,7 +82,7 @@ public class MavenITmng6090CIFriendlyTest extends AbstractMavenIntegrationTestCa verifier.setForkJvm(true); verifier.addCliArgument("-Drevision=1.2"); - verifier.addCliArgument("-Dmaven.buildconsumer=true"); + verifier.addCliArgument("-Dmaven.consumerpom=true"); verifier.setLogFileName("install-log.txt"); verifier.addCliArguments("clean", "install"); verifier.execute(); diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom index bc932c61da..9cb136ffa2 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom @@ -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.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom index 89ee52ccc4..87e8ac1100 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom @@ -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.sonatype.mavenbook.multi parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom index 75de31ce4c..469c029630 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom @@ -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.sonatype.mavenbook.multi utils-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom index 7fbe5bfa23..9b28b8d760 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom @@ -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.sonatype.mavenbook.multi simple-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom index 655d0ccd17..a3800767fe 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom @@ -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.sonatype.mavenbook.multi simple-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom index 933db5cdb0..1aa6b87d45 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom @@ -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.sonatype.mavenbook.multi simple-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml index ecc43145d7..e4713ea4fd 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/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.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml index 89ee52ccc4..87e8ac1100 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/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.sonatype.mavenbook.multi parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml index 6712f2b139..b9e9b5efe3 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/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 + ../utils-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml index f8e249a469..7da8409ef3 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/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 + simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml index a7512f950e..30e55e7df7 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/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 + simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml index 11da5d6ab9..fb8c07c2d1 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/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 + utils-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml index 09e34ec2a4..127b9cbd2b 100644 --- a/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml @@ -17,9 +17,7 @@ limitations under the License. --> - - 4.0.0 - + org.apache.maven.its.mng7360 parent 1.0-SNAPSHOT