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 19:12:25 UTC

[logging-log4j2] branch master updated: Use default toolchains config and deploy

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


The following commit(s) were added to refs/heads/master by this push:
     new 8d34bc2  Use default toolchains config and deploy
8d34bc2 is described below

commit 8d34bc2af32bfb48121387f2ebb985b659103c0f
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Apr 4 14:10:51 2020 -0500

    Use default toolchains config and deploy
    
    Try using the default toolchains.xml on the Jenkins agents which are
    more complete than the ones included in this project. This also sets the
    LANG environment variable as was done in the old Maven jobs to help
    reduce some warnings in the build logs.
---
 Jenkinsfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5446550..da835a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,11 @@ pipeline {
                         jdk 'JDK 1.8 (latest)'
                         maven 'Maven 3 (latest)'
                     }
+                    environment {
+                        LANG = 'en_US.UTF-8'
+                    }
                     steps {
-                        sh 'mvn -B -fn -t toolchains-jenkins-ubuntu.xml -Djenkins -V clean install'
+                        sh 'mvn -B -fn -Djenkins -V clean install deploy'
                         junit '**/*-reports/*.xml'
                         archiveArtifacts artifacts: '**/*.jar', fingerprint: true
                         recordIssues sourceCodeEncoding: 'UTF-8', referenceJobName: 'log4j/master',
@@ -49,10 +52,13 @@ pipeline {
                         jdk 'JDK 1.8 (latest)'
                         maven 'Maven 3 (latest)'
                     }
+                    environment {
+                        LANG = 'en_US.UTF-8'
+                    }
                     steps {
                         bat '''
                         if exist %userprofile%\\.embedmongo\\ rd /s /q %userprofile%\\.embedmongo
-                        mvn -B -fn -t toolchains-jenkins-win.xml -Dfile.encoding=UTF-8 -V clean install
+                        mvn -B -fn -Dfile.encoding=UTF-8 -V clean install
                         '''
                         junit '**/*-reports/*.xml'
                     }