From b99ca9d099105c9f2517a23e052dbe4c3a53da10 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 13 Nov 2023 13:27:23 +0100
Subject: [PATCH 1/3] Exclude javax servlet-api from deps.

---
 spring-cloud-netflix-dependencies/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index bb1e2524b..5391cc0ac 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -55,6 +55,10 @@
 						<groupId>jakarta.servlet</groupId>
 						<artifactId>jakarta.servlet-api</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
 					<exclusion>
 						<artifactId>commons-logging</artifactId>
 						<groupId>commons-logging</groupId>
@@ -86,6 +90,10 @@
 						<groupId>jakarta.servlet</groupId>
 						<artifactId>jakarta.servlet-api</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
 					<exclusion>
 						<artifactId>commons-logging</artifactId>
 						<groupId>commons-logging</groupId>

From 5c40f13f703d9a8ca7786dd27f379035daa1e9da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 14:08:05 +0100
Subject: [PATCH 2/3] Bump org.mockito:mockito-core from 3.6.0 to 3.6.28
 (#4206)

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

diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 006d4a9ab..5367b4bc1 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -189,7 +189,7 @@
 					<dependency>
 						<groupId>org.mockito</groupId>
 						<artifactId>mockito-core</artifactId>
-						<version>3.6.0</version>
+						<version>3.6.28</version>
 					</dependency>
 				</dependencies>
 			</plugin>

From 4112daa5f183202ca950cf4508a85249822e03f2 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 13 Nov 2023 14:14:00 +0100
Subject: [PATCH 3/3] Adjust checkstyle settings.

---
 src/checkstyle/checkstyle-suppressions.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index c4be06887..74ff896d6 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -13,4 +13,5 @@
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
 <suppress files=".*Tests\.java" checks="JavadocVariable"/>
+<suppress files=".*EurekaConfigServerBootstrapperIT\.java" checks="JavadocVariable"/>
 </suppressions>
\ No newline at end of file