Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-8190] Fix ITs (#359)

This commit is contained in:
Guillaume Nodet 2024-09-11 19:19:53 +02:00 committed by GitHub
parent 4fc65368c7
commit e6af8ffeee
19 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
View File

@ -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();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
View File

@ -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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
View File

@ -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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
View File

@ -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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
View File

@ -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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
View File

@ -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();

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>parent</artifactId>
<version>0.9-${changelist}-SNAPSHOT</version>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>utils-parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>parent</artifactId>
<version>0.9-${changelist}-SNAPSHOT</version>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>parent</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent>
<relativePath>../utils-parent</relativePath>
</parent>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent />
<artifactId>simple-weather</artifactId>
<packaging>jar</packaging>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent />
<artifactId>simple-webapp</artifactId>

3
its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
View File

@ -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">
<modelVersion>4.0.0</modelVersion>
<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">
<parent />
<artifactId>utils-parent</artifactId>
<packaging>pom</packaging>

4
its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml
View File

@ -17,9 +17,7 @@
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.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
<groupId>org.apache.maven.its.mng7360</groupId>
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>