From ee4b7d1e891f2b1bdffe5157d2892dbbcb661ead Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:09:20 +0200
Subject: [PATCH] [JAVA-16376] Moved quarkus-modules to jdk9-and-above profile
 (#13487)

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

* [JAVA-18171] Moved reactive-systems module to jdk9-and-above profile

* [JAVA-18170] Moved rxjava-modules to jdk9-and-above profile

* [JAVA-18165] Moved patterns-modules to jdk9-and-above profile

* [JAVA-18168] Upgraded quarkus version

* [JAVA-16394] Moved groovy modules to jdk9-and-above profile

* [JAVA-18165] Reverted changes for pattern-modules

* [JAVA-16394] Upgraded dependencies to latest versions

* [JAVA-18134] Upgraded guava-modules to java 11 and moved to jdk9-and-above profile

* [JAVA-16394] Fixed groovy-eclipse-batch dependency version

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 core-groovy-modules/core-groovy-2/pom.xml     |  9 +++---
 core-groovy-modules/pom.xml                   | 10 +++---
 guava-modules/guava-collections/pom.xml       |  1 +
 pom.xml                                       | 31 ++++++-------------
 quarkus-modules/pom.xml                       |  3 +-
 quarkus-modules/quarkus/pom.xml               |  2 +-
 rxjava-modules/pom.xml                        |  1 +
 .../SingleJustVsFromCallableTest.java         |  2 +-
 8 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/core-groovy-modules/core-groovy-2/pom.xml b/core-groovy-modules/core-groovy-2/pom.xml
index 2b864ec7a1..ca6a9a62c7 100644
--- a/core-groovy-modules/core-groovy-2/pom.xml
+++ b/core-groovy-modules/core-groovy-2/pom.xml
@@ -83,7 +83,7 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-batch</artifactId>
-                        <version>${groovy.version}-01</version>
+                        <version>${groovy-eclipse-batch.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -163,9 +163,10 @@
 
     <properties>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>
-        <assembly.plugin.version>3.1.0</assembly.plugin.version>
-        <compiler.plugin.version>3.8.0</compiler.plugin.version>
-        <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
+        <assembly.plugin.version>3.4.2</assembly.plugin.version>
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <groovy.compiler.version>3.7.0</groovy.compiler.version>
+        <groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
     </properties>
 
 </project>
diff --git a/core-groovy-modules/pom.xml b/core-groovy-modules/pom.xml
index 2d1120e435..6faa7f94c8 100644
--- a/core-groovy-modules/pom.xml
+++ b/core-groovy-modules/pom.xml
@@ -21,12 +21,12 @@
     </modules>
 
     <properties>
-        <groovy.version>3.0.8</groovy.version>
-        <groovy-all.version>3.0.8</groovy-all.version>
-        <groovy-sql.version>3.0.8</groovy-sql.version>
-        <hsqldb.version>2.4.0</hsqldb.version>
+        <groovy.version>3.0.15</groovy.version>
+        <groovy-all.version>3.0.15</groovy-all.version>
+        <groovy-sql.version>3.0.15</groovy-sql.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
         <spock-core.version>2.3-groovy-3.0</spock-core.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+        <gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
     </properties>
 
 </project>
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
index 9283107023..8dc052db75 100644
--- a/guava-modules/guava-collections/pom.xml
+++ b/guava-modules/guava-collections/pom.xml
@@ -37,6 +37,7 @@
             <version>${java-hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 3994c713c8..49a0ddd8fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,6 @@
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
 
-                <module>core-groovy-modules</module>
                 <module>core-java-modules</module>
                 <module>couchbase</module>
 
@@ -346,7 +345,6 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
 
-                <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
                 <module>apache-httpclient</module>
@@ -402,13 +400,8 @@
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
 
-
-                <module>quarkus-modules</module>
-
                 <module>rule-engines-modules</module>
-                <module>rxjava-modules</module>
 
-                <module>reactive-systems</module>
                 <module>security-modules</module>
 
                 <module>vavr-modules</module>
@@ -603,7 +596,6 @@
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
 
-                <module>core-groovy-modules</module>
                 <module>core-java-modules</module>
                 <module>couchbase</module>
                 <module>drools</module>
@@ -611,8 +603,6 @@
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
-
-                <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
                 <module>apache-httpclient</module>
@@ -657,7 +647,6 @@
                 <module>microservices-modules</module>
                 <module>muleesb</module>
 
-
                 <module>netflix-modules</module>
 
                 <module>osgi</module>
@@ -668,13 +657,8 @@
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
 
-
-                <module>quarkus-modules</module>
-
                 <module>rule-engines-modules</module>
-                <module>rxjava-modules</module>
 
-                <module>reactive-systems</module>
                 <module>security-modules</module>
 
                 <module>vavr-modules</module>
@@ -882,6 +866,7 @@
                 <module>di-modules</module>
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
+                <module>core-groovy-modules</module>
                 <module>core-java-modules/core-java-9</module>
                 <module>core-java-modules/core-java-9-improvements</module>
                 <module>core-java-modules/core-java-9-jigsaw</module>
@@ -925,6 +910,7 @@
                 <module>ddd-contexts</module>
                 <module>deeplearning4j</module>
                 <module>docker-modules</module>
+                <module>guava-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
                 <module>libraries-concurrency</module>
@@ -934,8 +920,7 @@
                 <module>optaplanner</module>
                 <module>persistence-modules/sirix</module>
                 <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>quarkus-modules/quarkus-vs-springboot</module>
-                <module>quarkus-modules/quarkus-jandex</module>
+                <module>quarkus-modules</module>
                 <module>spring-boot-modules/spring-boot-cassandre</module>
                 <module>spring-boot-modules/spring-boot-3</module>
                 <module>spring-boot-modules/spring-boot-3-native</module>
@@ -945,6 +930,8 @@
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+                <module>reactive-systems</module>
+                <module>rxjava-modules</module>
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
@@ -1092,7 +1079,7 @@
                 <module>di-modules</module>
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
-
+                <module>core-groovy-modules</module>
                 <module>core-java-modules/core-java-9</module>
                 <module>core-java-modules/core-java-9-improvements</module>
                 <module>core-java-modules/core-java-9-jigsaw</module>
@@ -1136,6 +1123,7 @@
                 <module>ddd-contexts</module>
                 <module>deeplearning4j</module>
                 <module>docker-modules</module>
+                <module>guava-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
                 <module>libraries-concurrency</module>
@@ -1145,8 +1133,7 @@
                 <module>optaplanner</module>
                 <module>persistence-modules/sirix</module>
                 <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>quarkus-modules/quarkus-vs-springboot</module>
-                <module>quarkus-modules/quarkus-jandex</module>
+                <module>quarkus-modules</module>
                 <module>spring-boot-modules/spring-boot-cassandre</module>
                 <module>spring-boot-modules/spring-boot-3</module>
                 <module>spring-boot-modules/spring-boot-3-native</module>
@@ -1156,6 +1143,8 @@
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+                <module>reactive-systems</module>
+                <module>rxjava-modules</module>
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
diff --git a/quarkus-modules/pom.xml b/quarkus-modules/pom.xml
index 94fe1ae10f..ab9f7c3906 100644
--- a/quarkus-modules/pom.xml
+++ b/quarkus-modules/pom.xml
@@ -16,7 +16,8 @@
     <modules>
         <module>quarkus</module>
         <module>quarkus-extension</module>
-        <!--Disabled because requires Java-9 <module>quarkus-jandex</module> <module>quarkus-vs-springboot</module> -->
+        <module>quarkus-jandex</module>
+        <module>quarkus-vs-springboot</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/quarkus-modules/quarkus/pom.xml b/quarkus-modules/quarkus/pom.xml
index 3e1cbff01c..99d18579c3 100644
--- a/quarkus-modules/quarkus/pom.xml
+++ b/quarkus-modules/quarkus/pom.xml
@@ -182,7 +182,7 @@
     </profiles>
 
     <properties>
-        <quarkus.version>1.7.0.Final</quarkus.version>
+        <quarkus.version>2.16.3.Final</quarkus.version>
         <mockito.version>3.3.0</mockito.version>
     </properties>
 
diff --git a/rxjava-modules/pom.xml b/rxjava-modules/pom.xml
index cd46270d92..2f2597b644 100644
--- a/rxjava-modules/pom.xml
+++ b/rxjava-modules/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>rxjava-core</module>
+        <module>rxjava-core-2</module>
         <module>rxjava-libraries</module>
         <module>rxjava-observables</module>
         <module>rxjava-operators</module>
diff --git a/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java b/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
index d0de86fed8..a693432343 100644
--- a/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
+++ b/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
@@ -12,7 +12,7 @@ import org.mockito.Mockito;
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-class SingleJustVsFromCallableTest {
+class SingleJustVsFromCallableUnitTest {
 
     public EmployeeRepository repository = mock(EmployeeRepository.class);