Merge pull request #3010 from IBM/lee-main-3

upgrade to liberty 21.0.0.11

Author: lmsurpre

fhir-install/Dockerfile

@@ -5,7 +5,7 @@
 # ----------------------------------------------------------------------------
 # Stage: Base
 
-FROM openliberty/open-liberty:21.0.0.9-kernel-slim-java11-openj9-ubi as base
+FROM openliberty/open-liberty:21.0.0.11-kernel-slim-java11-openj9-ubi as base
 
 USER root
 RUN yum install -y unzip
@@ -22,7 +22,7 @@ COPY src/main/docker/ibm-fhir-server/bootstrap.sh /opt/ibm-fhir-server/
 # ----------------------------------------------------------------------------
 # Stage: Runnable
 
-FROM openliberty/open-liberty:21.0.0.9-kernel-slim-java11-openj9-ubi
+FROM openliberty/open-liberty:21.0.0.11-kernel-slim-java11-openj9-ubi
 
 ARG VERBOSE=true
 ARG FHIR_VERSION=4.10.0-SNAPSHOT

fhir-install/src/main/resources/scripts/install.bat

@@ -7,7 +7,7 @@
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-set LIBERTY_VERSION=21.0.0.9
+set LIBERTY_VERSION=21.0.0.11
 
 echo Executing %0 to deploy the fhir-server web application...
 

fhir-install/src/main/resources/scripts/install.sh

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################################
 
-export LIBERTY_VERSION="21.0.0.9"
+export LIBERTY_VERSION="21.0.0.11"
 
 echo "
 Executing $0 to deploy the fhir-server web application...

fhir-parent/pom.xml

@@ -160,7 +160,7 @@
             <dependency>
                 <groupId>io.openliberty</groupId>
                 <artifactId>openliberty-runtime</artifactId>
-                <version>21.0.0.9</version>
+                <version>21.0.0.11</version>
                 <type>zip</type>
             </dependency>
             <dependency>

fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchAllTest.java

@@ -234,7 +234,7 @@ public void testSearchAllUsingTagSystemOnly() throws Exception {
         FHIRResponse response = client.searchAll(parameters, false, headerTenant, headerDataStore);
         assertResponse(response.getResponse(), Response.Status.OK.getStatusCode());
         Bundle bundle = response.getResource(Bundle.class);
-        
+
         assertNotNull(bundle);
         printOutResource(DEBUG_SEARCH, bundle);
 

fhir-server-webapp/src/main/webapp/WEB-INF/web.xml

@@ -11,8 +11,14 @@
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>com.ibm.fhir.server.FHIRApplication</param-value>
         </init-param>
+        <init-param>
+            <!-- Required to avoid conflict between CXF and FHIR interpretation of the _type query param -->
+            <param-name>org.apache.cxf.jaxrs.mediaTypeCheck.strict</param-name>
+            <param-value>false</param-value>
+        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+
     <servlet-mapping>
         <servlet-name>FHIRRestServlet</servlet-name>
         <url-pattern>/*</url-pattern>