(maven-archetype) branch master updated: [ARCHETYPE-632] Add logging conflict line in integration-test (#114)

[sjaranowski]

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

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e1552b9 [ARCHETYPE-632] Add logging conflict line in integration-test 
(#114)
2e1552b9 is described below

commit 2e1552b923fe776f3e845ece040c4db92c276d94
Author: Toshiya Kobayashi <toshiyakobaya...@gmail.com>
AuthorDate: Sat Sep 14 20:23:48 2024 +0900

    [ARCHETYPE-632] Add logging conflict line in integration-test (#114)
    
    * [ARCHETYPE-632] Add logging conflict line in integration-test
    
    * Resolve conflicts
    
    ---------
    
    Co-authored-by: Slawomir Jaranowski <s.jaranow...@gmail.com>
---
 .../java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
index 7561f301..b39a536a 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -405,6 +405,10 @@ public class IntegrationTestMojo extends AbstractMojo {
                 refLine = referenceFileReader.readLine();
                 actualLine = actualFileReader.readLine();
                 if (!Objects.equals(refLine, actualLine)) {
+                    getLog().warn("Conflict found. Reference line :");
+                    getLog().warn(refLine);
+                    getLog().warn("Actual line :");
+                    getLog().warn(actualLine);
                     return false;
                 }
             } while (refLine != null || actualLine != null);