Repository: maven Updated Branches: refs/heads/master e8064c685 -> 9544d523b
Windows errors if you try to silently delete a directory that doesn't exist Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9544d523 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9544d523 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9544d523 Branch: refs/heads/master Commit: 9544d523bf7a91cb05777ec7b644c2f9b7df73bc Parents: e8064c6 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Tue Jan 3 11:39:11 2017 +0000 Committer: Stephen Connolly <stephen.alan.conno...@gmail.com> Committed: Tue Jan 3 11:39:11 2017 +0000 ---------------------------------------------------------------------- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/9544d523/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index 30134ad..134a9fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,8 +76,8 @@ parallel linuxJava7:{ dir('test') { def WORK_DIR=pwd() git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', branch: 'master') - bat "rmdir /s /q it-local-repo" - bat "del /q apache-maven-dist.zip" + bat "if exist it-local-repo rmdir /s /q it-local-repo" + bat "if exist it-local-repo apache-maven-dist.zip /q apache-maven-dist.zip" unstash 'dist' withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin"]) { bat "mvn clean verify -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" @@ -92,8 +92,8 @@ parallel linuxJava7:{ dir('test') { def WORK_DIR=pwd() git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', branch: 'master') - bat "rmdir /s /q it-local-repo" - bat "del /q apache-maven-dist.zip" + bat "if exist it-local-repo rmdir /s /q it-local-repo" + bat "if exist it-local-repo apache-maven-dist.zip /q apache-maven-dist.zip" unstash 'dist' withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin"]) { bat "mvn clean verify -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
