diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 5a9aa2e..b3d4bdd 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -1,4 +1,4 @@
-// non-standard Jenksinfile
+// non-standard Jenkinsfile
 // * only publish code coverage to codacy for builder module
 // * only deploy artifacts for ruleset and tile modules
 
@@ -25,24 +25,35 @@ pipeline {
             }
         }
         stage('Static Code Analysis') {
-            when { expression { findFiles(glob: '**/src/main/java/*.java').length > 0 } }
+            when { expression { findFiles(glob: '**/src/main/java/**/*.java').length > 0 } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
-                    sh "${mvn} compile checkstyle:checkstyle pmd:pmd"
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
+                    sh "${mvn} compile"
+                    sh "${mvn} checkstyle:checkstyle"
+                    sh "${mvn} pmd:pmd"
+                    pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
                 }
-                pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
             }
         }
-        stage('Build Java 9') {
+        stage('SonarQube (develop only)') {
+            when { expression { env.GIT_BRANCH == 'develop' } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
+                withSonarQubeEnv('sonarqube') {
+                    sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar"
+                }
+            }
+        }
+        stage('Build Java Next') {
+            when { expression { true == false } }
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK Next') {
                     sh "${mvn} clean install"
                 }
             }
         }
-        stage('Build Java 8') {
+        stage('Build Java LTS') {
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
                     sh "${mvn} clean install"
                 }
             }
@@ -52,7 +63,7 @@ pipeline {
             steps {
                 junit '**/target/surefire-reports/*.xml'
                 jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
                     sh "${mvn} -pl builder com.gavinmogan:codacy-maven-plugin:coverage " +
                             "-DcoverageReportFile=target/site/jacoco/jacoco.xml " +
                             "-DprojectToken=`$JENKINS_HOME/codacy/token` " +
@@ -70,7 +81,7 @@ pipeline {
         stage('Deploy') {
             when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
                     sh "${mvn} -pl ruleset,tile deploy --activate-profiles release -DskipTests=true"
                 }
             }