Skip to content

Commit 9869b8f

Browse files
gnodetgnodet
committed
Fix IT for trimmed consumer POM
1 parent 37b9369 commit 9869b8f

File tree

5 files changed

+13
-48
lines changed

5 files changed

+13
-48
lines changed

‎core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.mavenbook.multi</groupId>
6-
<artifactId>simple-parent</artifactId>
7-
<version>0.9-MNG6656-SNAPSHOT</version>
8-
</parent>
4+
<groupId>org.sonatype.mavenbook.multi</groupId>
95
<artifactId>simple-weather</artifactId>
6+
<version>0.9-MNG6656-SNAPSHOT</version>
107
<name>Multi Chapter Simple Weather API</name>
118
</project>

‎core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.mavenbook.multi</groupId>
6-
<artifactId>simple-parent</artifactId>
7-
<version>0.9-MNG6656-SNAPSHOT</version>
8-
</parent>
4+
<groupId>org.sonatype.mavenbook.multi</groupId>
95
<artifactId>simple-webapp</artifactId>
6+
<version>0.9-MNG6656-SNAPSHOT</version>
107
<name>Multi Chapter Simple Web Application Project</name>
118
<dependencies>
129
<dependency>
1310
<groupId>org.sonatype.mavenbook.multi</groupId>
1411
<artifactId>simple-weather</artifactId>
1512
<version>0.9-MNG6656-SNAPSHOT</version>
13+
<scope>compile</scope>
1614
</dependency>
1715
</dependencies>
18-
<build>
19-
<finalName>simple-webapp</finalName>
20-
<pluginManagement>
21-
<plugins>
22-
<plugin>
23-
<artifactId>maven-war-plugin</artifactId>
24-
<version>3.3.2</version>
25-
</plugin>
26-
</plugins>
27-
</pluginManagement>
28-
</build>
2916
</project>

‎core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.mavenbook.multi</groupId>
6-
<artifactId>utils-parent</artifactId>
7-
<version>0.9-MNG6957-SNAPSHOT</version>
8-
</parent>
4+
<groupId>org.sonatype.mavenbook.multi</groupId>
95
<artifactId>simple-testutils</artifactId>
6+
<version>0.9-MNG6957-SNAPSHOT</version>
107
</project>

‎core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.mavenbook.multi</groupId>
6-
<artifactId>simple-parent</artifactId>
7-
<version>0.9-MNG6957-SNAPSHOT</version>
8-
</parent>
4+
<groupId>org.sonatype.mavenbook.multi</groupId>
95
<artifactId>simple-weather</artifactId>
6+
<version>0.9-MNG6957-SNAPSHOT</version>
107
<name>Multi Chapter Simple Weather API</name>
118
<dependencies>
129
<dependency>
@@ -16,4 +13,4 @@
1613
<scope>test</scope>
1714
</dependency>
1815
</dependencies>
19-
</project>
16+
</project>

‎core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.sonatype.mavenbook.multi</groupId>
6-
<artifactId>simple-parent</artifactId>
7-
<version>0.9-MNG6957-SNAPSHOT</version>
8-
</parent>
4+
<groupId>org.sonatype.mavenbook.multi</groupId>
95
<artifactId>simple-webapp</artifactId>
6+
<version>0.9-MNG6957-SNAPSHOT</version>
107
<name>Multi Chapter Simple Web Application Project</name>
118
<dependencies>
129
<dependency>
1310
<groupId>org.sonatype.mavenbook.multi</groupId>
1411
<artifactId>simple-weather</artifactId>
1512
<version>0.9-MNG6957-SNAPSHOT</version>
13+
<scope>compile</scope>
1614
</dependency>
1715
</dependencies>
18-
<build>
19-
<finalName>simple-webapp</finalName>
20-
<pluginManagement>
21-
<plugins>
22-
<plugin>
23-
<artifactId>maven-war-plugin</artifactId>
24-
<version>3.3.2</version>
25-
</plugin>
26-
</plugins>
27-
</pluginManagement>
28-
</build>
2916
</project>

0 commit comments

Comments
 (0)