Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Put startup properties in correct folder for embedded deployments #208

Merged
merged 2 commits into from
May 6, 2024
Merged

Put startup properties in correct folder for embedded deployments #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da7a1b
Put startup properties in correct folder for embedded deployments
labkey-tchad May 3, 2024
0c91d48
Update for merge
labkey-tchad May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*: 6 May 2024
(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)
Expand Down
4 changes: 3 additions & 1 deletion src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down