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 589a80187 [MNG-8252] Fix build (#362)
589a80187 is described below
commit 589a80187f2839f85111d57fb123634d99935d3e
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Sep 12 06:36:51 2024 +0200
[MNG-8252] Fix build (#362)
---
.../org/apache/maven/it/MavenITmng6656BuildConsumer.java | 16 ++++------------
.../org/apache/maven/it/MavenITmng6957BuildConsumer.java | 5 ++++-
.../mng-6656-buildconsumer/expected/parent-build.pom | 5 -----
.../expected/simple-parent-build.pom | 5 -----
.../expected/simple-weather-build.pom | 5 +----
.../expected/simple-webapp-build.pom | 5 +----
.../mng-6957-buildconsumer/expected/parent-build.pom | 5 -----
.../expected/simple-testutils-build.pom | 2 --
.../expected/simple-weather-build.pom | 5 +----
.../expected/simple-webapp-build.pom | 5 +----
.../expected/utils-parent-build.pom | 5 +----
11 files changed, 13 insertions(+), 50 deletions(-)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
index 2258fa737..0fd9439e7 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
@@ -20,13 +20,11 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import java.util.List;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
/**
* With the build-consumer the pom.xml will be adjusted during the process.
@@ -111,15 +109,9 @@ public class MavenITmng6656BuildConsumer extends
AbstractMavenIntegrationTestCas
}
static void assertTextEquals(File file1, File file2) throws IOException {
- List<String> s1 = FileUtils.loadFile(file1);
- List<String> s2 = FileUtils.loadFile(file2);
- try {
- assertEquals("Not same size", s1.size(), s2.size());
- for (int i = 0; i < s1.size(); i++) {
- assertEquals("Mismatch line " + i, s1.get(i), s2.get(i));
- }
- } catch (AssertionFailedError error) {
- assertEquals(error.getMessage(), s1, s2);
- }
+ assertEquals(
+ "pom files differ " + file1 + " " + file2,
+ String.join("\n", FileUtils.loadFile(file1)),
+ String.join("\n", FileUtils.loadFile(file2)));
}
}
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
index 503b2fa36..3f045f5f7 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -134,6 +134,9 @@ public class MavenITmng6957BuildConsumer extends
AbstractMavenIntegrationTestCas
}
static void assertTextEquals(File file1, File file2) throws IOException {
- assertEquals(FileUtils.loadFile(file1), FileUtils.loadFile(file2));
+ assertEquals(
+ "pom files differ " + file1 + " " + file2,
+ String.join("\n", FileUtils.loadFile(file1)),
+ String.join("\n", FileUtils.loadFile(file2)));
}
}
diff --git
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom
index 98906356e..5cace7f2d 100644
---
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom
+++
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom
@@ -23,9 +23,4 @@ under the License.
<version>0.9-${changelist}-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Multi Chapter Parent Project</name>
-
- <!-- Optimized from
https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
- <modules>
- <module>simple-parent</module>
- </modules>
</project>
diff --git
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom
index 526699b41..2f31a3cf8 100644
---
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom
+++
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom
@@ -27,11 +27,6 @@ under the License.
<packaging>pom</packaging>
<name>Multi Chapter Simple Parent Project</name>
- <modules>
- <module>simple-weather</module>
- <module>simple-webapp</module>
- </modules>
-
<build>
<pluginManagement>
<plugins>
diff --git
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom
index b7ea1daa3..f5755d9da 100644
---
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom
+++
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom
@@ -18,10 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<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/maven-v4_1_0.xsd";>
- <parent>
- <groupId>org.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- </parent>
+ <parent />
<artifactId>simple-weather</artifactId>
<packaging>jar</packaging>
diff --git
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom
index c07fcd10d..279a689ab 100644
---
a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom
+++
b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom
@@ -18,10 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<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/maven-v4_1_0.xsd";>
- <parent>
- <groupId>org.sonatype.mavenbook.multi</groupId>
- <artifactId>simple-parent</artifactId>
- </parent>
+ <parent />
<artifactId>simple-webapp</artifactId>
<name>Multi Chapter Simple Web Application Project</name>
diff --git
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom
index 9cb136ffa..e4713ea4f 100644
---
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom
+++
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom
@@ -23,9 +23,4 @@ under the License.
<version>0.9-${changelist}-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Multi Chapter Parent Project</name>
-
- <!-- Optimized from
https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
- <modules>
- <module>simple-parent</module>
- </modules>
</project>
diff --git
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
index 469c02963..b9e9b5efe 100644
---
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
+++
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
@@ -19,8 +19,6 @@ under the License.
-->
<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>
<relativePath>../utils-parent</relativePath>
</parent>
<artifactId>simple-testutils</artifactId>
diff --git
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
index 9b28b8d76..7da8409ef 100644
---
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
+++
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
@@ -18,10 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<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>
- </parent>
+ <parent />
<artifactId>simple-weather</artifactId>
<packaging>jar</packaging>
diff --git
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
index a3800767f..30e55e7df 100644
---
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
+++
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
@@ -18,10 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<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>
- </parent>
+ <parent />
<artifactId>simple-webapp</artifactId>
<name>Multi Chapter Simple Web Application Project</name>
diff --git
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
index 1aa6b87d4..fb8c07c2d 100644
---
a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
+++
b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
@@ -18,10 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<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>
- </parent>
+ <parent />
<artifactId>utils-parent</artifactId>
<packaging>pom</packaging>
</project>
