diff --git a/Jenkinsfile b/Jenkinsfile index c5264f3588b7..fa321ab3ad10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ def slackNotif() { * * @param jdk the jdk tool name (in jenkins) to use for this build * @param cmdline the command line in " "`format. - * @return the Jenkinsfile step representing a maven build + * @param consoleParsers array of console parsers to run */ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) { script { @@ -146,7 +146,6 @@ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) { finally { junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml' - //archiveArtifacts artifacts: '**/jetty-webapp/target/**' if(consoleParsers!=null){ warnings consoleParsers: consoleParsers } diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 4901475c562b..4dd62f2dcd0a 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -15,6 +15,32 @@ 28888 + + + + org.mortbay.jetty + h2spec-maven-plugin + + org.eclipse.jetty.http2.server.H2SpecServer + ${skipTests} + org.eclipse.jetty.h2spec + true + + 3.5 - Sends invalid connection preface + + + + + h2spec + test + + h2spec + + + + + + @@ -86,39 +112,5 @@ - - run-h2spec-in-docker - - - /var/run/docker.sock - - - - - - org.mortbay.jetty - h2spec-maven-plugin - - org.eclipse.jetty.http2.server.H2SpecServer - ${skipTests} - org.eclipse.jetty.h2spec - - 3.5 - Sends invalid connection preface - - - - - h2spec - test - - h2spec - - - - - - - - diff --git a/pom.xml b/pom.xml index 222b802f2657..9abe5a8127ea 100644 --- a/pom.xml +++ b/pom.xml @@ -936,7 +936,7 @@ org.mortbay.jetty h2spec-maven-plugin - 1.0.0 + 1.0.2