From db11ca931d130f0fc935c0737d73536845c04dbc Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Thu, 16 Feb 2023 17:57:31 +0200
Subject: [PATCH] [JAVA-16376] Moved spring-reactive-modules to jdk9-and-above
 profile (#13470)

* [JAVA-16376] Moved spring-reactive-modules to jdk9-and-above profile

* [JAVA-16376] Upgraded geotools dependencies and moved module to jdk9-and-above profile

* [JAVA-16376] Replaced vividsolutions artifact with  locationtech

* [JAVA-16376] Moved data-structures to jdk9-and-above profile

* [JAVA-16376] Moved deeplearning4j module to jdk9-and-above profile

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 deeplearning4j/pom.xml                        |  9 +++++++
 geotools/pom.xml                              | 13 ++++++---
 .../java/com/baeldung/geotools/ShapeFile.java |  8 +++---
 pom.xml                                       | 27 +++++++------------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml
index c63e67d573..01bac93214 100644
--- a/deeplearning4j/pom.xml
+++ b/deeplearning4j/pom.xml
@@ -57,11 +57,20 @@
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <properties>
         <dl4j.version>0.9.1</dl4j.version> <!-- Latest non beta version -->
         <httpclient.version>4.3.5</httpclient.version>
+        <lombok.version>1.18.20</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/geotools/pom.xml b/geotools/pom.xml
index 05cae922a4..6edb344c8c 100644
--- a/geotools/pom.xml
+++ b/geotools/pom.xml
@@ -39,12 +39,19 @@
             <artifactId>gt-swing</artifactId>
             <version>${geotools-swing.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.19.0</version>
+        </dependency>
+
+
     </dependencies>
 
     <properties>
-        <geotools.version>15.2</geotools.version>
-        <geotools-swing.version>15.2</geotools-swing.version>
-        <geotools-shapefile.version>15.2</geotools-shapefile.version>
+        <geotools.version>28.1</geotools.version>
+        <geotools-swing.version>28.1</geotools-swing.version>
+        <geotools-shapefile.version>28.1</geotools-shapefile.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/geotools/src/main/java/com/baeldung/geotools/ShapeFile.java b/geotools/src/main/java/com/baeldung/geotools/ShapeFile.java
index de789918cd..64650fb486 100644
--- a/geotools/src/main/java/com/baeldung/geotools/ShapeFile.java
+++ b/geotools/src/main/java/com/baeldung/geotools/ShapeFile.java
@@ -1,8 +1,8 @@
 package com.baeldung.geotools;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
 import org.geotools.data.DataUtilities;
 import org.geotools.data.DefaultTransaction;
 import org.geotools.data.Transaction;
@@ -35,7 +35,7 @@ public class ShapeFile {
 
         DefaultFeatureCollection collection = new DefaultFeatureCollection();
 
-        GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory(null);
+        GeometryFactory geometryFactory =  JTSFactoryFinder.getGeometryFactory(null);
 
         SimpleFeatureType TYPE = DataUtilities.createType("Location", "location:Point:srid=4326," + "name:String");
 
diff --git a/pom.xml b/pom.xml
index 0b63defb49..8b395d44f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,16 +341,9 @@
                 <module>core-java-modules</module>
                 <module>couchbase</module>
                 <module>custom-pmd</module>
-                <module>data-structures</module>
-                <module>deeplearning4j</module>
+
                 <module>drools</module>
-
-
                 <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
-
-
-                <module>geotools</module>
-
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
@@ -470,7 +463,6 @@
                 <module>server-modules</module>
                 <module>spf4j</module>
                 <module>spring-4</module>
-                <module>spring-reactive-modules</module>
                 <module>spring-aop</module>
                 <module>spring-aop-2</module>
                 <module>spring-batch</module>
@@ -618,16 +610,8 @@
                 <module>core-java-modules</module>
                 <module>couchbase</module>
                 <module>custom-pmd</module>
-                <module>data-structures</module>
-                <module>deeplearning4j</module>
                 <module>drools</module>
-
-
                 <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
-
-
-                <module>geotools</module>
-
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
@@ -739,7 +723,6 @@
                 <module>server-modules</module>
                 <module>spf4j</module>
                 <module>spring-4</module>
-                <module>spring-reactive-modules</module>
                 <module>spring-aop</module>
                 <module>spring-aop-2</module>
                 <module>spring-batch</module>
@@ -940,7 +923,9 @@
                 <module>core-java-modules/core-java-strings</module>
                 <module>core-java-modules/core-java-httpclient</module>
                 <module>spring-core-6</module>
+                <module>data-structures</module>
                 <module>ddd-contexts</module>
+                <module>deeplearning4j</module>
                 <module>docker-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
@@ -959,11 +944,13 @@
                 <module>spring-boot-modules/spring-boot-3-native</module>
                 <module>spring-boot-modules/spring-boot-3-observation</module>
                 <module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
+                <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
                 <module>lightrun</module>
                 <module>tablesaw</module>
+                <module>geotools</module>
 
                 <!-- Modules from default-first -->
 
@@ -1145,7 +1132,9 @@
                 <module>core-java-modules/core-java-strings</module>
                 <module>core-java-modules/core-java-httpclient</module>
                 <module>spring-core-6</module>
+                <module>data-structures</module>
                 <module>ddd-contexts</module>
+                <module>deeplearning4j</module>
                 <module>docker-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
@@ -1164,11 +1153,13 @@
                 <module>spring-boot-modules/spring-boot-3-native</module>
                 <module>spring-boot-modules/spring-boot-3-observation</module>
                 <module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
+                <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
                 <module>lightrun</module>
                 <module>tablesaw</module>
+                <module>geotools</module>
 
                 <!-- Modules from default-first -->