diff --git a/src/it/projects/no-overwrite-3.6.2-before/verify.groovy b/src/it/projects/no-overwrite-3.6.2-before/verify.groovy index 0a3519fd..633b6ad3 100644 --- a/src/it/projects/no-overwrite-3.6.2-before/verify.groovy +++ b/src/it/projects/no-overwrite-3.6.2-before/verify.groovy @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -String mavenVersion = "./mvnw -v".execute().text.split()[2] +String os = System.getProperty("os.name"); +String[] mavenWords = os.contains("Windows") ? "mvnw.cmd -v".execute().text.split() : "./mvnw -v".execute().text.split() +String mavenVersion = mavenWords[1] == "Maven" ? mavenWords[2] : mavenWords[3] String[] mavenVersionArray = mavenVersion.split("\\.") int[] versionArray = new int[3] for (int i = 0; i < 3; i++) diff --git a/src/it/projects/no-overwrite-3.6.3-later/verify.groovy b/src/it/projects/no-overwrite-3.6.3-later/verify.groovy index cda154de..21417354 100644 --- a/src/it/projects/no-overwrite-3.6.3-later/verify.groovy +++ b/src/it/projects/no-overwrite-3.6.3-later/verify.groovy @@ -16,7 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -String mavenVersion = "./mvnw -v".execute().text.split()[2] + +String os = System.getProperty("os.name").split()[0] +String[] mavenWords = os.contains("Windows") ? "mvnw.cmd -v".execute().text.split() : "./mvnw -v".execute().text.split() +String mavenVersion = mavenWords[1] == "Maven" ? mavenWords[2] : mavenWords[3] String[] mavenVersionArray = mavenVersion.split("\\.") int[] versionArray = new int[3] for (int i = 0; i < 3; i++) diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java index 6e0ebaea..c5f39069 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java @@ -492,13 +492,15 @@ protected void writePom( Model pom, File pomFile, String headerComment ) protected void writeStringToFile( String data, File file, String encoding ) throws MojoExecutionException { - + if (System.getProperty("os.name").contains("Windows")) + { + data = data.replaceAll("\n","\r\n"); + } byte[] binaryData; try { binaryData = data.getBytes( encoding ); - if ( file.isFile() && file.canRead() && file.length() == binaryData.length ) { try (InputStream inputStream = new FileInputStream( file ))