From 60d5b2545017cbf9d3b98e5f76cfff8646ea52dc Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Mon, 9 Dec 2024 10:28:49 -0800 Subject: [PATCH 1/2] Update project paths in moduleSet files (#946) --- gradle/settings/communityArtifacts.gradle | 1 - gradle/settings/ehr.gradle | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle/settings/communityArtifacts.gradle b/gradle/settings/communityArtifacts.gradle index 93728be50a..8a4442b44e 100644 --- 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 index c37e2bef1b..3522628fd3 100644 --- a/gradle/settings/ehr.gradle +++ b/gradle/settings/ehr.gradle @@ -53,6 +53,7 @@ List 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" From b1a06f3a9bd52aa6b4db049c21ba10c63f769e51 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 9 Dec 2024 15:34:13 -0800 Subject: [PATCH 2/2] Update Tomcat to 10.1.34 (#947) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5fe857cbdd..94db979493 100644 --- a/gradle.properties +++ b/gradle.properties @@ -100,7 +100,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