Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2019-07-09 12:57:26 +10:00
commit 4df544afc6
2 changed files with 3 additions and 3 deletions

View File

@ -38,12 +38,12 @@ node("linux") {
// jmh run // jmh run
node( 'jmh-build-node' ) { node( 'jmh-build-node' ) {
stage("jmh-run") { stage("jmh-run") {
timeout( time: 180, unit: 'MINUTES' ) { timeout( time: 210, unit: 'MINUTES' ) {
withEnv( ["JAVA_HOME=${tool "$jdk"}"] ) { withEnv( ["JAVA_HOME=${tool "$jdk"}"] ) {
unstash name: 'perf-tests' unstash name: 'perf-tests'
sh "rm -rf jmh_results" sh "rm -rf jmh_results"
sh "mkdir jmh_results" sh "mkdir jmh_results"
sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json -foe true" sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json -foe true -i 3 -t 3 -wi 3"
jmhReport 'jmh_results/jmh_result.json' jmhReport 'jmh_results/jmh_result.json'
} }
} }

View File

@ -535,7 +535,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1-SNAPSHOT</version> <version>3.1.1</version>
<configuration> <configuration>
<verbose>true</verbose> <verbose>true</verbose>
<debug>true</debug> <debug>true</debug>