From 2e1552b923fe776f3e845ece040c4db92c276d94 Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Sat, 14 Sep 2024 20:23:48 +0900 Subject: [PATCH] [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 --- .../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 @@ private boolean contentEquals(File referenceFile, File actualFile) throws IOExce 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);