Merge remote-tracking branch 'origin/1.x'

Jenkinsfile

@@ -22,10 +22,6 @@
  * along with semanticcms-file.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// JDK versions
-def buildJdks = ['1.8', '11', '17', '20'] // Changes must be copied to matrix axes!
-def testJdks  = ['1.8', '11', '17', '20'] // Changes must be copied to matrix axes!
-
 // Parent, Extensions, Plugins, Direct and BOM Dependencies
 def upstreamProjects = [
   // Parent
@@ -761,7 +757,7 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '1.8', '11', '17', '20' // buildJdks
+            values '11', '17', '20' // buildJdks
           }
         }
         stages {
@@ -770,7 +766,7 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${(jdk == '1.8' || jdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+                  mavenOpts: "${jdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
                   mavenLocalRepo: ".m2/repository-jdk-${jdk}",
                   jdk: "jdk-$jdk"
                 ) {
@@ -807,11 +803,11 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '1.8', '11', '17', '20' // buildJdks
+            values '11', '17', '20' // buildJdks
           }
           axis {
             name 'testJdk'
-            values '1.8', '11', '17', '20' // testJdks
+            values '11', '17', '20' // testJdks
           }
         }
         stages {
@@ -825,7 +821,7 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${(testJdk == '1.8' || testJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+                  mavenOpts: "${testJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
                   mavenLocalRepo: ".m2/repository-jdk-${jdk}",
                   jdk: "jdk-$testJdk"
                 ) {
@@ -921,7 +917,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     sh moveSurefireReportsScript(deployJdk)
     withMaven(
       maven: maven,
-      mavenOpts: "${(deployJdk == '1.8' || deployJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+      mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
       mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
       jdk: "jdk-$deployJdk"
     ) {
@@ -942,7 +938,7 @@ void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, ma
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${(deployJdk == '1.8' || deployJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+        mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
         mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
         jdk: "jdk-$deployJdk"
       ) {

book/Jenkinsfile

@@ -781,7 +781,7 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${(jdk == '1.8' || jdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+                  mavenOpts: "${jdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
                   mavenLocalRepo: ".m2/repository-jdk-${jdk}",
                   jdk: "jdk-$jdk"
                 ) {
@@ -836,7 +836,7 @@ pipeline {
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${(testJdk == '1.8' || testJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+                  mavenOpts: "${testJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
                   mavenLocalRepo: ".m2/repository-jdk-${jdk}",
                   jdk: "jdk-$testJdk"
                 ) {
@@ -932,7 +932,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     sh moveSurefireReportsScript(deployJdk)
     withMaven(
       maven: maven,
-      mavenOpts: "${(deployJdk == '1.8' || deployJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+      mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
       mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
       jdk: "jdk-$deployJdk"
     ) {
@@ -953,7 +953,7 @@ void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, ma
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${(deployJdk == '1.8' || deployJdk == '11') ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
+        mavenOpts: "${deployJdk == '11' ? mavenOpts : (mavenOpts + ' ' + mavenOptsJdk16)}",
         mavenLocalRepo: ".m2/repository-jdk-${deployJdk}",
         jdk: "jdk-$deployJdk"
       ) {

book/pom.xml

@@ -33,7 +33,6 @@ along with semanticcms-file.  If not, see <https://www.gnu.org/licenses/>.
   <packaging>bundle</packaging>
 
   <properties>
-    <project.build.outputTimestamp>2023-02-08T21:06:04Z</project.build.outputTimestamp>
     <module.name>com.semanticcms.file.book</module.name>
     <!-- These values are copied from the project being documented -->
     <documented.artifactId>semanticcms-file</documented.artifactId>

pom.xml

@@ -33,7 +33,6 @@ along with semanticcms-file.  If not, see <https://www.gnu.org/licenses/>.
   <packaging>pom</packaging>
 
   <properties>
-    <project.build.outputTimestamp>2023-02-08T21:06:04Z</project.build.outputTimestamp>
   </properties>
 
   <name>SemanticCMS File</name>