Merge branch 'main' into SpringBoot-wip

CMSgov · Aug 27, 2024 · 56485cd · 56485cd
2 parents b187011 + 2395d12
commit 56485cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ab2d-events-client/build.gradle b/ab2d-events-client/build.gradle
@@ -4,7 +4,8 @@ dependencies {
     implementation "commons-codec:commons-codec:1.9"
     implementation "org.springframework.boot:spring-boot-starter:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
-    implementation "org.springframework:spring-web:${springBootVersion}"
+    implementation "org.springframework:spring-web:${springWebVersion}"
+    implementation "org.springframework:spring-webmvc:${springWebVersion}"
     implementation "org.springframework.boot:spring-boot-starter-jdbc:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
     implementation "io.awspring.cloud:spring-cloud-aws-dependencies:${springCloudAwsVersion}"

diff --git a/ab2d-fhir/src/main/java/gov/cms/ab2d/fhir/IdentifierUtils.java b/ab2d-fhir/src/main/java/gov/cms/ab2d/fhir/IdentifierUtils.java
@@ -229,7 +229,7 @@ public static PatientIdentifier.Currency getCurrencyFromTypeCodingExtension(ICom
         if (checkCurrencyUrlIsNotValid(url)) {
             return PatientIdentifier.Currency.UNKNOWN;
         }
-        
+
         Object currValue = Versions.invokeGetMethod(extension, GET_VALUE);
         String extValueSystem = (String) Versions.invokeGetMethod(currValue, GET_SYSTEM);
         if (CURRENCY_IDENTIFIER.equalsIgnoreCase(extValueSystem)) {

diff --git a/build.gradle b/build.gradle
@@ -37,9 +37,10 @@ ext {
 
     commonsLangVersion='3.12.0'
     lombokVersion = '1.18.34'
-    hapiVersion = '7.2.2'
     springBootVersion='3.2.8'
     springCloudAwsVersion='3.1.1'
+    hapiVersion = '6.8.0'
+    springWebVersion="5.3.26"
     newRelicVersion='8.4.0'
     testContainerVersion='1.20.1'
     mockServerVersion='5.15.0'