Merge pull request #18265 from panos-kakos/JAVA-40980

[JAVA-40890] Moved modules spring-webflux and spring-webflux-2 to spr…

Author: ulisseslima

pom.xml

@@ -813,8 +813,6 @@
                 <module>spring-threads</module>
                 <module>spring-vault</module>
                 <module>spring-web-modules</module>
-                <module>spring-webflux</module>
-                <module>spring-webflux-2</module>
                 <module>spring-websockets</module>
                 <module>tensorflow-java</module>
                 <module>testing-modules</module>
@@ -1203,8 +1201,6 @@
                 <module>spring-threads</module>
                 <module>spring-vault</module>
                 <module>spring-web-modules</module>
-                <module>spring-webflux</module>
-                <module>spring-webflux-2</module>
                 <module>spring-websockets</module>
                 <module>tensorflow-java</module>
                 <module>testing-modules</module>
@@ -1344,6 +1340,8 @@
                 <module>spring-reactive-modules/spring-reactive-oauth</module>
                 <module>spring-reactive-modules/spring-reactive-security</module>
                 <module>spring-reactive-modules/spring-reactive</module>
+                <module>spring-reactive-modules/spring-webflux</module>
+                <module>spring-reactive-modules/spring-webflux-2</module>
                 <module>spring-reactive-modules/spring-webflux-amqp</module>
                 <module>spring-web-modules/spring-rest-http</module>
                 <module>web-modules/jee-7</module>

spring-reactive-modules/pom.xml

@@ -30,6 +30,8 @@
         <module>spring-reactive</module>
         <module>spring-reactive-exceptions</module>
         <module>spring-reactor</module>
+        <module>spring-webflux</module>
+        <module>spring-webflux-2</module>
         <module>spring-webflux-amqp</module>
         <module>spring-reactive-kafka-stream-binder</module>
         <module>spring-reactive-kafka</module>

spring-webflux-2/README.md …ctive-modules/spring-webflux-2/README.mdspring-webflux-2/README.md renamed to spring-reactive-modules/spring-webflux-2/README.md spring-webflux-2/README.md renamed to spring-reactive-modules/spring-webflux-2/README.md

@@ -9,10 +9,9 @@
     <url>http://www.baeldung.com</url>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -114,7 +113,7 @@
     </build>
 
     <properties>
-        <reactor.version>3.4.5</reactor.version>
+        <reactor.version>3.5.2</reactor.version>
         <caffeine.version>3.1.8</caffeine.version>
         <testcontainers-mongodb.version>1.16.2</testcontainers-mongodb.version>
         <mockwebserver.version>5.0.0-alpha.12</mockwebserver.version>