Resolve conflicts

apache · Sep 14, 2024 · cd7e86a · cd7e86a
1 parent 499ad51
commit cd7e86a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/...-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java b/...-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -404,12 +404,11 @@ private boolean contentEquals(File referenceFile, File actualFile) throws IOExce
             do {
                 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 );
+                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);