Merge branch 'jetty-9.2.x' into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2016-10-19 16:16:59 -07:00
commit 0162140e09
1 changed files with 4 additions and 3 deletions

7
Jenkinsfile vendored
View File

@ -20,7 +20,7 @@ node {
{ {
stage 'Compile' stage 'Compile'
withEnv(mvnEnv) { withEnv(mvnEnv) {
timeout(15) { timeout(time: 15, unit: 'MINUTES') {
sh "mvn -B clean install -Dtest=None" sh "mvn -B clean install -Dtest=None"
} }
} }
@ -33,7 +33,7 @@ node {
{ {
stage 'Javadoc' stage 'Javadoc'
withEnv(mvnEnv) { withEnv(mvnEnv) {
timeout(15) { timeout(time: 15, unit: 'MINUTES') {
sh "mvn -B javadoc:javadoc" sh "mvn -B javadoc:javadoc"
} }
} }
@ -46,7 +46,7 @@ node {
{ {
stage 'Test' stage 'Test'
withEnv(mvnEnv) { withEnv(mvnEnv) {
timeout(60) { timeout(time: 60, unit: 'MINUTES') {
// Run test phase / ignore test failures // Run test phase / ignore test failures
sh "mvn -B install -Dmaven.test.failure.ignore=true" sh "mvn -B install -Dmaven.test.failure.ignore=true"
// Report failures in the jenkins UI // Report failures in the jenkins UI
@ -54,6 +54,7 @@ node {
testResults: '**/target/surefire-reports/TEST-*.xml']) testResults: '**/target/surefire-reports/TEST-*.xml'])
// Collect up the jacoco execution results // Collect up the jacoco execution results
step([$class: 'JacocoPublisher', step([$class: 'JacocoPublisher',
inclusionPattern: "**/org/eclipse/jetty/**/*.class",
execPattern: '**/target/jacoco.exec', execPattern: '**/target/jacoco.exec',
classPattern: '**/target/classes', classPattern: '**/target/classes',
sourcePattern: '**/src/main/java']) sourcePattern: '**/src/main/java'])