You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/04/04 18:49:26 UTC

[logging-log4j2] 01/02: Combine issue recorders into steps

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

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 979dc0dba21569a4faef5f03fa297b92c1421080
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Apr 4 13:17:07 2020 -0500

    Combine issue recorders into steps
---
 Jenkinsfile | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 96e6d9b..d9ed4f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,26 +36,11 @@ pipeline {
                     }
                     steps {
                         sh 'mvn -B -fn -t toolchains-jenkins-ubuntu.xml -Djenkins -V clean install'
-                    }
-                    post {
-                        always {
-                            archiveArtifacts artifacts: '**/*.jar', fingerprint: true
-                            junit '**/*-reports/*.xml'
-                            recordIssues enabledForFailure: true,
-                                tool: mavenConsole(),
-                                referenceJobName: 'log4j/master'
-                            recordIssues enabledForFailure: true,
-                                tool: errorProne(),
-                                referenceJobName: 'log4j/master'
-                            recordIssues enabledForFailure: true,
-                                tool: java(),
-                                sourceCodeEncoding: 'UTF-8',
-                                referenceJobName: 'log4j/master'
-                            recordIssues enabledForFailure: true,
-                                tool: taskScanner(includePattern: '**/*.java', excludePattern: 'target/**', highTags: 'FIXME', normalTags: 'TODO'),
-                                sourceCodeEncoding: 'UTF-8',
-                                referenceJobName: 'log4j/master'
-                        }
+                        junit '**/*-reports/*.xml'
+                        archiveArtifacts artifacts: '**/*.jar', fingerprint: true
+                        recordIssues sourceCodeEncoding: 'UTF-8', referenceJobName: 'log4j/master',
+                            tools: [mavenConsole(), errorProne(), java(), // junitParser() // TODO: compare with junit step
+                                taskScanner(highTags: 'FIXME', normalTags: 'TODO', excludePattern: '*/target/**')]
                     }
                 }
                 stage('Windows') {
@@ -69,11 +54,7 @@ pipeline {
                         if exist %userprofile%\\.embedmongo\\ rd /s /q %userprofile%\\.embedmongo
                         mvn -B -fn -t toolchains-jenkins-win.xml -Dfile.encoding=UTF-8 -V clean install
                         '''
-                    }
-                    post {
-                        always {
-                            junit '**/*-reports/*.xml'
-                        }
+                        junit '**/*-reports/*.xml'
                     }
                 }
             }