From 322a38321c7ea06812ee8309410adaafdac74f4e Mon Sep 17 00:00:00 2001
From: Bipin kumar <sayy2bipin@gmail.com>
Date: Wed, 7 Feb 2024 16:14:13 +0530
Subject: [PATCH] JAVA-27677: Reactivate core-java-os-2 and spring-6-rsocket
 (#15675)

---
 core-java-modules/pom.xml                                      | 1 +
 pom.xml                                                        | 2 ++
 spring-6-rsocket/pom.xml                                       | 2 ++
 .../rsocket/RSocketRequestResponseIntegrationTest.java         | 3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 568fc37811..227da74156 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -60,6 +60,7 @@
         <module>core-java-methods</module>
         <module>core-java-networking-3</module>
         <module>core-java-os</module>
+        <module>core-java-os-2</module>
         <module>core-java-perf-2</module>
         <module>core-java-streams-4</module>
         <module>core-java-streams-5</module>
diff --git a/pom.xml b/pom.xml
index 32920bb91f..2718a9f4f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -817,6 +817,7 @@
                 <module>spring-5-webflux-2</module>
                 <module>spring-5-webflux</module>
                 <module>spring-5</module>
+                <module>spring-6-rsocket</module>
                 <module>spring-activiti</module>
                 <module>spring-actuator</module>
                 <module>spring-ai</module>
@@ -1056,6 +1057,7 @@
                 <module>spring-5-webflux-2</module>
                 <module>spring-5-webflux</module>
                 <module>spring-5</module>
+                <module>spring-6-rsocket</module>
                 <module>spring-activiti</module>
                 <module>spring-actuator</module>
                 <module>spring-ai</module>
diff --git a/spring-6-rsocket/pom.xml b/spring-6-rsocket/pom.xml
index 8e7a755a36..0874dcb307 100644
--- a/spring-6-rsocket/pom.xml
+++ b/spring-6-rsocket/pom.xml
@@ -49,6 +49,8 @@
 
     <properties>
         <spring-boot.version>3.1.3</spring-boot.version>
+        <org.slf4j.version>2.0.7</org.slf4j.version>
+        <logback.version>1.4.11</logback.version>
     </properties>
 
 </project>
diff --git a/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java b/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java
index 4b85c4c6fc..5b7fcb41ad 100644
--- a/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java
+++ b/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java
@@ -28,7 +28,8 @@ public class RSocketRequestResponseIntegrationTest {
     @Test
     public void whenSendingStream_thenReceiveTheSameStream() {
         String message = "test message";
-        assertEquals(message, client.sendMessage(Mono.just(message))
+        String response = "test message,Response!";
+        assertEquals(response, client.sendMessage(Mono.just(message))
             .block());
     }