From 8da7a1be4cb5e00ed4f1a86e85d38f135bd90873 Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Fri, 3 May 2024 15:15:54 -0700
Subject: [PATCH 1/2] Put startup properties in correct folder for embedded
 deployments

---
 README.md                                                    | 5 +++++
 build.gradle                                                 | 2 +-
 src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy     | 4 +++-
 .../labkey/gradle/plugin/extension/TeamCityExtension.groovy  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3992c35d..f0b87d21 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_
 
+### 2.6.4
+*Released*: TBD
+(Earliest compatible LabKey version: 24.5)
+* Put startup properties in correct folder for embedded deployments
+
 ### 2.6.3
 *Released*: 12 April 2024
 (Earliest compatible LabKey version: 24.5)
diff --git a/build.gradle b/build.gradle
index 62dc356d..8a25c4e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 }
 
 group 'org.labkey.build'
-project.version = "2.7.0-SNAPSHOT"
+project.version = "2.6.4-startupEmbedded-SNAPSHOT"
 
 gradlePlugin {
     plugins {
diff --git a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
index d33d4a2e..1e4711c6 100644
--- a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
+++ b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
@@ -146,7 +146,9 @@ class TeamCity extends Tomcat
             doLast {
                 String properties = extension.getTeamCityProperty('labkey.startup.properties')
 
-                extension.writeStartupProperties('99_teamcity_startup.properties', properties)
+                if (!properties.isBlank()) {
+                    extension.writeStartupProperties('99_teamcity_startup.properties', properties)
+                }
             }
         }
 
diff --git a/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy b/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
index e89ce40f..f2e34310 100644
--- a/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
+++ b/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
@@ -118,7 +118,7 @@ class TeamCityExtension
     File startupPropertiesDir() {
         File startupDir
         if (BuildUtils.useEmbeddedTomcat(project)) {
-            startupDir = new File(new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project)), 'server/startup')
+            startupDir = new File(new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project)), 'startup')
         } else {
             startupDir = new File(new File(ServerDeployExtension.getServerDeployDirectory(project)), 'startup')
         }

From 0c91d48fe76dcd64f211452954762c8a83aea1ae Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Mon, 6 May 2024 10:12:50 -0700
Subject: [PATCH 2/2] Update for merge

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

diff --git a/README.md b/README.md
index f0b87d21..e45c5555 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ on how to do that, including how to develop and test locally and the versioning
 _Note: 1.28.0 and later require Gradle 7_
 
 ### 2.6.4
-*Released*: TBD
+*Released*: 6 May 2024
 (Earliest compatible LabKey version: 24.5)
 * Put startup properties in correct folder for embedded deployments
 
diff --git a/build.gradle b/build.gradle
index 8a25c4e7..62dc356d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 }
 
 group 'org.labkey.build'
-project.version = "2.6.4-startupEmbedded-SNAPSHOT"
+project.version = "2.7.0-SNAPSHOT"
 
 gradlePlugin {
     plugins {