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

ao-apps · Sep 8, 2023 · 801b947 · 801b947
2 parents f488235 + 1005efe
commit 801b947
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -579,7 +579,19 @@ pipeline {
     ]))
   }
   parameters {
-    string(name: 'BuildPriority', defaultValue: "$buildPriority", description: "Specify the priority of this build.\nDefaults to project's depth in the upstream project graph")
+    string(
+      name: 'BuildPriority',
+      defaultValue: "$buildPriority",
+      description: """Specify the priority of this build.
+Defaults to project's depth in the upstream project graph."""
+    )
+    booleanParam(
+      name: 'requireLastBuild',
+      defaultValue: true,
+      description: """Is the last build required for the zip-timestamp-merge Ant task?
+Defaults to true and will typically only be false for either the first build
+or any build that adds or removes build artifacts."""
+    )
   }
   triggers {
     upstream(
@@ -922,7 +934,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     copyArtifacts(
       projectName: "/${JOB_NAME}",
       selector: lastSuccessful(stable: false),
-      filter: '**/*.aar, **/*.jar, **/*.war',
+      filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
       optional: true

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -594,7 +594,19 @@ pipeline {
     ]))
   }
   parameters {
-    string(name: 'BuildPriority', defaultValue: "$buildPriority", description: "Specify the priority of this build.\nDefaults to project's depth in the upstream project graph")
+    string(
+      name: 'BuildPriority',
+      defaultValue: "$buildPriority",
+      description: """Specify the priority of this build.
+Defaults to project's depth in the upstream project graph."""
+    )
+    booleanParam(
+      name: 'requireLastBuild',
+      defaultValue: true,
+      description: """Is the last build required for the zip-timestamp-merge Ant task?
+Defaults to true and will typically only be false for either the first build
+or any build that adds or removes build artifacts."""
+    )
   }
   triggers {
     upstream(
@@ -937,7 +949,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     copyArtifacts(
       projectName: "/${JOB_NAME}",
       selector: lastSuccessful(stable: false),
-      filter: '**/*.aar, **/*.jar, **/*.war',
+      filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
       optional: true

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view