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

Fix IT for trimmed consumer POM (#293)

This commit is contained in:
Guillaume Nodet 2023-09-26 08:51:33 +02:00 committed by GitHub
parent ad1e9257dd
commit caf44be89e
5 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
View File

@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.sonatype.mavenbook.multi</groupId>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version>
</parent>
<artifactId>simple-weather</artifactId> <artifactId>simple-weather</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version>
<name>Multi Chapter Simple Weather API</name> <name>Multi Chapter Simple Weather API</name>
</project> </project>

19
its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
View File

@ -1,29 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.sonatype.mavenbook.multi</groupId>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version>
</parent>
<artifactId>simple-webapp</artifactId> <artifactId>simple-webapp</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version>
<name>Multi Chapter Simple Web Application Project</name> <name>Multi Chapter Simple Web Application Project</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.sonatype.mavenbook.multi</groupId> <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId> <artifactId>simple-weather</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version> <version>0.9-MNG6656-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<finalName>simple-webapp</finalName>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>

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

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.sonatype.mavenbook.multi</groupId>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>utils-parent</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
</parent>
<artifactId>simple-testutils</artifactId> <artifactId>simple-testutils</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
</project> </project>

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

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.sonatype.mavenbook.multi</groupId>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
</parent>
<artifactId>simple-weather</artifactId> <artifactId>simple-weather</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
<name>Multi Chapter Simple Weather API</name> <name>Multi Chapter Simple Weather API</name>
<dependencies> <dependencies>
<dependency> <dependency>
@ -16,4 +13,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

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

@ -1,29 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.sonatype.mavenbook.multi</groupId>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-parent</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
</parent>
<artifactId>simple-webapp</artifactId> <artifactId>simple-webapp</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
<name>Multi Chapter Simple Web Application Project</name> <name>Multi Chapter Simple Web Application Project</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.sonatype.mavenbook.multi</groupId> <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId> <artifactId>simple-weather</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version> <version>0.9-MNG6957-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<finalName>simple-webapp</finalName>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>