diff --git a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java index 7ecb15e3c5c..1244378e12d 100644 --- a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java +++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java @@ -316,7 +316,6 @@ public class FhirResourceDaoR4Test extends BaseJpaR4Test { public void testTermConceptReindexingDoesntDuplicateData() { myStorageSettings.setSchedulingDisabled(true); - CodeSystem cs = new CodeSystem(); cs.setId("nhin-use"); cs.setUrl("http://zoop.com"); diff --git a/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java b/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java index 66c6bbc990c..4686555cbcf 100644 --- a/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java +++ b/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java @@ -335,6 +335,7 @@ public class OpenApiInterceptor { HttpServletRequest servletRequest = theRequestDetails.getServletRequest(); ServletContext servletContext = servletRequest.getServletContext(); + WebContext context = new WebContext(servletRequest, theResponse, servletContext); context.setVariable(REQUEST_DETAILS, theRequestDetails); context.setVariable("DESCRIPTION", cs.getImplementation().getDescription()); diff --git a/pom.xml b/pom.xml index 228c3a27979..1ecf90d0963 100644 --- a/pom.xml +++ b/pom.xml @@ -929,7 +929,7 @@ 2.10.0 4.8.1 0.7.9 - 31.0.1-jre + 32.1.1-jre 2.8.9 2.2.11_1 2.3.1 @@ -951,8 +951,8 @@ 6.1.5.Final 4.4.13 4.5.13 - 2.15.0 - 2.15.0 + 2.15.2 + 2.15.2 3.3.0 1.8 4.10.0 @@ -1095,7 +1095,7 @@ com.graphql-java graphql-java - 19.4 + 21.0