From 1105e812cf6ba1dfcd9ca792c3c30a4b4e570ea6 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 11 Mar 2024 08:35:34 -0700
Subject: [PATCH 1/4] Skip trigger file creation if not using local build

---
 README.md                                                | 5 +++++
 build.gradle                                             | 2 +-
 src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 73aa9e39..382eb3f6 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ on how to do that, including how to develop and test locally and the versioning
 
 _Note: 1.28.0 and later require Gradle 7_
 
+### TBD
+*Released*: BD
+(Earliest compatible LabKey version: 24.2)
+* Don't write restartTrigger file if not using local build (e.g., on TeamCity)
+
 ### 2.5.0
 *Released*: 10 March 2024
 (Earliest compatible LabKey version: 24.2)
diff --git a/build.gradle b/build.gradle
index bb236881..f9f9e989 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 }
 
 group 'org.labkey.build'
-project.version = "2.6.0-SNAPSHOT"
+project.version = "2.6.0-skipTriggerFile-SNAPSHOT"
 
 gradlePlugin {
     plugins {
diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
index b30fe32d..625ecfb0 100644
--- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
+++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
@@ -918,6 +918,9 @@ class BuildUtils
      */
     static void updateRestartTriggerFile(Project project)
     {
+        if (!project.hasProperty('useLocalBuild') || "false" == project.property("useLocalBuild"))
+            return
+
         OutputStreamWriter writer = null
         try {
             File triggerFile = project.rootProject.layout.buildDirectory.file("deploy/modules/${RESTART_FILE_NAME}").get().getAsFile()

From 34bad1eab345ca703dd6d59a781ea42669255121 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 11 Mar 2024 11:33:37 -0700
Subject: [PATCH 2/4] Avoid errors for missing `disributionDir` property

---
 README.md                                         |  1 +
 .../labkey/gradle/task/ModuleDistribution.groovy  | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 382eb3f6..989783c3 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ _Note: 1.28.0 and later require Gradle 7_
 *Released*: BD
 (Earliest compatible LabKey version: 24.2)
 * Don't write restartTrigger file if not using local build (e.g., on TeamCity)
+* Avoid errors for missing `distributionDir` property
 
 ### 2.5.0
 *Released*: 10 March 2024
diff --git a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
index c7d9b53f..88c19747 100644
--- a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
+++ b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
@@ -15,6 +15,8 @@
  */
 package org.labkey.gradle.task
 
+import org.apache.commons.lang3.StringUtils
+
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -54,8 +56,7 @@ class ModuleDistribution extends DefaultTask
     @Input
     boolean simpleDistribution = false // Set to true to exclude pipeline tools and remote pipeline libraries
 
-    @OutputDirectory
-    File distributionDir
+    private File distributionDir
 
     private final DistributionExtension distExtension
     private Project licensingProject
@@ -77,10 +78,14 @@ class ModuleDistribution extends DefaultTask
     }
 
     @OutputDirectory
-    File getResolvedDistributionDir()
+    File getDistributionDir()
     {
-        if (distributionDir == null && subDirName != null)
-            distributionDir = project.file("${distExtension.dir}/${subDirName}")
+        if (distributionDir == null) {
+            var subDir = StringUtils.trimToNull(subDirName)
+            if (subDir == null)
+                subDir = project.name
+            distributionDir = project.file("${distExtension.dir}/${subDir}")
+        }
         return distributionDir
     }
 

From 36ff0a936840f231929e50b39fc2e2a0e31b7d2a Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 11 Mar 2024 11:51:14 -0700
Subject: [PATCH 3/4] Avoid errors for missing `disributionDir` property

---
 .../org/labkey/gradle/task/ModuleDistribution.groovy   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
index 88c19747..50f7bb55 100644
--- a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
+++ b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
@@ -242,27 +242,27 @@ class ModuleDistribution extends DefaultTask
 
     private String getTarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
     }
 
     private String getEmbeddedTarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
     }
 
     private String getZipArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
     }
 
     private String getEmbeddedZipArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
     }
 
     private String getWarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.war"
+        return "${getDistributionDir()}/${getArchiveName()}.war"
     }
 
     private File getWindowsUtilDir()

From bfd714f443e4be5930e35cd6be7e9fdbccbcd906 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 11 Mar 2024 13:08:43 -0700
Subject: [PATCH 4/4] Prepare for merge to develop

---
 README.md    | 4 ++--
 build.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 989783c3..bf4c9397 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ on how to do that, including how to develop and test locally and the versioning
 
 _Note: 1.28.0 and later require Gradle 7_
 
-### TBD
-*Released*: BD
+### 2.5.1
+*Released*: 11 March 2024
 (Earliest compatible LabKey version: 24.2)
 * Don't write restartTrigger file if not using local build (e.g., on TeamCity)
 * Avoid errors for missing `distributionDir` property
diff --git a/build.gradle b/build.gradle
index f9f9e989..bb236881 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 }
 
 group 'org.labkey.build'
-project.version = "2.6.0-skipTriggerFile-SNAPSHOT"
+project.version = "2.6.0-SNAPSHOT"
 
 gradlePlugin {
     plugins {