You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/05 16:37:44 UTC
[maven-integration-testing] branch MNG-6656 updated: Revert
"[MNG-6656] Verify EOL after git checkout"
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/MNG-6656 by this push:
new 314503b Revert "[MNG-6656] Verify EOL after git checkout"
314503b is described below
commit 314503b14ed53f865e4b61904493582993670d19
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue May 5 18:37:35 2020 +0200
Revert "[MNG-6656] Verify EOL after git checkout"
This reverts commit a58551c9ee52cbece71b4aea804cd26a5d5659c9.
adjust EOL of pom
---
.../java/org/apache/maven/it/MavenITmng6656BuildConsumer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 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 b534aa8..13306c1 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
@@ -78,17 +78,19 @@ public class MavenITmng6656BuildConsumer
verifier.executeGoals( Arrays.asList( "install" ) );
verifier.verifyErrorFreeLog();
+ // use original resource files to ensure correct EOLs
+ File resourcesDir = new File( "src/test/resources/mng-6656-buildconsumer" );
String content;
- content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") );
+ content = FileUtils.fileRead( new File( resourcesDir, "expected/parent.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") );
+ content = FileUtils.fileRead( new File( resourcesDir, "expected/simple-parent.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") );
+ content = FileUtils.fileRead( new File( resourcesDir, "expected/simple-weather.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") );
+ content = FileUtils.fileRead( new File( resourcesDir, "expected/simple-webapp.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", content );
}