You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/09/26 06:51:38 UTC
[maven-integration-testing] branch master updated: Fix IT for trimmed consumer POM (#293)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new bde513b18 Fix IT for trimmed consumer POM (#293)
bde513b18 is described below
commit bde513b18c55d865c3fef9f5673b05dd5d451c00
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Tue Sep 26 08:51:33 2023 +0200
Fix IT for trimmed consumer POM (#293)
---
.../expected/simple-weather.pom | 7 ++-----
.../mng-6656-buildconsumer/expected/simple-webapp.pom | 19 +++----------------
.../expected/simple-testutils.pom | 7 ++-----
.../expected/simple-weather.pom | 9 +++------
.../mng-6957-buildconsumer/expected/simple-webapp.pom | 19 +++----------------
5 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
index 75d9dc2b1..7a2682a09 100644
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
+++ b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
@@ -1,11 +1,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">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- <version>0.9-MNG6656-SNAPSHOT</version>
- </parent>
+ <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId>
+ <version>0.9-MNG6656-SNAPSHOT</version>
<name>Multi Chapter Simple Weather API</name>
</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
index ecd5348bf..d7c6a6d32 100644
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
+++ b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
@@ -1,29 +1,16 @@
<?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.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- <version>0.9-MNG6656-SNAPSHOT</version>
- </parent>
+ <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-webapp</artifactId>
+ <version>0.9-MNG6656-SNAPSHOT</version>
<name>Multi Chapter Simple Web Application Project</name>
<dependencies>
<dependency>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId>
<version>0.9-MNG6656-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <finalName>simple-webapp</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
index dddf56160..1007f7ecf 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
@@ -1,10 +1,7 @@
<?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.sonatype.mavenbook.multi</groupId>
- <artifactId>utils-parent</artifactId>
- <version>0.9-MNG6957-SNAPSHOT</version>
- </parent>
+ <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-testutils</artifactId>
+ <version>0.9-MNG6957-SNAPSHOT</version>
</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
index b7bbabb92..cde80acde 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
@@ -1,12 +1,9 @@
<?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.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- <version>0.9-MNG6957-SNAPSHOT</version>
- </parent>
+ <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId>
+ <version>0.9-MNG6957-SNAPSHOT</version>
<name>Multi Chapter Simple Weather API</name>
<dependencies>
<dependency>
@@ -16,4 +13,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
index 491e7bd9d..95717ad66 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
@@ -1,29 +1,16 @@
<?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.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- <version>0.9-MNG6957-SNAPSHOT</version>
- </parent>
+ <groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-webapp</artifactId>
+ <version>0.9-MNG6957-SNAPSHOT</version>
<name>Multi Chapter Simple Web Application Project</name>
<dependencies>
<dependency>
<groupId>org.sonatype.mavenbook.multi</groupId>
<artifactId>simple-weather</artifactId>
<version>0.9-MNG6957-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <finalName>simple-webapp</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
\ No newline at end of file