From aa5d9cc71f77917a6744610a68a89478d2880561 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:33:17 +0300
Subject: [PATCH 01/21] Dependencies upgrade (#307)

---
 pom.xml        |  6 +++---
 server/pom.xml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98ef2fca..f9ce25d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
       The root cause is that we are using an older version of Spring. -->
     <slf4j.version>1.7.36</slf4j.version>
     <logback.version>1.2.13</logback.version>
-    <license-maven-plugin.version>4.3</license-maven-plugin.version>
+    <license-maven-plugin.version>4.6</license-maven-plugin.version>
   </properties>
 
   <dependencies>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -160,7 +160,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.11</version>
+        <version>0.8.12</version>
         <executions>
           <execution>
             <goals>
diff --git a/server/pom.xml b/server/pom.xml
index 4afb9ac5..d0f6564e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -82,19 +82,19 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>1.44.1</version>
+      <version>1.45.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-gson</artifactId>
-      <version>1.44.1</version>
+      <version>1.45.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>1.23.0</version>
+      <version>1.27.0</version>
     </dependency>
 
     <!-- For HTTP Client -->
@@ -128,13 +128,13 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.32</version>
+      <version>1.18.34</version>
     </dependency>
 
   </dependencies>

From 383ae759e700d5688ff896433c9dfb01516c35f1 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
Date: Fri, 4 Oct 2024 18:30:17 +0300
Subject: [PATCH 02/21] Add support for removing query params in request
 mutations (#308)

---
 Dockerfile                                    |  2 +-
 coverage/pom.xml                              |  2 +-
 exec/pom.xml                                  |  2 +-
 plugins/pom.xml                               |  2 +-
 pom.xml                                       |  2 +-
 server/pom.xml                                |  4 +-
 .../BearerAuthorizationInterceptor.java       | 10 +++--
 .../gateway/interfaces/RequestMutation.java   |  9 +++-
 .../BearerAuthorizationInterceptorTest.java   | 43 ++++++++++++++++++-
 9 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 604cfb09..9206fddf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Google LLC
+# Copyright 2021-2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 6c216b84..147420af 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.3.2</version>
+    <version>0.4.0</version>
   </parent>
 
   <groupId>com.google.fhir.gateway</groupId>
diff --git a/exec/pom.xml b/exec/pom.xml
index 5f1067f2..7a6a966f 100755
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.3.2</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>exec</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b3f34b9d..d8a05bfb 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
     implementations do not have to do this; they can redeclare those deps. -->
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.3.2</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>plugins</artifactId>
diff --git a/pom.xml b/pom.xml
index f9ce25d9..d32ce10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>com.google.fhir.gateway</groupId>
   <artifactId>fhir-gateway</artifactId>
-  <version>0.3.2</version>
+  <version>0.4.0</version>
   <packaging>pom</packaging>
 
   <name>FHIR Information Gateway</name>
diff --git a/server/pom.xml b/server/pom.xml
index d0f6564e..222561ef 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021-2023 Google LLC
+    Copyright 2021-2024 Google LLC
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.3.2</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>server</artifactId>
diff --git a/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java b/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
index 2fe9a467..00b4dd05 100755
--- a/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
+++ b/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -283,12 +283,16 @@ private void serveWellKnown(ServletRequestDetails request) {
   void mutateRequest(RequestDetails requestDetails, AccessDecision accessDecision) {
     RequestMutation mutation =
         accessDecision.getRequestMutation(new RequestDetailsToReader(requestDetails));
-    if (mutation == null || CollectionUtils.isEmpty(mutation.getQueryParams())) {
+    if (mutation == null
+        || (CollectionUtils.isEmpty(mutation.getAdditionalQueryParams())
+            && CollectionUtils.isEmpty(mutation.getDiscardQueryParams()))) {
       return;
     }
 
+    mutation.getDiscardQueryParams().forEach(requestDetails::removeParameter);
+
     mutation
-        .getQueryParams()
+        .getAdditionalQueryParams()
         .forEach((key, value) -> requestDetails.addParameter(key, value.toArray(new String[0])));
   }
 }
diff --git a/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java b/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java
index fdcac3dd..2357c849 100644
--- a/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java
+++ b/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.google.fhir.gateway.interfaces;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,5 +32,9 @@ public class RequestMutation {
   // New values overwrites the old one if there is a conflict for a request param (i.e. a returned
   // parameter in RequestMutation is already present in the original request).
   // Old parameter values should be explicitly retained while mutating values for that parameter.
-  @Builder.Default Map<String, List<String>> queryParams = new HashMap<>();
+  @Builder.Default Map<String, List<String>> additionalQueryParams = new HashMap<>();
+
+  // Query parameters that are no longer needed when forwarding the request to the upstream server
+  // Parameters with the keys in this list will be removed
+  @Builder.Default List<String> discardQueryParams = new ArrayList<>();
 }
diff --git a/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java b/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
index 87e6b02a..91436110 100644
--- a/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
+++ b/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
 import java.io.Writer;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +54,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
+import org.hamcrest.Matchers;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.CapabilityStatement;
 import org.junit.Before;
@@ -287,7 +289,7 @@ public boolean canAccess() {
           }
 
           public RequestMutation getRequestMutation(RequestDetailsReader requestDetailsReader) {
-            return RequestMutation.builder().queryParams(paramMutations).build();
+            return RequestMutation.builder().additionalQueryParams(paramMutations).build();
           }
 
           public String postProcess(
@@ -307,6 +309,43 @@ public String postProcess(
         arrayContainingInAnyOrder("param3-value2", "param3-value1"));
   }
 
+  @Test
+  public void mutateRequestRemoveQueryParams() {
+
+    List<String> queryParamsToRemove = new ArrayList<>();
+    queryParamsToRemove.add("param1");
+
+    ServletRequestDetails requestDetails = new ServletRequestDetails();
+    requestDetails.addParameter("param1", new String[] {"param1-value1"});
+    requestDetails.addParameter("param2", new String[] {"param2-value1"});
+
+    AccessDecision mutableAccessDecision =
+        new AccessDecision() {
+          public boolean canAccess() {
+            return true;
+          }
+
+          public RequestMutation getRequestMutation(RequestDetailsReader requestDetailsReader) {
+            RequestMutation requestMutation = RequestMutation.builder().build();
+            requestMutation.getDiscardQueryParams().addAll(queryParamsToRemove);
+            return requestMutation;
+          }
+
+          public String postProcess(
+              RequestDetailsReader requestDetailsReader, HttpResponse response) throws IOException {
+            return null;
+          }
+        };
+    assertThat(requestDetails.getParameters().size(), Matchers.equalTo(2));
+
+    testInstance.mutateRequest(requestDetails, mutableAccessDecision);
+
+    assertThat(requestDetails.getParameters().size(), Matchers.equalTo(1));
+
+    assertThat(
+        requestDetails.getParameters().get("param2"), arrayContainingInAnyOrder("param2-value1"));
+  }
+
   @Test
   public void shouldSendGzippedResponseWhenRequested() throws IOException {
     testInstance = createTestInstance(true, null);

From 4ec9e6e3e86fc0dc9894f8cffd95238c407661e0 Mon Sep 17 00:00:00 2001
From: Bashir Sadjad <bashir@google.com>
Date: Thu, 10 Oct 2024 12:37:27 -0400
Subject: [PATCH 03/21] Updates Spring to 6.1.13 and other version updates
 (#310)

---
 .github/workflows/codecov.yml                 |  2 +-
 .github/workflows/codeql.yml                  |  5 +++
 Dockerfile                                    |  6 +--
 exec/pom.xml                                  |  4 +-
 .../gateway/CustomFhirEndpointExample.java    | 12 +++---
 .../gateway/CustomGenericEndpointExample.java | 10 ++---
 .../com/google/fhir/gateway/MainAppTest.java  | 28 +++++++------
 plugins/pom.xml                               |  2 +-
 .../gateway/plugin/PatientAccessChecker.java  |  2 +-
 pom.xml                                       | 15 +++----
 server/pom.xml                                | 41 +++++++++++++------
 .../BearerAuthorizationInterceptor.java       | 13 +-----
 .../google/fhir/gateway/FhirProxyServer.java  |  6 +--
 .../gateway/interfaces/PatientFinder.java     |  7 ++--
 .../BearerAuthorizationInterceptorTest.java   | 12 ++----
 15 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 74cfb7d7..6ff39afb 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Install dependencies
       run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
     - name: Run tests and collect coverage
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8706e02c..931d1397 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -40,6 +40,11 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     - name: Checkout repository
       uses: actions/checkout@v3
 
diff --git a/Dockerfile b/Dockerfile
index 9206fddf..71a9682e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 
 # Image for building and running tests against the source code of
 # the FHIR Gateway.
-FROM maven:3.8.5-openjdk-11-slim as build
+FROM maven:3.8.7-eclipse-temurin-17-focal as build
 
 RUN apt-get update && apt-get install -y nodejs npm
 RUN npm cache clean -f && npm install -g n && n stable
@@ -35,11 +35,11 @@ COPY pom.xml .
 
 RUN mvn spotless:check
 # Updating license will fail in e2e and there is no point doing it here anyways.
-RUN mvn --batch-mode package -Pstandalone-app -Dlicense.skip=true
+RUN mvn --batch-mode package -Dlicense.skip=true
 
 
 # Image for FHIR Gateway binary with configuration knobs as environment vars.
-FROM eclipse-temurin:11-jdk-focal as main
+FROM eclipse-temurin:17-jdk-focal as main
 
 COPY --from=build /app/exec/target/fhir-gateway-exec.jar /
 COPY resources/hapi_page_url_allowed_queries.json resources/hapi_page_url_allowed_queries.json
diff --git a/exec/pom.xml b/exec/pom.xml
index 7a6a966f..d47a6864 100755
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021-2023 Google LLC
+    Copyright 2021-2024 Google LLC
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
   <properties>
     <root.basedir>${project.parent.basedir}</root.basedir>
-    <spring-boot.version>2.7.5</spring-boot.version>
+    <spring-boot.version>3.3.4</spring-boot.version>
     <!-- We do not want to deploy the `exec` uber jar. -->
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
diff --git a/exec/src/main/java/com/google/fhir/gateway/CustomFhirEndpointExample.java b/exec/src/main/java/com/google/fhir/gateway/CustomFhirEndpointExample.java
index 89a826d5..2f175a63 100644
--- a/exec/src/main/java/com/google/fhir/gateway/CustomFhirEndpointExample.java
+++ b/exec/src/main/java/com/google/fhir/gateway/CustomFhirEndpointExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@
 import ca.uhn.fhir.parser.IParser;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.hl7.fhir.instance.model.api.IBaseResource;
diff --git a/exec/src/main/java/com/google/fhir/gateway/CustomGenericEndpointExample.java b/exec/src/main/java/com/google/fhir/gateway/CustomGenericEndpointExample.java
index a8a34954..5b68aa16 100644
--- a/exec/src/main/java/com/google/fhir/gateway/CustomGenericEndpointExample.java
+++ b/exec/src/main/java/com/google/fhir/gateway/CustomGenericEndpointExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package com.google.fhir.gateway;
 
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.http.HttpStatus;
 
 /**
diff --git a/exec/src/test/java/com/google/fhir/gateway/MainAppTest.java b/exec/src/test/java/com/google/fhir/gateway/MainAppTest.java
index 98335949..9f076742 100644
--- a/exec/src/test/java/com/google/fhir/gateway/MainAppTest.java
+++ b/exec/src/test/java/com/google/fhir/gateway/MainAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,20 @@
  */
 package com.google.fhir.gateway;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
 // TODO change this test to fail if the expected plugins cannot be found.
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MainAppTest {
 
-  @Test
-  public void contextLoads() {}
-}
+// TODO uncomment this test possibly with adding the option of passing
+// TOKEN_ISSUER name through system properties (in addition to env vars).
+// Currently in our e2e tests, we verify that the sample app can start with
+// proper TOKEN_ISSUER env var. The behaviour of this test has changed in
+// recent versions of Spring and that's why it is commented out temporarily.
+//
+// @RunWith(SpringRunner.class)
+// @SpringBootTest
+// public class MainAppTest {
+//
+//
+//   @Test
+//   public void contextLoads() {
+//   }
+// }
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d8a05bfb..4c43c3e3 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021-2023 Google LLC
+    Copyright 2021-2024 Google LLC
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/plugins/src/main/java/com/google/fhir/gateway/plugin/PatientAccessChecker.java b/plugins/src/main/java/com/google/fhir/gateway/plugin/PatientAccessChecker.java
index 019b9f39..62144ec6 100644
--- a/plugins/src/main/java/com/google/fhir/gateway/plugin/PatientAccessChecker.java
+++ b/plugins/src/main/java/com/google/fhir/gateway/plugin/PatientAccessChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index d32ce10f..2a8e980a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,17 +71,14 @@
   </distributionManagement>
 
   <properties>
-    <hapifhir_version>6.2.5</hapifhir_version>
+    <hapifhir_version>7.4.3</hapifhir_version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotless.version>2.43.0</spotless.version>
     <root.basedir>${project.basedir}</root.basedir>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <!-- Check this for why we are not using a higher version for now:
-      https://www.slf4j.org/codes.html#StaticLoggerBinder
-      The root cause is that we are using an older version of Spring. -->
-    <slf4j.version>1.7.36</slf4j.version>
-    <logback.version>1.2.13</logback.version>
+    <slf4j.version>2.0.16</slf4j.version>
+    <logback.version>1.5.8</logback.version>
     <license-maven-plugin.version>4.6</license-maven-plugin.version>
   </properties>
 
@@ -129,7 +126,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.11.0</version>
+      <version>5.14.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -289,8 +286,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/server/pom.xml b/server/pom.xml
index 222561ef..d3a3c06c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -31,7 +31,11 @@
     <root.basedir>${project.parent.basedir}</root.basedir>
     <!-- This is chosen based on the Spring Boot version used in exec module.
       Note this module should have no Spring Boot dependency. -->
-    <spring.version>5.3.23</spring.version>
+    <spring.version>6.1.13</spring.version>
+    <!-- We should keep this consistent with Spring's Jakarta dep as well. -->
+    <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
+    <!-- TODO check version compatibility with HAPI and Spring! -->
+    <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
   </properties>
 
   <dependencies>
@@ -41,6 +45,13 @@
       <artifactId>hapi-fhir-server</artifactId>
       <version>${hapifhir_version}</version>
     </dependency>
+    <!-- This is a dependency of both hapi-fhir-server and java-jwt, so
+      we pin a version that can work with both. -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.17.1</version>
+    </dependency>
 
     <!-- At least one "structures" JAR must also be included -->
     <dependency>
@@ -58,10 +69,14 @@
 
     <!-- Needed for JEE/Servlet support -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${jakarta-servlet.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>${jakarta-annotation.version}</version>
     </dependency>
 
     <!-- For Spring -->
@@ -111,18 +126,20 @@
       <version>4.4.0</version>
     </dependency>
 
-    <!-- These are needed for the FhirPath and FHIRPathEngine of HAPI.
-    These are "optional" dependencies for `hapi-fhir-structures-r4`. -->
+    <!-- This is to provide the ca.uhn.fhir.sl.cache.CacheProvider service. -->
+    <dependency>
+      <groupId>ca.uhn.hapi.fhir</groupId>
+      <artifactId>hapi-fhir-caching-caffeine</artifactId>
+      <version>${hapifhir_version}</version>
+    </dependency>
+
+    <!-- This is needed for the FhirPath and FHIRPathEngine of HAPI.
+      This is an "optional" dependency for `hapi-fhir-structures-r4`. -->
     <dependency>
       <groupId>org.fhir</groupId>
       <artifactId>ucum</artifactId>
       <version>1.0.8</version>
     </dependency>
-    <dependency>
-      <groupId>com.github.ben-manes.caffeine</groupId>
-      <artifactId>caffeine</artifactId>
-      <version>3.1.8</version>
-    </dependency>
 
     <!-- Gson -->
     <dependency>
diff --git a/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java b/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
index 00b4dd05..f96d6afc 100755
--- a/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
+++ b/server/src/main/java/com/google/fhir/gateway/BearerAuthorizationInterceptor.java
@@ -182,7 +182,6 @@ public boolean authorizeRequest(RequestDetails requestDetails) {
       Writer writer =
           proxyResponse.getResponseWriter(
               response.getStatusLine().getStatusCode(),
-              response.getStatusLine().toString(),
               DEFAULT_CONTENT_TYPE,
               Constants.CHARSET_NAME_UTF8,
               sendGzippedResponse(servletDetails));
@@ -256,20 +255,10 @@ private void replaceAndCopyResponse(Reader entityContentReader, Writer writer, S
 
   private void serveWellKnown(ServletRequestDetails request) {
     IRestfulResponse proxyResponse = request.getResponse();
-    final String statusLine =
-        String.format(
-            "%s %d %s",
-            request.getServletRequest().getProtocol(),
-            HttpStatus.SC_OK,
-            Constants.HTTP_STATUS_NAMES.get(HttpStatus.SC_OK));
     try {
       Writer writer =
           proxyResponse.getResponseWriter(
-              HttpStatus.SC_OK,
-              statusLine,
-              DEFAULT_CONTENT_TYPE,
-              Constants.CHARSET_NAME_UTF8,
-              false);
+              HttpStatus.SC_OK, DEFAULT_CONTENT_TYPE, Constants.CHARSET_NAME_UTF8, false);
       writer.write(tokenVerifier.getWellKnownConfig());
       writer.close();
     } catch (IOException e) {
diff --git a/server/src/main/java/com/google/fhir/gateway/FhirProxyServer.java b/server/src/main/java/com/google/fhir/gateway/FhirProxyServer.java
index 5ab61d20..76721b3d 100644
--- a/server/src/main/java/com/google/fhir/gateway/FhirProxyServer.java
+++ b/server/src/main/java/com/google/fhir/gateway/FhirProxyServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.interceptor.CorsInterceptor;
 import com.google.fhir.gateway.interfaces.AccessCheckerFactory;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server/src/main/java/com/google/fhir/gateway/interfaces/PatientFinder.java b/server/src/main/java/com/google/fhir/gateway/interfaces/PatientFinder.java
index 2d5f6953..16ca1a69 100644
--- a/server/src/main/java/com/google/fhir/gateway/interfaces/PatientFinder.java
+++ b/server/src/main/java/com/google/fhir/gateway/interfaces/PatientFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import com.google.fhir.gateway.BundlePatients;
 import java.util.Set;
 import org.hl7.fhir.r4.model.Bundle;
-import org.jetbrains.annotations.NotNull;
 
 public interface PatientFinder {
   /**
@@ -28,11 +27,11 @@ public interface PatientFinder {
    *
    * @param requestDetails the request
    * @return the ids of the patients that this query belongs to or an empty set if it cannot be
-   *     inferred.
+   *     inferred (never null).
    * @throws InvalidRequestException for various reasons when unexpected parameters or content are
    *     encountered. Callers are expected to deny access when this happens.
    */
-  @NotNull
+  // TODO add @NotNull once we decide on null-check tooling.
   Set<String> findPatientsFromParams(RequestDetailsReader requestDetails);
 
   /**
diff --git a/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java b/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
index 91436110..0d5cb30a 100644
--- a/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
+++ b/server/src/test/java/com/google/fhir/gateway/BearerAuthorizationInterceptorTest.java
@@ -41,6 +41,7 @@
 import com.google.fhir.gateway.interfaces.RequestDetailsReader;
 import com.google.fhir.gateway.interfaces.RequestMutation;
 import com.google.gson.Gson;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -50,8 +51,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.hamcrest.Matchers;
@@ -125,8 +124,7 @@ private void setupFhirResponse(String fhirStoreResponse, boolean addBearer) thro
     }
     IRestfulResponse proxyResponseMock = Mockito.mock(IRestfulResponse.class);
     when(requestMock.getResponse()).thenReturn(proxyResponseMock);
-    when(proxyResponseMock.getResponseWriter(
-            anyInt(), anyString(), anyString(), anyString(), anyBoolean()))
+    when(proxyResponseMock.getResponseWriter(anyInt(), anyString(), anyString(), anyBoolean()))
         .thenReturn(writerStub);
     TestUtil.setUpFhirResponseMock(fhirResponseMock, fhirStoreResponse);
   }
@@ -174,8 +172,7 @@ public void authorizeRequestTestResourceErrorResponse() throws IOException {
   void noAuthRequestSetup(String requestPath) throws IOException {
     IRestfulResponse proxyResponseMock = Mockito.mock(IRestfulResponse.class);
     when(requestMock.getResponse()).thenReturn(proxyResponseMock);
-    when(proxyResponseMock.getResponseWriter(
-            anyInt(), anyString(), anyString(), anyString(), anyBoolean()))
+    when(proxyResponseMock.getResponseWriter(anyInt(), anyString(), anyString(), anyBoolean()))
         .thenReturn(writerStub);
     when(requestMock.getRequestPath()).thenReturn(requestPath);
   }
@@ -183,9 +180,6 @@ void noAuthRequestSetup(String requestPath) throws IOException {
   @Test
   public void authorizeRequestWellKnown() throws IOException {
     noAuthRequestSetup(BearerAuthorizationInterceptor.WELL_KNOWN_CONF_PATH);
-    HttpServletRequest servletRequestMock = Mockito.mock(HttpServletRequest.class);
-    when(requestMock.getServletRequest()).thenReturn(servletRequestMock);
-    when(servletRequestMock.getProtocol()).thenReturn("HTTP/1.1");
     URL idpUrl = Resources.getResource("idp_keycloak_config.json");
     String testIdpConfig = Resources.toString(idpUrl, StandardCharsets.UTF_8);
     when(tokenVerifierMock.getWellKnownConfig()).thenReturn(testIdpConfig);

From a9a3429dc56f00538a39d778880f24f0f4a9277b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:54:40 -0400
Subject: [PATCH 04/21] Bump jakarta.annotation:jakarta.annotation-api from
 2.1.1 to 3.0.0 (#311)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index d3a3c06c..82a76773 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -35,7 +35,7 @@
     <!-- We should keep this consistent with Spring's Jakarta dep as well. -->
     <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
     <!-- TODO check version compatibility with HAPI and Spring! -->
-    <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
+    <jakarta-annotation.version>3.0.0</jakarta-annotation.version>
   </properties>
 
   <dependencies>

From ee731d03ba9095c371f64882007c9ffefd79d33b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:42:33 -0400
Subject: [PATCH 05/21] Bump logback.version from 1.5.8 to 1.5.11 (#316)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2a8e980a..0c4dcb5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <slf4j.version>2.0.16</slf4j.version>
-    <logback.version>1.5.8</logback.version>
+    <logback.version>1.5.11</logback.version>
     <license-maven-plugin.version>4.6</license-maven-plugin.version>
   </properties>
 

From ac20aed4b4a241072f16f7548cdc06b4fe190a52 Mon Sep 17 00:00:00 2001
From: Bashir Sadjad <bashir@google.com>
Date: Thu, 31 Oct 2024 13:45:56 -0400
Subject: [PATCH 06/21] preparing for next dev iteration (#317)

---
 coverage/pom.xml | 2 +-
 exec/pom.xml     | 2 +-
 plugins/pom.xml  | 2 +-
 pom.xml          | 2 +-
 server/pom.xml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/coverage/pom.xml b/coverage/pom.xml
index 147420af..19f43e7e 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.fhir.gateway</groupId>
diff --git a/exec/pom.xml b/exec/pom.xml
index d47a6864..a8fcd94e 100755
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>exec</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4c43c3e3..7920820a 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
     implementations do not have to do this; they can redeclare those deps. -->
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>plugins</artifactId>
diff --git a/pom.xml b/pom.xml
index 0c4dcb5a..8046554c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>com.google.fhir.gateway</groupId>
   <artifactId>fhir-gateway</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>FHIR Information Gateway</name>
diff --git a/server/pom.xml b/server/pom.xml
index 82a76773..4e1d386c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>server</artifactId>

From bc07933cf6f36da7ff570444030f6a314899fad7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:05:08 -0400
Subject: [PATCH 07/21] Bump hapifhir_version from 7.4.3 to 7.4.5 (#323)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8046554c..be728684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
   </distributionManagement>
 
   <properties>
-    <hapifhir_version>7.4.3</hapifhir_version>
+    <hapifhir_version>7.4.5</hapifhir_version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotless.version>2.43.0</spotless.version>
     <root.basedir>${project.basedir}</root.basedir>

From ac9b698587cc3fe8ffb256f3b1a259a2d5ece779 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 22:30:07 -0400
Subject: [PATCH 08/21] Bump spring-boot.version from 3.3.4 to 3.3.5 (#324)

---
 exec/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 exec/pom.xml

diff --git a/exec/pom.xml b/exec/pom.xml
old mode 100755
new mode 100644
index a8fcd94e..5da189f8
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <root.basedir>${project.parent.basedir}</root.basedir>
-    <spring-boot.version>3.3.4</spring-boot.version>
+    <spring-boot.version>3.3.5</spring-boot.version>
     <!-- We do not want to deploy the `exec` uber jar. -->
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>

From 6595d913f6e43bef0432c24c66bcf7f3775f7aea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 01:17:46 -0400
Subject: [PATCH 09/21] Bump com.fasterxml.jackson.core:jackson-databind from
 2.17.1 to 2.18.1 (#325)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 4e1d386c..0cda74bc 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.17.1</version>
+      <version>2.18.1</version>
     </dependency>
 
     <!-- At least one "structures" JAR must also be included -->

From b746e31b0d96b81b65421caed560d0002a6d54e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 21:35:19 -0400
Subject: [PATCH 10/21] Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to
 6.1.0 (#313)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 0cda74bc..45248020 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -33,7 +33,7 @@
       Note this module should have no Spring Boot dependency. -->
     <spring.version>6.1.13</spring.version>
     <!-- We should keep this consistent with Spring's Jakarta dep as well. -->
-    <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
+    <jakarta-servlet.version>6.1.0</jakarta-servlet.version>
     <!-- TODO check version compatibility with HAPI and Spring! -->
     <jakarta-annotation.version>3.0.0</jakarta-annotation.version>
   </properties>

From f85b4536d81520eb3c218a4a08e466718eb14f54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:23:10 -0400
Subject: [PATCH 11/21] Bump spring.version from 6.1.13 to 6.1.14 (#319)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 45248020..49257b31 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -31,7 +31,7 @@
     <root.basedir>${project.parent.basedir}</root.basedir>
     <!-- This is chosen based on the Spring Boot version used in exec module.
       Note this module should have no Spring Boot dependency. -->
-    <spring.version>6.1.13</spring.version>
+    <spring.version>6.1.14</spring.version>
     <!-- We should keep this consistent with Spring's Jakarta dep as well. -->
     <jakarta-servlet.version>6.1.0</jakarta-servlet.version>
     <!-- TODO check version compatibility with HAPI and Spring! -->

From 1564350f8fd925666d2466ac19bc59841d5b5ca9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:44:33 -0400
Subject: [PATCH 12/21] Bump org.mockito:mockito-core from 5.14.1 to 5.14.2
 (#320)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be728684..03d7e0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.14.1</version>
+      <version>5.14.2</version>
       <scope>test</scope>
     </dependency>
 

From 64947e6f9869f87b58d689cb6ecef47ffbaa1458 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:42:03 -0500
Subject: [PATCH 13/21] Bump logback.version from 1.5.11 to 1.5.12 (#321)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 03d7e0b2..9d2d4d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <slf4j.version>2.0.16</slf4j.version>
-    <logback.version>1.5.11</logback.version>
+    <logback.version>1.5.12</logback.version>
     <license-maven-plugin.version>4.6</license-maven-plugin.version>
   </properties>
 

From 678cf28dcf7031807ee3267949f347af19b7f501 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:01:48 -0500
Subject: [PATCH 14/21] Bump com.google.auth:google-auth-library-oauth2-http
 (#322)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 49257b31..9ff277ee 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>1.27.0</version>
+      <version>1.29.0</version>
     </dependency>
 
     <!-- For HTTP Client -->

From 1ac967145b28322ed16da3dff5f850fc0a4f1484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:07:32 -0500
Subject: [PATCH 15/21] Bump spring.version from 6.1.14 to 6.2.0 (#326)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 9ff277ee..06a1c36a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -31,7 +31,7 @@
     <root.basedir>${project.parent.basedir}</root.basedir>
     <!-- This is chosen based on the Spring Boot version used in exec module.
       Note this module should have no Spring Boot dependency. -->
-    <spring.version>6.1.14</spring.version>
+    <spring.version>6.2.0</spring.version>
     <!-- We should keep this consistent with Spring's Jakarta dep as well. -->
     <jakarta-servlet.version>6.1.0</jakarta-servlet.version>
     <!-- TODO check version compatibility with HAPI and Spring! -->

From 8ba3ee722eafa252d618393812440dd497d49053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 12:35:48 -0500
Subject: [PATCH 16/21] Bump org.projectlombok:lombok from 1.18.34 to 1.18.36
 (#328)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 06a1c36a..607a1000 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.34</version>
+      <version>1.18.36</version>
     </dependency>
 
   </dependencies>

From 5a5507fba867aa3a88adff8bc0f8063fb85bbbf9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:30:14 -0500
Subject: [PATCH 17/21] Bump com.google.http-client:google-http-client from
 1.45.0 to 1.45.1 (#330)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 607a1000..9a2a9715 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>1.45.0</version>
+      <version>1.45.1</version>
     </dependency>
 
     <dependency>

From 73ae245bea304908e0ec86b3ebb6e8bbc2f26b8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:55:43 -0500
Subject: [PATCH 18/21] Bump com.google.http-client:google-http-client-gson
 (#329)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 9a2a9715..9b4f251f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-gson</artifactId>
-      <version>1.45.0</version>
+      <version>1.45.1</version>
     </dependency>
 
     <dependency>

From 6d447d91f541af83d3474580212a80990b7beca8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:27:02 -0500
Subject: [PATCH 19/21] Bump com.google.auth:google-auth-library-oauth2-http
 (#327)

---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 9b4f251f..c640bd4b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>1.29.0</version>
+      <version>1.30.0</version>
     </dependency>
 
     <!-- For HTTP Client -->

From 7f15f06d7231412dc5a9aa03a0455f8fb1254f4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:53:20 -0500
Subject: [PATCH 20/21] Bump hapifhir_version from 7.4.5 to 7.6.0 (#331)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9d2d4d8e..c8339107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
   </distributionManagement>
 
   <properties>
-    <hapifhir_version>7.4.5</hapifhir_version>
+    <hapifhir_version>7.6.0</hapifhir_version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotless.version>2.43.0</spotless.version>
     <root.basedir>${project.basedir}</root.basedir>

From 19447d7152804d2b790f22cc44ad3b1ca21c7040 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:42:49 -0500
Subject: [PATCH 21/21] Bump spring-boot.version from 3.3.5 to 3.4.0 (#332)

---
 exec/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exec/pom.xml b/exec/pom.xml
index 5da189f8..f9463fd1 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <root.basedir>${project.parent.basedir}</root.basedir>
-    <spring-boot.version>3.3.5</spring-boot.version>
+    <spring-boot.version>3.4.0</spring-boot.version>
     <!-- We do not want to deploy the `exec` uber jar. -->
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>