diff --git a/src/it/projects/no-overwrite-3.6.2-before/invoker.properties b/src/it/projects/no-overwrite-3.6.2-before/invoker.properties new file mode 100644 index 00000000..40952ee2 --- /dev/null +++ b/src/it/projects/no-overwrite-3.6.2-before/invoker.properties @@ -0,0 +1,3 @@ +# .flattened-pom.xml contains xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" +# xsd url changed to HTTPS in Maven 3.6.3 in https://issues.apache.org/jira/browse/MNG-6778 +invoker.maven.version = !3.6.3+ 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 633b6ad3..8096d0b9 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,21 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -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++) - versionArray[i] = Integer.valueOf(mavenVersionArray[i]) -boolean isValid = versionArray[0] < 3\ - || versionArray[0] == 3 && versionArray[1] < 6\ - || versionArray[0] == 3 && versionArray[1] == 6 && versionArray[2] < 3 -if (isValid) { - File flattendPom = new File( basedir, '.flattened-pom.xml' ) - assert flattendPom.exists() - long now = System.currentTimeMillis() - assert now - flattendPom.lastModified() > 20*1000 -} - +File flattendPom = new File( basedir, '.flattened-pom.xml' ) +assert flattendPom.exists() +long now = System.currentTimeMillis() +assert now - flattendPom.lastModified() > 20*1000 diff --git a/src/it/projects/no-overwrite-3.6.3-later/invoker.properties b/src/it/projects/no-overwrite-3.6.3-later/invoker.properties new file mode 100644 index 00000000..e39bdef2 --- /dev/null +++ b/src/it/projects/no-overwrite-3.6.3-later/invoker.properties @@ -0,0 +1,3 @@ +# .flattened-pom.xml contains xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" +# xsd url changed to HTTPS in Maven 3.6.3 in https://issues.apache.org/jira/browse/MNG-6778 +invoker.maven.version = 3.6.3+ 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 21417354..8096d0b9 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 @@ -17,21 +17,7 @@ * under the License. */ -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++) - versionArray[i] = Integer.valueOf(mavenVersionArray[i]) -boolean isValid = versionArray[0] > 3\ - || versionArray[0] == 3 && versionArray[1] > 6\ - || versionArray[0] == 3 && versionArray[1] == 6 && versionArray[2] >= 3 -if (isValid) { - File flattendPom = new File( basedir, '.flattened-pom.xml' ) - assert flattendPom.exists() - long now = System.currentTimeMillis() - assert now - flattendPom.lastModified() > 20*1000 -} - - +File flattendPom = new File( basedir, '.flattened-pom.xml' ) +assert flattendPom.exists() +long now = System.currentTimeMillis() +assert now - flattendPom.lastModified() > 20*1000