From 0c00cd7141d883ca9a3963672625e2a57ff65bc0 Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 10 Dec 2024 11:56:15 -0800
Subject: [PATCH 1/2] Update library and spring boot versions

---
 build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 533a7274..42d99af8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'org.springframework.boot' version '3.3.4'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'com.gorylenko.gradle-git-properties' version '2.4.2'
@@ -48,13 +48,14 @@ repositories {
 }
 
 def profile = props.getProperty('SPRING_PROFILES_ACTIVE')
-def formFlowLibraryVersion = '1.5.3-SNAPSHOT'
+def formFlowLibraryVersion = '1.6.1-SNAPSHOT'
 def useLocalLibrary = System.getenv('USE_LOCAL_LIBRARY')
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
     implementation 'ch.qos.logback.contrib:logback-jackson:0.1.5'
+    implementation 'org.springframework:spring-webmvc:6.1.13'
 
     if (profile == 'dev' || useLocalLibrary == 'true') {
         implementation fileTree(dir: "$rootDir/../form-flow/build/libs", include: '*.jar')
@@ -75,7 +76,7 @@ dependencies {
     testImplementation 'org.seleniumhq.selenium:selenium-java'
     testImplementation 'io.percy:percy-java-selenium:2.1.0'
     testImplementation 'org.awaitility:awaitility'
-    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
+//    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
     testImplementation 'io.github.bonigarcia:webdrivermanager:5.9.2'
     testImplementation 'com.h2database:h2'
 

From 32448fd8d5c25309a625b3556e4c015dcd921e5f Mon Sep 17 00:00:00 2001
From: spokenbird <agonzalez@codeforamerica.org>
Date: Tue, 10 Dec 2024 11:58:57 -0800
Subject: [PATCH 2/2] Remove direct dependency in favor of transitive from
 Spring Boot 3.4.0

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 42d99af8..21357e47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,6 @@ dependencies {
     testImplementation 'org.seleniumhq.selenium:selenium-java'
     testImplementation 'io.percy:percy-java-selenium:2.1.0'
     testImplementation 'org.awaitility:awaitility'
-//    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
     testImplementation 'io.github.bonigarcia:webdrivermanager:5.9.2'
     testImplementation 'com.h2database:h2'