This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch merge-its
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 9d580a30134c5f67d8cfb474275af02008048976
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Nov 5 10:14:21 2024 +0100

    Simplify hocon IT to not rely on a complex parent POM
---
 .../org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java  | 5 ++---
 .../test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon  | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
index 67d9f49020..9c00356e7b 100644
--- 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
+++ 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
@@ -64,12 +64,11 @@ class MavenITmng7836AlternativePomSyntaxTest extends 
AbstractMavenIntegrationTes
 
         assertTrue(Files.isRegularFile(consumerPom));
         List<String> consumerPomLines = Files.readAllLines(consumerPom, 
StandardCharsets.UTF_8);
-        assertTrue(consumerPomLines.stream().anyMatch(l -> 
l.contains("<name>Apache-2.0</name>")));
-        assertFalse(consumerPomLines.stream().anyMatch(l -> 
l.contains("<parent>")));
+        assertTrue(consumerPomLines.stream().anyMatch(l -> 
l.contains("<artifactId>hocon-simple</artifactId>")));
 
         // The build pom is the original POM, so the hocon file
         assertTrue(Files.isRegularFile(buildPom));
         List<String> buildPomLines = Files.readAllLines(buildPom, 
StandardCharsets.UTF_8);
-        assertTrue(buildPomLines.stream().anyMatch(l -> l.contains("groupId = 
org.apache.maven.extensions")));
+        assertTrue(buildPomLines.stream().anyMatch(l -> l.contains("artifactId 
= hocon-simple")));
     }
 }
diff --git 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
index 69c190e917..4a7f1970fd 100644
--- 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
+++ 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/simple/pom.hocon
@@ -17,11 +17,6 @@
 # under the License.
 #
 modelVersion = 4.0.0
-parent {
-    groupId = org.apache.maven.extensions
-    artifactId = maven-extensions
-    version = 41
-}
 groupId = org.apache.maven.its.mng-7836
 artifactId = hocon-simple
 version = 1.0.0-SNAPSHOT

Reply via email to