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

ao-apps · Sep 8, 2023 · 276aeff · 276aeff
2 parents f4ae262 + ecf1845
commit 276aeff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -955,7 +955,9 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     copyArtifacts(
       projectName: "/${JOB_NAME}",
       selector: lastSuccessful(stable: true),
-      filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
+      // *.pom included so pom-only projects have something to successfully download
+      // The other extensions match the types processed by ao-ant-tasks
+      filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
       optional: !params.requireLastBuild

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -953,7 +953,9 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     copyArtifacts(
       projectName: "/${JOB_NAME}",
       selector: lastSuccessful(stable: true),
-      filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
+      // *.pom included so pom-only projects have something to successfully download
+      // The other extensions match the types processed by ao-ant-tasks
+      filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
       optional: !params.requireLastBuild