diff --git a/Jenkinsfile b/Jenkinsfile
index bcf24d21059..4ec1ecbf921 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,8 @@ pipeline {
           steps {
             container( 'jetty-build' ) {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk11", "-T3 clean install", "maven3", true ) // -Pautobahn
+                mavenBuild( "jdk8", "clean install -T3", "maven3",
+                            [[parserName: 'Maven'], [parserName: 'Java']])
                 // Collect up the jacoco execution results (only on main build)
                 jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                        exclusionPattern: '' +
@@ -33,20 +34,29 @@ pipeline {
                        execPattern: '**/target/jacoco.exec',
                        classPattern: '**/target/classes',
                        sourcePattern: '**/src/main/java'
-                warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
-                junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml,**/target/autobahntestsuite-reports/*.xml'
               }
             }
           }
         }
-        stage( "Build / Test - JDK14" ) {
+        stage("Build / Test - JDK11") {
           agent { node { label 'linux' } }
           steps {
             container( 'jetty-build' ) {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk14", "-T3 clean install", "maven3", true )
-                warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
-                junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml'
+                mavenBuild( "jdk11", "clean install -T3 -Djacoco.skip=true ", "maven3",
+                            [[parserName: 'Maven'], [parserName: 'Java']])
+              }
+            }
+          }
+        }
+
+        stage("Build / Test - JDK14") {
+          agent { node { label 'linux' } }
+          steps {
+            container( 'jetty-build' ) {
+              timeout( time: 120, unit: 'MINUTES' ) {
+                mavenBuild( "jdk14", "clean install -T3 -Djacoco.skip=true ", "maven3",
+                            [[parserName: 'Maven'], [parserName: 'Java']])
               }
             }
           }
@@ -58,9 +68,8 @@ pipeline {
             container( 'jetty-build' ) {
               timeout( time: 30, unit: 'MINUTES' ) {
                 mavenBuild( "jdk11",
-                            "package source:jar javadoc:jar javadoc:aggregate-jar -Peclipse-release  -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true",
-                            "maven3", true )
-                warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
+                            "install javadoc:javadoc javadoc:aggregate-jar -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true",
+                            "maven3", [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']])
               }
             }
           }
@@ -70,8 +79,8 @@ pipeline {
           steps {
             container( 'jetty-build' ) {
               timeout( time: 30, unit: 'MINUTES' ) {
-                mavenBuild( "jdk11", "-T3 -Pcompact3 clean install -DskipTests", "maven3", true )
-                warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
+                mavenBuild( "jdk8", "-T3 -Pcompact3 clean install -DskipTests", "maven3",
+                            [[parserName: 'Maven'], [parserName: 'Java']])
               }
             }
           }
@@ -121,19 +130,23 @@ def slackNotif() {
  * @paran mvnName maven installation to use
  * @return the Jenkinsfile step representing a maven build
  */
-def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) {
-  def localRepo = ".repository"
-  def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
-
-  withMaven(
-    maven: mvnName,
-    jdk: "$jdk",
-    publisherStrategy: 'EXPLICIT',
-    options: [junitPublisher(disabled: junitPublishDisabled), mavenLinkerPublisher(disabled: false), pipelineGraphPublisher(disabled: false)],
-    mavenOpts: mavenOpts,
-    mavenLocalRepo: localRepo) {
-    // Some common Maven command line + provided command line
-    sh "mvn -Premote-session-tests -Pci -V -B -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
+def mavenBuild(jdk, cmdline, mvnName, consoleParsers) {
+  script {
+    try {
+      withEnv(["JAVA_HOME=${ tool "$jdk" }",
+               "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "$mvnName"}/bin",
+               "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
+        sh "mvn -Dmaven.repo.local=.repository -Premote-session-tests -Pci -V -B -e -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
+      }
+    }
+    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-jaas/pom.xml b/jetty-jaas/pom.xml
index a336f1c7e7a..24b49ff4bdb 100644
--- a/jetty-jaas/pom.xml
+++ b/jetty-jaas/pom.xml
@@ -109,5 +109,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- because directory server do not have yet junit5 extensions -->
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 </project>