Merge pull request #1 from NHSDigital/hapi-6.8.0

Hapi 6.8.0
NHSDigital · Aug 23, 2023 · ba6bde6 · ba6bde6
2 parents 2e56800 + 90ca700
commit ba6bde6
Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/aws-repo-notes.txt b/aws-repo-notes.txt
@@ -23,11 +23,11 @@ mvn clean install
 docker build -t fhir-validator-r4 .
 
 docker tag fhir-validator-r4:latest 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:latest
-docker tag fhir-validator-r4:latest 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:2.10.0
+docker tag fhir-validator-r4:latest 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:6.8.0
 
 docker push 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:latest
 
-docker push 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:2.10.0
+docker push 365027538941.dkr.ecr.eu-west-2.amazonaws.com/fhir-validator-r4:6.8.0
 
 
 

diff --git a/pom.xml b/pom.xml
@@ -5,21 +5,22 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>2.7.12</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>uk.nhs.england</groupId>
     <artifactId>IOPS-FHIR-Validation-Service</artifactId>
-    <version>2.10.0</version>
+    <version>6.8.0</version>
     <name>IOPS-FHIR-Validation-Service</name>
     <description>HAPI FHIR Validator using Spring Boot</description>
 
     <properties>
         <java.version>1.8</java.version>
         <kotlin.version>1.6.21</kotlin.version>
-        <fhir.version>6.6.0</fhir.version>
+        <fhir.version>6.8.0</fhir.version>
         <swagger_version>2.1.12</swagger_version>
         <parser_version>2.0.30</parser_version>
+        <jackson_databind_version>2.15.2</jackson_databind_version>
     </properties>
 
     <dependencies>
@@ -52,6 +53,17 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+            <version>${jackson_databind_version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson_databind_version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -17,7 +17,7 @@ fhir:
   server:
     name: IOPS FHIR Testing
     baseUrl: https://3cdzg7kbj4.execute-api.eu-west-2.amazonaws.com/poc/Conformance
-    version: 2.10.0
+    version: 6.8.0
 
 
 

diff --git a/src/main/resources/manifest.json b/src/main/resources/manifest.json
@@ -1,11 +1,11 @@
 [
   {
     "packageName": "fhir.r4.ukcore.stu3.currentbuild",
-    "version": "0.0.5-sprint-6-review"
+    "version": "0.0.6-pre-release"
   },
   {
     "packageName": "uk.nhsdigital.r4.test",
-    "version": "2.8.8-prerelease"
+    "version": "2.8.15-prerelease"
   },
   {
     "packageName": "hl7.fhir.uv.sdc",