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

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new b476e6f  rename build to buildJSPWiki so it doesn't clash with Jenkins 
step
b476e6f is described below

commit b476e6fa2af6946304a2f7ddcec7ece6b8cb4d60
Author: Juan Pablo Santos Rodríguez <[email protected]>
AuthorDate: Sat Apr 24 19:53:30 2021 +0200

    rename build to buildJSPWiki so it doesn't clash with Jenkins step
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1e03de6..e762750 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,14 +38,14 @@ try {
             dir( build ) {
                 git url: buildRepo, poll: true
                 if( env.BRANCH_NAME == 'master' ) {
-                    build( '-Pattach-additional-artifacts 
-Djdk.javadoc.doclet.version=2.0.12' )
+                    buildJSPWiki( '-Pattach-additional-artifacts 
-Djdk.javadoc.doclet.version=2.0.12' )
                     pom = readMavenPom file: 'pom.xml'
                     writeFile file: 'target/classes/apidocs.txt', text: 'file 
created in order to allow aggregated javadoc generation, target/classes is 
needed for all modules'
                     writeFile file: 
'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to 
allow aggregated javadoc generation, target/classes is needed for all modules'
                     sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl 
!jspwiki-portable -Djdk.javadoc.doclet.version=2.0.12'
                     sh 'java -cp jspwiki-main/target/classes 
org.apache.wiki.TranslationsCheck site'
                 } else {
-                    build()
+                    buildJSPWiki()
                 }
             }
         }
@@ -111,7 +111,7 @@ try {
     }
 }
 
-def build( buildOpts = '' ) {
+def buildJSPWiki( buildOpts = '' ) {
     withMaven( jdk: buildJdk, maven: buildMvn, publisherStrategy: 'EXPLICIT', 
options: [ jacocoPublisher(), junitPublisher() ] ) {
         withCredentials( [ string( credentialsId: 'sonarcloud-jspwiki', 
variable: 'SONAR_TOKEN' ) ] ) {
             def masterBranchOptions = ""

Reply via email to