Skip to content

Commit f4d442f

Browse files
yangnuoyuyangnuoyu
andauthored
Fixes no-overwrite test failure (#159)
* fix paring version problem in no-overwrite tests * fix no-overwriten tests when running in windows * fix bug resulting from line seperator difference in Windows * remove redundant code * fix the version position problem Co-authored-by: yangnuoyu <yangnuoyu@penguin>
1 parent 8dd713c commit f4d442f

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/it/projects/no-overwrite-3.6.2-before/verify.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
String mavenVersion = "./mvnw -v".execute().text.split()[2]
19+
String os = System.getProperty("os.name");
20+
String[] mavenWords = os.contains("Windows") ? "mvnw.cmd -v".execute().text.split() : "./mvnw -v".execute().text.split()
21+
String mavenVersion = mavenWords[1] == "Maven" ? mavenWords[2] : mavenWords[3]
2022
String[] mavenVersionArray = mavenVersion.split("\\.")
2123
int[] versionArray = new int[3]
2224
for (int i = 0; i < 3; i++)

src/it/projects/no-overwrite-3.6.3-later/verify.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
String mavenVersion = "./mvnw -v".execute().text.split()[2]
19+
20+
String os = System.getProperty("os.name").split()[0]
21+
String[] mavenWords = os.contains("Windows") ? "mvnw.cmd -v".execute().text.split() : "./mvnw -v".execute().text.split()
22+
String mavenVersion = mavenWords[1] == "Maven" ? mavenWords[2] : mavenWords[3]
2023
String[] mavenVersionArray = mavenVersion.split("\\.")
2124
int[] versionArray = new int[3]
2225
for (int i = 0; i < 3; i++)

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,15 @@ protected void writePom( Model pom, File pomFile, String headerComment )
492492
protected void writeStringToFile( String data, File file, String encoding )
493493
throws MojoExecutionException
494494
{
495-
495+
if (System.getProperty("os.name").contains("Windows"))
496+
{
497+
data = data.replaceAll("\n","\r\n");
498+
}
496499
byte[] binaryData;
497500

498501
try
499502
{
500503
binaryData = data.getBytes( encoding );
501-
502504
if ( file.isFile() && file.canRead() && file.length() == binaryData.length )
503505
{
504506
try (InputStream inputStream = new FileInputStream( file ))

0 commit comments

Comments
 (0)