Merge branch 'main' into UIMA-6307-Centralize-Jenkins-pipelines
* main: (150 commits)
[UIMA-6301] Rename "master" branches to "main"
[UIMA-6254] Move API report post-analysis script into the build resources
[UIMA-6254] Move API report post-analysis script into the build resources
[UIMA-6291] Improve uimaFIT benchmarking module
[UIMA-6291] Improve uimaFIT benchmarking module - Changed new timer names to include the postfix time, so that it is more clear that it is a time value.
[UIMA-6291] Improve uimaFIT benchmarking module - Added select and selectAt benchmarks using getAnnotationIndex approach.
[UIMA-6291] Improve uimaFIT benchmarking module - Added more selectCovered benchmarks with s.getBegin() and s.getEnd().
[UIMA-6291] Improve uimaFIT benchmarking module - Added support for nanoseconds CPU time support in Benchmark and changed SelectBenchmark to use user time.
[UIMA-6291] Improve uimaFIT benchmarking module
[UIMA-6291] Improve uimaFIT benchmarking module
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6292] selectCovering is slow
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6291] Improve uimaFIT benchmarking module
[UIMA-6291] Improve uimaFIT benchmarking module
[UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
No issue: ASF Jenkins Windows nodes seem to have trouble ('nohup' not found) - excluding Windows build nodes for the moment.
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6270] Add selectOverlapping to (J)CasUtil
...
% Conflicts:
% Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
index 6ed222e..1525edd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,61 +15,12 @@
// specific language governing permissions and limitations
// under the License.
-pipeline {
- agent any
-
- tools {
- maven 'maven_latest'
- jdk 'jdk_1.8_latest'
- }
+@Library('uima-build-jenkins-shared-library') _
- options {
- buildDiscarder(logRotator(
- numToKeepStr: '25',
- artifactNumToKeepStr: '5'
- ))
-
- // Seems not to be working reliably yet: https://issues.jenkins-ci.org/browse/JENKINS-48556
- // timestamps()
- }
-
- parameters {
- string(
- name: 'extraMavenArguments',
- defaultValue: "",
- description: "Extra arguments to be passed to maven (for testing)")
- }
-
- stages {
- // Display information about the build environemnt. This can be useful for debugging
- // build issues.
- stage("Build info") {
- steps {
- echo '=== Environment variables ==='
- script {
- if (isUnix()) {
- sh 'printenv'
- }
- else {
- bat 'set'
- }
- }
- }
- }
-
- // Perform a merge request build. This is a conditional stage executed with the GitLab
- // sources plugin triggers a build for a merge request. To avoid conflicts with other
- // builds, this stage should not deploy artifacts to the Maven repository server and
- // also not install them locally.
- stage("Pull request build") {
- when { branch 'PR-*' }
-
- steps {
- script {
- currentBuild.description = 'Triggered by: <a href="' + CHANGE_URL + '">' + BRANCH_NAME +
- ': ' + env.CHANGE_BRANCH + '</a> (' + env.CHANGE_AUTHOR_DISPLAY_NAME + ')'
- }
-
+<<<<<<< HEAD
+defaultPipeline {
+ extraMavenArguments = '-Pjacoco,spotbugs,pmd'
+=======
withMaven() {
sh script: 'mvn ' +
params.extraMavenArguments +
@@ -93,4 +44,5 @@
}
}
}
+>>>>>>> main
}
