From 4a574f74c3a13fd688e2c4bebec81e955545ad6f Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 30 Sep 2026 03:41:05 +0000
Subject: [PATCH] bug: upgrade embedded Tomcat to 9.0.117 for CVE-2026-34500
(Spring Boot 1.5.4 -> 2.7.18)
---
UserFront/pom.xml | 7 ++++---
.../service/UserServiceImpl/AppointmentServiceImpl.java | 2 +-
UserFront/src/main/resources/application.properties | 4 ++++
.../test/java/com/userFront/UserFrontApplicationTests.java | 5 +----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/UserFront/pom.xml b/UserFront/pom.xml
index 902ec2b3..a93efc48 100644
--- a/UserFront/pom.xml
+++ b/UserFront/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.4.RELEASE
+ 2.7.18
@@ -22,6 +22,7 @@
UTF-8
UTF-8
1.8
+ 9.0.117
@@ -46,8 +47,8 @@
- mysql
- mysql-connector-java
+ com.mysql
+ mysql-connector-j
diff --git a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
index 838ad223..0d62b84c 100644
--- a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
+++ b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
@@ -24,7 +24,7 @@ public List findAll() {
}
public Appointment findAppointment(Long id) {
- return appointmentDao.findOne(id);
+ return appointmentDao.findById(id).orElse(null);
}
public void confirmAppointment(Long id) {
diff --git a/UserFront/src/main/resources/application.properties b/UserFront/src/main/resources/application.properties
index d7e04942..fa44754f 100644
--- a/UserFront/src/main/resources/application.properties
+++ b/UserFront/src/main/resources/application.properties
@@ -1,3 +1,7 @@
+# Spring Boot 2.6+ rejects circular bean references by default; the existing
+# SecurityConfig/UserService wiring relies on them.
+spring.main.allow-circular-references = true
+
# ===============================
# = DATA SOURCE
# ===============================
diff --git a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
index 81fed97b..3e51f21d 100644
--- a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
+++ b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
@@ -1,11 +1,8 @@
package com.userFront;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-@RunWith(SpringRunner.class)
@SpringBootTest
public class UserFrontApplicationTests {