Merge 24.11 to 24.12

Author: labkey-teamcity

gradle.properties

@@ -101,7 +101,7 @@ apacheDirectoryVersion=2.1.3
 apacheMinaVersion=2.2.1
 
 # Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
-apacheTomcatVersion=10.1.31
+apacheTomcatVersion=10.1.34
 
 # (mothership) -> json-path -> json-smart -> accessor-smart
 # (core) -> graalvm

gradle/settings/communityArtifacts.gradle

@@ -1,2 +1 @@
 include ":server:testAutomation:buildTestModules:communityArtifacts"
-include ":server:minification"

gradle/settings/ehr.gradle

@@ -53,6 +53,7 @@ List<String> ehrModulesDirs = [
         "server/modules/onprcEHRModules",
         "server/modules/ehrModules",
         "server/modules/snprcEHRModules",
+        "server/modules/tnprcEHRModules",
         "server/modules/wnprc-modules",
         "server/modules/LabDevKitModules"
 ]
@@ -66,9 +67,7 @@ BuildUtils.includeModules(this.settings, rootDir, [BuildUtils.PLATFORM_MODULES_D
 BuildUtils.includeModules(this.settings, rootDir, ehrModulesDirs, excludedModules)
 
 include ":server:modules:snd"
-include ":server:modules:tnprc_ehr"
-include ":server:modules:tnprc_billing"
-include ":server:modules:dataintegration"
+include ":server:modules:premiumModules:dataintegration"
 include ":server:modules:premiumModules:premium"
 include ":server:modules:premiumModules:ldap"