Merge 24.11 to 24.12

LabKey · Dec 10, 2024 · 24abbaa · 24abbaa
2 parents d69dfba + b1a06f3
commit 24abbaa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/gradle.properties b/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

diff --git a/gradle/settings/communityArtifacts.gradle b/gradle/settings/communityArtifacts.gradle
@@ -1,2 +1 @@
 include ":server:testAutomation:buildTestModules:communityArtifacts"
-include ":server:minification"
diff --git a/gradle/settings/ehr.gradle b/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"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		include ":server:testAutomation:buildTestModules:communityArtifacts"
		include ":server:minification"