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.
ao-apps · Aug 17, 2023 · 269cebe · 269cebe
1 parent 2650dca
commit 269cebe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -22,9 +22,6 @@
  * along with ao-javadoc-offline.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// JDK versions
-def testJdks  = ['1.8', '11', '17', '20'] // Changes must be copied to matrix axes!
-
 // Parent, Extensions, Plugins, Direct and BOM Dependencies
 def upstreamProjects = [
   // Parent
@@ -771,7 +768,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"
                 ) {
@@ -812,7 +809,7 @@ pipeline {
           }
           axis {
             name 'testJdk'
-            values '1.8', '11', '17', '20' // testJdks
+            values '11', '17', '20' // testJdks
           }
         }
         stages {
@@ -826,7 +823,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"
                 ) {
@@ -922,7 +919,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"
     ) {
@@ -943,7 +940,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/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
@@ -25,15 +25,14 @@ along with ao-javadoc-offline.  If not, see <https://www.gnu.org/licenses/>.
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.aoapps</groupId><artifactId>ao-oss-parent</artifactId><version>1.22.0-POST-SNAPSHOT</version>
+    <groupId>com.aoapps</groupId><artifactId>ao-oss-parent</artifactId><version>1.23.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>com.aoapps</groupId><artifactId>ao-javadoc-offline-book</artifactId><version>3.4.1-POST-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <project.build.outputTimestamp>2023-08-02T18:50:36Z</project.build.outputTimestamp>
     <module.name>com.aoapps.javadoc.offline.book</module.name>
     <!-- These values are copied from the project being documented -->
     <documented.artifactId>ao-javadoc-offline</documented.artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,15 +25,14 @@ along with ao-javadoc-offline.  If not, see <https://www.gnu.org/licenses/>.
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.aoapps</groupId><artifactId>ao-oss-parent</artifactId><version>1.22.0-POST-SNAPSHOT</version>
+    <groupId>com.aoapps</groupId><artifactId>ao-oss-parent</artifactId><version>1.23.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>com.aoapps</groupId><artifactId>ao-javadoc-offline</artifactId><version>3.4.1-POST-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <project.build.outputTimestamp>2023-08-02T17:54:39Z</project.build.outputTimestamp>
     <module.name>com.aoapps.javadoc.offline</module.name>
   </properties>