From b315c006a440da13b2a590e23c362a2eed560be1 Mon Sep 17 00:00:00 2001 From: "AO Industries, Inc" Date: Thu, 17 Aug 2023 16:24:48 +0000 Subject: [PATCH] Reproducible build ${project.build.outputTimestamp} is now based off ${git.commit.time} via git-commit-id-maven-plugin. Builds now require Java 11 or newer. --- Jenkinsfile | 18 +++++++----------- all | 2 +- bom | 2 +- book/Jenkinsfile | 8 ++++---- book/pom.xml | 3 +-- model | 2 +- pom.xml | 3 +-- servlet | 2 +- style | 2 +- taglib | 2 +- view | 2 +- 11 files changed, 20 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3fce23b..307eacb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,10 +22,6 @@ * along with pragmatickm-task. If not, see . */ -// 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" ) { diff --git a/all b/all index 67b72df..02b24f8 160000 --- a/all +++ b/all @@ -1 +1 @@ -Subproject commit 67b72df7ef568e66ca435665ae3c87b082068294 +Subproject commit 02b24f8c97b01507784fe32aa859baae188c00e7 diff --git a/bom b/bom index a96e789..6666830 160000 --- a/bom +++ b/bom @@ -1 +1 @@ -Subproject commit a96e789a44ec23deb4bc5933716c0cf31ff38d3b +Subproject commit 66668304bb8e182d56713458933e47efd3b1da26 diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 51ea6d5..695e023 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -780,7 +780,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" ) { @@ -835,7 +835,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" ) { @@ -931,7 +931,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" ) { @@ -952,7 +952,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" ) { diff --git a/book/pom.xml b/book/pom.xml index 22af951..f6a6e68 100644 --- a/book/pom.xml +++ b/book/pom.xml @@ -25,7 +25,7 @@ along with pragmatickm-task. If not, see . 4.0.0 - com.pragmatickmpragmatickm-parent1.16.0-POST-SNAPSHOT + com.pragmatickmpragmatickm-parent1.17.0-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,6 @@ along with pragmatickm-task. If not, see . bundle - 2023-02-08T21:06:04Z com.pragmatickm.task.book pragmatickm-task diff --git a/model b/model index 3f5533d..ff08469 160000 --- a/model +++ b/model @@ -1 +1 @@ -Subproject commit 3f5533db47a0c4f01e1e26a1950204c72e1d2a9f +Subproject commit ff08469a996ceb4a54b62c6ccd662f48d7303eb9 diff --git a/pom.xml b/pom.xml index 3e6edfb..059bd87 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ along with pragmatickm-task. If not, see . 4.0.0 - com.pragmatickmpragmatickm-parent1.16.0-POST-SNAPSHOT + com.pragmatickmpragmatickm-parent1.17.0-SNAPSHOT ../parent/pom.xml @@ -33,7 +33,6 @@ along with pragmatickm-task. If not, see . pom - 2023-02-08T21:06:04Z PragmaticKM Task diff --git a/servlet b/servlet index 1f69ddc..a954db7 160000 --- a/servlet +++ b/servlet @@ -1 +1 @@ -Subproject commit 1f69ddc343936f5eb76629d0b38a9b4b8d6220d1 +Subproject commit a954db7c1636f76b1712e2ad0df9d5014ec19b17 diff --git a/style b/style index db12503..2625820 160000 --- a/style +++ b/style @@ -1 +1 @@ -Subproject commit db12503c8621759bdb53e4fe7ebcb94fe2ddbb07 +Subproject commit 2625820ef24c2fcadc147691aacbaf376970adad diff --git a/taglib b/taglib index eafaa61..4dfa5b3 160000 --- a/taglib +++ b/taglib @@ -1 +1 @@ -Subproject commit eafaa6166a1decb04834b326a2fb6fe2a202a8de +Subproject commit 4dfa5b3e6805da72f83b8458f8073ad0cc035797 diff --git a/view b/view index 8ba8572..6b0bdd5 160000 --- a/view +++ b/view @@ -1 +1 @@ -Subproject commit 8ba85728356bd3facafa96b385fadbdd4dbb21bb +Subproject commit 6b0bdd580ff3c398819d1e1e0ea16d6060edd50b