Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2018-11-28 10:16:51 +10:00
parent 87076d5f4f bee1487ecc
commit 62d160ac6b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -10,9 +10,7 @@ pipeline {
options { timeout(time: 120, unit: 'MINUTES') } options { timeout(time: 120, unit: 'MINUTES') }
steps { steps {
mavenBuild("jdk11", "-Pmongodb install") mavenBuild("jdk11", "-Pmongodb install")
junit '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']] warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
junit '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
// Collect up the jacoco execution results (only on main build) // Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
exclusionPattern: '' + exclusionPattern: '' +
@ -89,6 +87,7 @@ def mavenBuild(jdk, cmdline) {
jdk: "$jdk", jdk: "$jdk",
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
globalMavenSettingsConfig: settingsName, globalMavenSettingsConfig: settingsName,
options: [junitPublisher(disabled: false)],
mavenOpts: mavenOpts, mavenOpts: mavenOpts,
mavenLocalRepo: localRepo) { mavenLocalRepo: localRepo) {
// Some common Maven command line + provided command line // Some common Maven command line + provided command line

2
jetty-distribution/pom.xml
View File

@ -29,7 +29,7 @@
<executions> <executions>
<execution> <execution>
<id>copy-base-assembly-tree</id> <id>copy-base-assembly-tree</id>
<phase>package</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>