diff --git a/.gitignore b/.gitignore
index e1b269b..4093ccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 target/
+target-jdk-*/
 .m2/
 *@tmp/
 pom.xml.tag
diff --git a/Jenkinsfile b/Jenkinsfile
index f6ee897..4d83fb3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -465,7 +465,7 @@ def mvnCommon   = "-Dstyle.color=always -N -U -Pjenkins,POST-SNAPSHOT${extraProf
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none
-def niceCmd = (nice == 0) ? '' : "nice -n${nice} "
+def niceCmd = (nice == 0) ? '' : "nice -n$nice "
 
 //
 // Scripts pulled out of pipeline due to "General error during class generation: Method too large"
@@ -498,21 +498,21 @@ fi
 }
 
 // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
-def moveSurefireReportsScript(deployJdk) {
+def moveSurefireReportsScript() {
   return """#!/bin/bash
-if [ -d target/jdk-$deployJdk/surefire-reports ]
+if [ -d target/surefire-reports ]
 then
-  mv target/jdk-$deployJdk/surefire-reports target/jdk-$deployJdk/surefire-reports.do-not-report-twice
+  mv target/surefire-reports target/surefire-reports.do-not-report-twice
 fi
 """
 }
 
 // Restore surefire-reports
-def restoreSurefireReportsScript(deployJdk) {
+def restoreSurefireReportsScript() {
   return """#!/bin/bash
-if [ -d target/jdk-$deployJdk/surefire-reports.do-not-report-twice ]
+if [ -d target/surefire-reports.do-not-report-twice ]
 then
-  mv target/jdk-$deployJdk/surefire-reports.do-not-report-twice target/jdk-$deployJdk/surefire-reports
+  mv target/surefire-reports.do-not-report-twice target/surefire-reports
 fi
 """
 }
@@ -636,7 +636,7 @@ pipeline {
               }
               def result = lastBuild.result;
               if (result != hudson.model.Result.SUCCESS) {
-                error("${currentWorkflowJob.fullName}: Aborting due to dependency last build not successful: ${upstreamWorkflowJob.fullName} #${lastBuild.number} is ${result}")
+                error("${currentWorkflowJob.fullName}: Aborting due to dependency last build not successful: ${upstreamWorkflowJob.fullName} #${lastBuild.number} is $result")
               }
             }
           }
@@ -766,11 +766,11 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${jdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-                  mavenLocalRepo: ".m2/repository-jdk-${jdk}",
+                  mavenOpts: "${jdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$jdk"
                 ) {
-                  sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=target/jdk-$jdk $buildPhases"
+                  sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk "}$buildPhases"
                 }
               }
               script {
@@ -778,8 +778,8 @@ pipeline {
                 if (testWhenExpression.call()) {
                   testJdks.each() {testJdk ->
                     if (testJdk != jdk) {
-                      sh "${niceCmd}rm $projectDir/target/jdk-$jdk-$testJdk -rf"
-                      sh "${niceCmd}cp -al $projectDir/target/jdk-$jdk $projectDir/target/jdk-$jdk-$testJdk"
+                      sh "${niceCmd}rm $projectDir/target-jdk-$jdk-$testJdk -rf"
+                      sh "${niceCmd}cp -al $projectDir/target${jdk == deployJdk ? '' : "-jdk-$jdk"} $projectDir/target-jdk-$jdk-$testJdk"
                     }
                   }
                 }
@@ -813,7 +813,7 @@ pipeline {
         stages {
           stage('Test') {
             environment {
-              buildDir  = "${(testJdk == jdk) ? ('target/jdk-' + jdk) : ('target/jdk-' + jdk + '-' + testJdk)}"
+              buildDir  = "target${(testJdk == jdk) ? (jdk == deployJdk ? '' : "-jdk-$jdk") : ("-jdk-$jdk-$testJdk")}"
               coverage  = "${(jdk == deployJdk && testJdk == deployJdk && fileExists(projectDir + '/src/main/java') && fileExists(projectDir + '/src/test')) ? '-Pcoverage' : '-P!coverage'}"
               testGoals = "${(coverage == '-Pcoverage') ? 'jacoco:prepare-agent surefire:test jacoco:report' : 'surefire:test'}"
             }
@@ -821,8 +821,8 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${testJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-                  mavenLocalRepo: ".m2/repository-jdk-${jdk}",
+                  mavenOpts: "${testJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$testJdk"
                 ) {
                   sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=$buildDir $coverage $testGoals"
@@ -914,17 +914,17 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
-    sh moveSurefireReportsScript(deployJdk)
+    sh moveSurefireReportsScript()
     withMaven(
       maven: maven,
-      mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-      mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
+      mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+      mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish -Dalt.build.dir=target/jdk-$deployJdk deploy"
+      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
     }
     // Restore surefire-reports
-    sh restoreSurefireReportsScript(deployJdk)
+    sh restoreSurefireReportsScript()
   }
   // Make sure working tree not modified by deploy
   sh checkTreeUnmodifiedScriptDeploy(niceCmd)
@@ -938,11 +938,11 @@ void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, ma
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-        mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
+        mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+        mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
         jdk: "jdk-$deployJdk"
       ) {
-        sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=target/jdk-$deployJdk -Dsonar.coverage.jacoco.xmlReportPaths=target/jdk-$deployJdk/site/jacoco/jacoco.xml sonar:sonar"
+        sh "${niceCmd}$MVN_CMD $mvnCommon -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml sonar:sonar"
       }
     }
   }
diff --git a/all b/all
index 9bd98cb..65b367a 160000
--- a/all
+++ b/all
@@ -1 +1 @@
-Subproject commit 9bd98cb5712b0150a33ef841390cf886996758f3
+Subproject commit 65b367aafb9cf0a60b24c1236926faaec28a6992
diff --git a/bom b/bom
index 8d676bb..de5b921 160000
--- a/bom
+++ b/bom
@@ -1 +1 @@
-Subproject commit 8d676bb164af47505ce9e5d4a2c0bed37facff53
+Subproject commit de5b92149e320cf59132eab875629b20e05dae65
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
index dd87b8c..821b8db 100644
--- a/book/Jenkinsfile
+++ b/book/Jenkinsfile
@@ -479,7 +479,7 @@ def mvnCommon   = "-Dstyle.color=always -N -U -Pjenkins,POST-SNAPSHOT${extraProf
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none
-def niceCmd = (nice == 0) ? '' : "nice -n${nice} "
+def niceCmd = (nice == 0) ? '' : "nice -n$nice "
 
 //
 // Scripts pulled out of pipeline due to "General error during class generation: Method too large"
@@ -512,21 +512,21 @@ fi
 }
 
 // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
-def moveSurefireReportsScript(deployJdk) {
+def moveSurefireReportsScript() {
   return """#!/bin/bash
-if [ -d target/jdk-$deployJdk/surefire-reports ]
+if [ -d target/surefire-reports ]
 then
-  mv target/jdk-$deployJdk/surefire-reports target/jdk-$deployJdk/surefire-reports.do-not-report-twice
+  mv target/surefire-reports target/surefire-reports.do-not-report-twice
 fi
 """
 }
 
 // Restore surefire-reports
-def restoreSurefireReportsScript(deployJdk) {
+def restoreSurefireReportsScript() {
   return """#!/bin/bash
-if [ -d target/jdk-$deployJdk/surefire-reports.do-not-report-twice ]
+if [ -d target/surefire-reports.do-not-report-twice ]
 then
-  mv target/jdk-$deployJdk/surefire-reports.do-not-report-twice target/jdk-$deployJdk/surefire-reports
+  mv target/surefire-reports.do-not-report-twice target/surefire-reports
 fi
 """
 }
@@ -650,7 +650,7 @@ pipeline {
               }
               def result = lastBuild.result;
               if (result != hudson.model.Result.SUCCESS) {
-                error("${currentWorkflowJob.fullName}: Aborting due to dependency last build not successful: ${upstreamWorkflowJob.fullName} #${lastBuild.number} is ${result}")
+                error("${currentWorkflowJob.fullName}: Aborting due to dependency last build not successful: ${upstreamWorkflowJob.fullName} #${lastBuild.number} is $result")
               }
             }
           }
@@ -780,11 +780,11 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${jdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-                  mavenLocalRepo: ".m2/repository-jdk-${jdk}",
+                  mavenOpts: "${jdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$jdk"
                 ) {
-                  sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=target/jdk-$jdk $buildPhases"
+                  sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk "}$buildPhases"
                 }
               }
               script {
@@ -792,8 +792,8 @@ pipeline {
                 if (testWhenExpression.call()) {
                   testJdks.each() {testJdk ->
                     if (testJdk != jdk) {
-                      sh "${niceCmd}rm $projectDir/target/jdk-$jdk-$testJdk -rf"
-                      sh "${niceCmd}cp -al $projectDir/target/jdk-$jdk $projectDir/target/jdk-$jdk-$testJdk"
+                      sh "${niceCmd}rm $projectDir/target-jdk-$jdk-$testJdk -rf"
+                      sh "${niceCmd}cp -al $projectDir/target${jdk == deployJdk ? '' : "-jdk-$jdk"} $projectDir/target-jdk-$jdk-$testJdk"
                     }
                   }
                 }
@@ -827,7 +827,7 @@ pipeline {
         stages {
           stage('Test') {
             environment {
-              buildDir  = "${(testJdk == jdk) ? ('target/jdk-' + jdk) : ('target/jdk-' + jdk + '-' + testJdk)}"
+              buildDir  = "target${(testJdk == jdk) ? (jdk == deployJdk ? '' : "-jdk-$jdk") : ("-jdk-$jdk-$testJdk")}"
               coverage  = "${(jdk == deployJdk && testJdk == deployJdk && fileExists(projectDir + '/src/main/java') && fileExists(projectDir + '/src/test')) ? '-Pcoverage' : '-P!coverage'}"
               testGoals = "${(coverage == '-Pcoverage') ? 'jacoco:prepare-agent surefire:test jacoco:report' : 'surefire:test'}"
             }
@@ -835,8 +835,8 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${testJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-                  mavenLocalRepo: ".m2/repository-jdk-${jdk}",
+                  mavenOpts: "${testJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$testJdk"
                 ) {
                   sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=$buildDir $coverage $testGoals"
@@ -928,17 +928,17 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
-    sh moveSurefireReportsScript(deployJdk)
+    sh moveSurefireReportsScript()
     withMaven(
       maven: maven,
-      mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-      mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
+      mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+      mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish -Dalt.build.dir=target/jdk-$deployJdk deploy"
+      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
     }
     // Restore surefire-reports
-    sh restoreSurefireReportsScript(deployJdk)
+    sh restoreSurefireReportsScript()
   }
   // Make sure working tree not modified by deploy
   sh checkTreeUnmodifiedScriptDeploy(niceCmd)
@@ -952,11 +952,11 @@ void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, ma
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
-        mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
+        mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+        mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
         jdk: "jdk-$deployJdk"
       ) {
-        sh "${niceCmd}$MVN_CMD $mvnCommon -Dalt.build.dir=target/jdk-$deployJdk -Dsonar.coverage.jacoco.xmlReportPaths=target/jdk-$deployJdk/site/jacoco/jacoco.xml sonar:sonar"
+        sh "${niceCmd}$MVN_CMD $mvnCommon -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml sonar:sonar"
       }
     }
   }
diff --git a/model b/model
index 5a46a58..44abe5f 160000
--- a/model
+++ b/model
@@ -1 +1 @@
-Subproject commit 5a46a58940150028d1cd642ada6d363c6917ad82
+Subproject commit 44abe5fb55435cbc8cac032f618d65145b9aa8de
diff --git a/servlet b/servlet
index 2f541ba..e9d1819 160000
--- a/servlet
+++ b/servlet
@@ -1 +1 @@
-Subproject commit 2f541ba6ef2b85db2e21fa0d53a6c423808ee7f2
+Subproject commit e9d18194941a4d5157302e498a22e2fb49047e53
diff --git a/style b/style
index 91f2587..bbfd2c8 160000
--- a/style
+++ b/style
@@ -1 +1 @@
-Subproject commit 91f25879bb97314a8427662222ac16e7790361df
+Subproject commit bbfd2c8920f73f69529a2d4eec879ae3a13335d9
diff --git a/taglib b/taglib
index 716eea1..d73d364 160000
--- a/taglib
+++ b/taglib
@@ -1 +1 @@
-Subproject commit 716eea1498771d0f880185037492549132611929
+Subproject commit d73d3644e020cb66d22bd86872ddc23f38551334
diff --git a/view b/view
index 65dc1ed..25b01c9 160000
--- a/view
+++ b/view
@@ -1 +1 @@
-Subproject commit 65dc1ed91859eb362af099cd0f9abec88d9b4fa8
+Subproject commit 25b01c9f68d888eb1ab63641c855d7f136a72563