Skip to content

Commit 6eee205

Browse files
authored
Merge pull request #18265 from panos-kakos/JAVA-40980
[JAVA-40890] Moved modules spring-webflux and spring-webflux-2 to spr…
2 parents 9a9241e + 2763ab2 commit 6eee205

File tree

88 files changed

+11
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+11
-32
lines changed

pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,6 @@
813813
<module>spring-threads</module>
814814
<module>spring-vault</module>
815815
<module>spring-web-modules</module>
816-
<module>spring-webflux</module>
817-
<module>spring-webflux-2</module>
818816
<module>spring-websockets</module>
819817
<module>tensorflow-java</module>
820818
<module>testing-modules</module>
@@ -1203,8 +1201,6 @@
12031201
<module>spring-threads</module>
12041202
<module>spring-vault</module>
12051203
<module>spring-web-modules</module>
1206-
<module>spring-webflux</module>
1207-
<module>spring-webflux-2</module>
12081204
<module>spring-websockets</module>
12091205
<module>tensorflow-java</module>
12101206
<module>testing-modules</module>
@@ -1344,6 +1340,8 @@
13441340
<module>spring-reactive-modules/spring-reactive-oauth</module>
13451341
<module>spring-reactive-modules/spring-reactive-security</module>
13461342
<module>spring-reactive-modules/spring-reactive</module>
1343+
<module>spring-reactive-modules/spring-webflux</module>
1344+
<module>spring-reactive-modules/spring-webflux-2</module>
13471345
<module>spring-reactive-modules/spring-webflux-amqp</module>
13481346
<module>spring-web-modules/spring-rest-http</module>
13491347
<module>web-modules/jee-7</module>

spring-reactive-modules/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<module>spring-reactive</module>
3131
<module>spring-reactive-exceptions</module>
3232
<module>spring-reactor</module>
33+
<module>spring-webflux</module>
34+
<module>spring-webflux-2</module>
3335
<module>spring-webflux-amqp</module>
3436
<module>spring-reactive-kafka-stream-binder</module>
3537
<module>spring-reactive-kafka</module>

spring-webflux-2/pom.xml renamed to spring-reactive-modules/spring-webflux-2/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
<url>http://www.baeldung.com</url>
1010

1111
<parent>
12-
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-boot-3</artifactId>
14-
<version>0.0.1-SNAPSHOT</version>
15-
<relativePath>../parent-boot-3</relativePath>
12+
<groupId>com.baeldung.spring.reactive</groupId>
13+
<artifactId>spring-reactive-modules</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
1615
</parent>
1716

1817
<dependencies>
@@ -114,7 +113,7 @@
114113
</build>
115114

116115
<properties>
117-
<reactor.version>3.4.5</reactor.version>
116+
<reactor.version>3.5.2</reactor.version>
118117
<caffeine.version>3.1.8</caffeine.version>
119118
<testcontainers-mongodb.version>1.16.2</testcontainers-mongodb.version>
120119
<mockwebserver.version>5.0.0-alpha.12</mockwebserver.version>

0 commit comments

Comments
 (0)