This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 99c4b11 Fix build again
99c4b11 is described below
commit 99c4b11441a575035b33a15bd2902e039c5c2c99
Author: Matt Sicker <[email protected]>
AuthorDate: Sat Apr 4 21:27:50 2020 -0500
Fix build again
---
Jenkinsfile | 16 +++++--
toolchains-jenkins-ubuntu.xml | 101 ++++++++++++++++++++++++++++++++++++++++++
toolchains-jenkins-win.xml | 101 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 214 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cc884bb..9053428 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,13 +38,17 @@ pipeline {
LANG = 'en_US.UTF-8'
}
steps {
- sh 'mvn -B -fn -Djenkins -V clean install deploy'
- junit '**/*-reports/*.xml'
+ sh 'mvn -B -fae -t toolchains-jenkins-ubuntu.xml
-Djenkins -V clean install deploy'
archiveArtifacts artifacts: '**/*.jar', fingerprint:
true
recordIssues sourceCodeEncoding: 'UTF-8',
referenceJobName: 'log4j/release-2.x',
tools: [mavenConsole(), errorProne(), java(), //
junitParser() // TODO: compare with junit step
taskScanner(highTags: 'FIXME', normalTags:
'TODO', includePattern: '**/*.java', excludePattern: '*/target/**')]
}
+ post {
+ always {
+ junit '**/*-reports/*.xml'
+ }
+ }
}
stage('Windows') {
agent { label 'Windows' }
@@ -58,9 +62,13 @@ pipeline {
steps {
bat '''
if exist %userprofile%\\.embedmongo\\ rd /s /q
%userprofile%\\.embedmongo
- mvn -B -fn -Dfile.encoding=UTF-8 -V clean install
+ mvn -B -fae toolchains-jenkins-win.xml
-Dfile.encoding=UTF-8 -V clean install
'''
- junit '**/*-reports/*.xml'
+ }
+ post {
+ always {
+ junit '**/*-reports/*.xml'
+ }
}
}
}
diff --git a/toolchains-jenkins-ubuntu.xml b/toolchains-jenkins-ubuntu.xml
new file mode 100644
index 0000000..09898d7
--- /dev/null
+++ b/toolchains-jenkins-ubuntu.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache license, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the license for the specific language governing permissions and
+ ~ limitations under the license.
+ -->
+<toolchains>
+ <!-- JDK toolchains -->
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest1.8</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest1.9</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>10</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest10</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>11</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest11/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>12</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest12/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>13</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest13/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>14</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest14/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>15</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest15/</jdkHome>
+ </configuration>
+ </toolchain>
+ <!-- other toolchains -->
+</toolchains>
diff --git a/toolchains-jenkins-win.xml b/toolchains-jenkins-win.xml
new file mode 100644
index 0000000..df01b39
--- /dev/null
+++ b/toolchains-jenkins-win.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ https://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<toolchains>
+ <!-- JDK toolchains -->
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest1.8</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest9</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>10</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest10</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>11</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest11</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>12</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest12</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>13</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest13</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>14</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest14</jdkHome>
+ </configuration>
+ </toolchain>
+ <!--toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>15</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest15</jdkHome>
+ </configuration>
+ </toolchain-->
+ <!-- other toolchains -->
+</toolchains>
