[sling-site] branch master updated: Use 'clean' when publishing the site

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
     new fb77731  Use 'clean' when publishing the site
fb77731 is described below

commit fb77731fc546bd14db142ead252b8ab8b86d20a7
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jan 29 22:35:55 2019 +0100

    Use 'clean' when publishing the site
    
    This prevents the error that popped up on Jenkins:
    
    Failed to check out from SCM: The git-pull command failed. error: Pull is
    not possible because you have unmerged files.
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6df822c..4ba651a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
             }
 
             steps {
-                sh 'mvn package -Ppublish-site -Dmsg="Automatic website deployment"'
+                sh 'mvn clean package -Ppublish-site -Dmsg="Automatic website deployment"'
             }
         }
     }