Skip to content

Commit

Permalink
Fix: [AEA-0000] - rollback hapi fhir upgrade (#223)
Browse files Browse the repository at this point in the history
## Summary

- Routine Change

### Details

- rollback fhir upgrade
- use latest java and alpine images
  • Loading branch information
anthony-nhs authored Feb 18, 2025
1 parent 77bbe64 commit a43ecc2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM eclipse-temurin:21.0.2_13-jdk-alpine AS jre-build
FROM eclipse-temurin:23.0.1_11-jdk-alpine-3.21 AS jre-build
RUN apk update; \
apk upgrade

Expand Down Expand Up @@ -27,7 +27,7 @@ RUN jlink \
--output /javaruntime

# now actually create the runtime image we want
FROM alpine:3.19.1 AS runtime
FROM alpine:3.21.2 AS runtime
RUN apk update; \
apk upgrade
ENV JAVA_HOME=/opt/java/openjdk
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<kotlin.version>2.1.10</kotlin.version>
<fhir.version>7.6.1</fhir.version>
<fhir.version>5.4.2</fhir.version>
<fasterxml.version>2.18.2</fasterxml.version>
<sonar.organization>nhsdigital</sonar.organization>
<sonar.projectKey>NHSDigital_validation-service-fhir-r4</sonar.projectKey>
Expand Down Expand Up @@ -127,11 +127,14 @@
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
<version>${fhir.version}</version>
</dependency>
<!--
only needed for later fhir-hapi
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-caching-caffeine</artifactId>
<version>${fhir.version}</version>
</dependency>
-->
<dependency>
<groupId>io.github.oshai</groupId>
<artifactId>kotlin-logging-jvm</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ class ValidationConfiguration(private val implementationGuideParser: Implementat
theDisplay: String?,
theValueSet: IBaseResource
): IValidationSupport.CodeValidationResult? {
val valueSetUrl = CommonCodeSystemsTerminologyService.getValueSetUrl(fhirContext, theValueSet)
// this is needed for later version of hapi-fhir
// val valueSetUrl = CommonCodeSystemsTerminologyService.getValueSetUrl(fhirContext, theValueSet)
val valueSetUrl = CommonCodeSystemsTerminologyService.getValueSetUrl(theValueSet)

if (valueSetUrl == "https://fhir.nhs.uk/ValueSet/NHSDigital-MedicationRequest-Code"
|| valueSetUrl == "https://fhir.nhs.uk/ValueSet/NHSDigital-MedicationDispense-Code"
Expand Down

0 comments on commit a43ecc2

Please sign in to comment.