From d1675453257468f16339510d1dd5c6b9a8a3b838 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 13 Sep 2023 12:39:35 +0300
Subject: [PATCH] [JAVA-20157] Upgraded core-java-serialization module to JDK17
 (#14646)

* [JAVA-20157] Upgraded core-java-serialization module to JDK17

* [JAVA-20157] Upgraded core-java-nio-2 module to JDK17
---
 core-java-modules/core-java-nio-2/pom.xml         | 14 ++++++++++++++
 core-java-modules/core-java-serialization/pom.xml |  6 ++++++
 core-java-modules/pom.xml                         |  4 ++--
 pom.xml                                           |  4 ----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/core-java-modules/core-java-nio-2/pom.xml b/core-java-modules/core-java-nio-2/pom.xml
index e35b70cfc7..dde708c10d 100644
--- a/core-java-modules/core-java-nio-2/pom.xml
+++ b/core-java-modules/core-java-nio-2/pom.xml
@@ -13,4 +13,18 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.nio=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-serialization/pom.xml b/core-java-modules/core-java-serialization/pom.xml
index 5a6f256687..63771d2da0 100644
--- a/core-java-modules/core-java-serialization/pom.xml
+++ b/core-java-modules/core-java-serialization/pom.xml
@@ -53,6 +53,12 @@
             <version>${spring.core.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 9cc42ce5d2..e9285eaf1e 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -24,9 +24,7 @@
         <!--<module>core-java-collections-conversions-2</module> -->
         <!--<module>core-java-lang</module> -->
         <!--<module>core-java-lang-math-3</module> -->
-        <!--<module>core-java-nio-2</module> -->
         <!--<module>core-java-security</module> -->
-        <!--<module>core-java-serialization</module> -->
         <!--<module>core-java-streams-2</module> -->
         <!--<module>core-java-sun</module> -->
         <module>core-java-9-improvements</module>
@@ -143,6 +141,7 @@
         <module>core-java-networking-2</module>
         <module>core-java-networking-4</module>
         <module>core-java-nio</module>
+        <module>core-java-nio-2</module>
         <module>core-java-numbers</module>
         <module>core-java-numbers-2</module>
         <module>core-java-numbers-3</module>
@@ -159,6 +158,7 @@
         <module>core-java-security-3</module>
         <module>core-java-security-4</module>
         <module>core-java-security-algorithms</module>
+        <module>core-java-serialization</module>
         <module>core-java-streams</module>
         <module>core-java-streams-3</module>
         <module>core-java-string-algorithms</module>
diff --git a/pom.xml b/pom.xml
index c39ae51629..cb794fe211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,8 +342,6 @@
                 <module>core-java-modules/core-java-8-datetime-2</module>
                 <module>core-java-modules/core-java-sun</module>
                 <module>core-java-modules/core-java-security</module>
-                <module>core-java-modules/core-java-nio-2</module>
-                <module>core-java-modules/core-java-serialization</module>
                 <module>core-java-modules/core-java-lang</module>
                 <module>core-java-modules/core-java-lang-math-3</module>
              
@@ -519,8 +517,6 @@
                 <module>core-java-modules/core-java-8-datetime-2</module>
                 <module>core-java-modules/core-java-sun</module>
                 <module>core-java-modules/core-java-security</module>
-                <module>core-java-modules/core-java-nio-2</module>
-                <module>core-java-modules/core-java-serialization</module>
                 <module>core-java-modules/core-java-lang</module>
                 <module>core-java-modules/core-java-lang-math-3</module>