Merge branch 'master' of github.com:GateNLP/gateplugin-StringAnnotation

johann-petrak · johann-petrak · commit 3015a1fbd7d8 · 2019-05-09T09:03:13.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
         }
         stage('Document') {
             when{
-                expression { currentBuild.result != "FAILED" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }
+                expression { currentBuild.currentResult != "FAILED" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }
             }
             steps {
                 sh 'mvn -e -DskipTests site'
@@ -42,7 +42,7 @@ pipeline {
         stage('Deploy') {
             when{
                 branch 'master'
-                expression { currentBuild.result == "SUCCESS" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }
+                expression { currentBuild.currentResult == "SUCCESS" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }
             }
             steps {
                 sh 'mvn -e -Dmaven.test.skip=true source:jar javadoc:jar deploy'

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ pipeline {`
`25`	`25`	`}`
`26`	`26`	`stage('Document') {`
`27`	`27`	`when{`
`28`		`- expression { currentBuild.result != "FAILED" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }`
	`28`	`+ expression { currentBuild.currentResult != "FAILED" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }`
`29`	`29`	`}`
`30`	`30`	`steps {`
`31`	`31`	`sh 'mvn -e -DskipTests site'`
`@@ -42,7 +42,7 @@ pipeline {`
`42`	`42`	`stage('Deploy') {`
`43`	`43`	`when{`
`44`	`44`	`branch 'master'`
`45`		`- expression { currentBuild.result == "SUCCESS" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }`
	`45`	`+ expression { currentBuild.currentResult == "SUCCESS" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 }`
`46`	`46`	`}`
`47`	`47`	`steps {`
`48`	`48`	`sh 'mvn -e -Dmaven.test.skip=true source:jar javadoc:jar deploy'`