diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
index 793ad63cbfe..c335e7ad441 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
@@ -124,14 +124,14 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.6.2"
-    spring_web_version = "5.2.13.RELEASE"
+    spring_web_version = "2.4.3"
     jackson_version = "2.11.3"
     jackson_databind_version = "2.11.3"
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.1"
     {{/openApiNullable}}
     javax_annotation_version = "1.3.2"
-    reactor_version = "3.3.10.RELEASE"
+    reactor_version = "3.4.3"
     reactor_netty_version = "0.7.15.RELEASE"
     jodatime_version = "2.9.9"
     junit_version = "4.13.1"
@@ -141,7 +141,7 @@ dependencies {
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "io.projectreactor:reactor-core:$reactor_version"
-    implementation "org.springframework:spring-webflux:$spring_web_version"
+    implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_web_version"
     implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version"
     implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
index 39c55beb122..67a888863b4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
@@ -85,10 +85,10 @@
             <version>${reactor-version}</version>
         </dependency>
 
-        <!-- HTTP client: Spring WebFlux -->
+        <!-- HTTP client: Springboot starter WebFlux -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webflux</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
             <version>${spring-web-version}</version>
         </dependency>
 
@@ -149,7 +149,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.6.2</swagger-annotations-version>
-        <spring-web-version>5.2.13.RELEASE</spring-web-version>
+        <spring-web-version>2.4.3</spring-web-version>
         <jackson-version>2.11.3</jackson-version>
         <jackson-databind-version>2.11.3</jackson-databind-version>
         {{#openApiNullable}}
@@ -157,7 +157,7 @@
         {{/openApiNullable}}
         <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13.1</junit-version>
-        <reactor-version>3.3.10.RELEASE</reactor-version>
+        <reactor-version>3.4.3</reactor-version>
         <reactor-netty-version>0.7.15.RELEASE</reactor-netty-version>
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle
index edfb9cfd441..44643bd52e0 100644
--- a/samples/client/petstore/java/webclient/build.gradle
+++ b/samples/client/petstore/java/webclient/build.gradle
@@ -112,12 +112,12 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.6.2"
-    spring_web_version = "5.2.13.RELEASE"
+    spring_web_version = "2.4.3"
     jackson_version = "2.11.3"
     jackson_databind_version = "2.11.3"
     jackson_databind_nullable_version = "0.2.1"
     javax_annotation_version = "1.3.2"
-    reactor_version = "3.3.10.RELEASE"
+    reactor_version = "3.4.3"
     reactor_netty_version = "0.7.15.RELEASE"
     jodatime_version = "2.9.9"
     junit_version = "4.13.1"
@@ -127,7 +127,7 @@ dependencies {
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "io.projectreactor:reactor-core:$reactor_version"
-    implementation "org.springframework:spring-webflux:$spring_web_version"
+    implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_web_version"
     implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version"
     implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml
index d7684111ded..6b73f3358b0 100644
--- a/samples/client/petstore/java/webclient/pom.xml
+++ b/samples/client/petstore/java/webclient/pom.xml
@@ -78,10 +78,10 @@
             <version>${reactor-version}</version>
         </dependency>
 
-        <!-- HTTP client: Spring WebFlux -->
+        <!-- HTTP client: Springboot starter WebFlux -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webflux</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
             <version>${spring-web-version}</version>
         </dependency>
 
@@ -126,13 +126,13 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.6.2</swagger-annotations-version>
-        <spring-web-version>5.2.13.RELEASE</spring-web-version>
+        <spring-web-version>2.4.3</spring-web-version>
         <jackson-version>2.11.3</jackson-version>
         <jackson-databind-version>2.11.3</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13.1</junit-version>
-        <reactor-version>3.3.10.RELEASE</reactor-version>
+        <reactor-version>3.4.3</reactor-version>
         <reactor-netty-version>0.7.15.RELEASE</reactor-netty-version>
     </properties>
 </project>