From 4719d9e55f4c00b5bd1444a64f39005162700c11 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 1 Apr 2024 11:56:58 +0800
Subject: [PATCH] update spring-context to newer version (#18266)

---
 .../Java/libraries/resttemplate/build.gradle.mustache         | 4 ++--
 .../main/resources/Java/libraries/resttemplate/pom.mustache   | 4 ++--
 samples/client/echo_api/java/resttemplate/build.gradle        | 2 +-
 samples/client/echo_api/java/resttemplate/pom.xml             | 2 +-
 .../java/resttemplate-useAbstractionForFiles/build.gradle     | 2 +-
 .../others/java/resttemplate-useAbstractionForFiles/pom.xml   | 2 +-
 .../client/petstore/java/resttemplate-jakarta/build.gradle    | 2 +-
 samples/client/petstore/java/resttemplate-jakarta/pom.xml     | 2 +-
 .../client/petstore/java/resttemplate-swagger1/build.gradle   | 2 +-
 samples/client/petstore/java/resttemplate-swagger1/pom.xml    | 2 +-
 .../client/petstore/java/resttemplate-swagger2/build.gradle   | 2 +-
 samples/client/petstore/java/resttemplate-swagger2/pom.xml    | 2 +-
 .../client/petstore/java/resttemplate-withXml/build.gradle    | 2 +-
 samples/client/petstore/java/resttemplate-withXml/pom.xml     | 2 +-
 samples/client/petstore/java/resttemplate/build.gradle        | 2 +-
 samples/client/petstore/java/resttemplate/pom.xml             | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index bb2c6668809..13c7d8d9adf 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -121,11 +121,11 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     {{/openApiNullable}}
     {{#useJakartaEe}}
-    spring_web_version = "6.0.17"
+    spring_web_version = "6.1.5"
     jakarta_annotation_version = "2.1.1"
     {{/useJakartaEe}}
     {{^useJakartaEe}}
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     {{/useJakartaEe}}
     jodatime_version = "2.9.9"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
index b565d5088f5..48be247a797 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -368,10 +368,10 @@
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         {{#useJakartaEe}}
-        <spring-web-version>6.0.17</spring-web-version>
+        <spring-web-version>6.1.5</spring-web-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         {{/useJakartaEe}}
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
diff --git a/samples/client/echo_api/java/resttemplate/build.gradle b/samples/client/echo_api/java/resttemplate/build.gradle
index eae2964e92e..7052bf7cde0 100644
--- a/samples/client/echo_api/java/resttemplate/build.gradle
+++ b/samples/client/echo_api/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/echo_api/java/resttemplate/pom.xml b/samples/client/echo_api/java/resttemplate/pom.xml
index db15c3cc2d2..e17b5a579e8 100644
--- a/samples/client/echo_api/java/resttemplate/pom.xml
+++ b/samples/client/echo_api/java/resttemplate/pom.xml
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
index eb899cb5b6e..03f09b945a0 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
+++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml
index 91dddd17c00..54a248e8541 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml
+++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/resttemplate-jakarta/build.gradle b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
index bb2c9fd9f73..f8d86ff91dd 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/build.gradle
+++ b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.0.17"
+    spring_web_version = "6.1.5"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/resttemplate-jakarta/pom.xml b/samples/client/petstore/java/resttemplate-jakarta/pom.xml
index ebadbb5a9c9..975a6cfd357 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/pom.xml
+++ b/samples/client/petstore/java/resttemplate-jakarta/pom.xml
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.0.17</spring-web-version>
+        <spring-web-version>6.1.5</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
index 813f4b7ece0..ac81d8157a5 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/resttemplate-swagger1/pom.xml b/samples/client/petstore/java/resttemplate-swagger1/pom.xml
index e98cf8fd455..b7f72a3646f 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/pom.xml
+++ b/samples/client/petstore/java/resttemplate-swagger1/pom.xml
@@ -286,7 +286,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.6.9</swagger-annotations-version>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/resttemplate-swagger2/build.gradle b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
index dab6fbdd998..bcf5c29c990 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/resttemplate-swagger2/pom.xml b/samples/client/petstore/java/resttemplate-swagger2/pom.xml
index e2f33a32e00..f205fc0c586 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/pom.xml
+++ b/samples/client/petstore/java/resttemplate-swagger2/pom.xml
@@ -286,7 +286,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index f04afcd473f..94468bd3782 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml
index 1c55c47ac3b..e5eec3c25de 100644
--- a/samples/client/petstore/java/resttemplate-withXml/pom.xml
+++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml
@@ -292,7 +292,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index 456a5c86254..ecc63257787 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.14.2"
     jackson_databind_version = "2.15.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "5.3.32"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml
index c6500671f7d..e017b3897dd 100644
--- a/samples/client/petstore/java/resttemplate/pom.xml
+++ b/samples/client/petstore/java/resttemplate/pom.xml
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.32</spring-web-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>