From 3325ead4606562599f3546c052ef75403d3e8fb6 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 9 Jun 2025 12:11:38 -0700 Subject: [PATCH 1/2] Re-enable shutdown endpoint --- server/embedded/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle index c3f44c42cf..b2a747f7dc 100644 --- a/server/embedded/build.gradle +++ b/server/embedded/build.gradle @@ -1,8 +1,7 @@ +import org.labkey.gradle.plugin.extension.ServerDeployExtension +import org.labkey.gradle.task.CheckForVersionConflicts import org.labkey.gradle.util.BuildUtils -import org.labkey.gradle.util.PomFileHelper import org.labkey.gradle.util.GroupNames -import org.labkey.gradle.task.CheckForVersionConflicts -import org.labkey.gradle.plugin.extension.ServerDeployExtension plugins { id "java" @@ -36,6 +35,7 @@ configurations.configureEach { } dependencies { + implementation "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}" // Required for shutdown endpoint implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") { exclude group: "org.springframework.boot", module: "spring-boot-starter-json" // Not used (?) and pulls in an old version of Jackson exclude group: "jakarta.annotation", module: "jakarta.annotation-api" // Already present in tomcat-annotations-api From b38e7c09f69e0195f41810a2c62c2518c6bb7c29 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 9 Jun 2025 12:16:41 -0700 Subject: [PATCH 2/2] Fix imports --- server/embedded/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle index b2a747f7dc..4adac654b4 100644 --- a/server/embedded/build.gradle +++ b/server/embedded/build.gradle @@ -1,7 +1,8 @@ -import org.labkey.gradle.plugin.extension.ServerDeployExtension -import org.labkey.gradle.task.CheckForVersionConflicts import org.labkey.gradle.util.BuildUtils +import org.labkey.gradle.util.PomFileHelper import org.labkey.gradle.util.GroupNames +import org.labkey.gradle.task.CheckForVersionConflicts +import org.labkey.gradle.plugin.extension.ServerDeployExtension plugins { id "java"