From 0b7379f60d1121992f2dbf47d8475671af8e3f9e Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:47:39 +0200
Subject: [PATCH] =?UTF-8?q?[JAVA-18169]=20Moved=20rule-engines=20module=20?=
 =?UTF-8?q?to=20jdk9-and-above=20profile=20+=20Up=E2=80=A6=20(#13505)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [JAVA-18169] Moved rule-engines module to jdk9-and-above profile + Upgraded dependencies

* [JAVA-18155] Moved libraries-testing module to jdk9-and-above profile

* [JAVA-16395] Moved couchbase module to jdk9-and-above profile

* [JAVA-18155] Upgraded libraries versions

* [JAVA-18181] Moved spring-aop module to jdk9-and-above profile

* [JAVA-18182] Moved spring-aop-2 module to jdk9-and-above profile

* [JAVA-18143] Moved jmeter module to jdk9-and-above profile + testing build

* [JAVA-18181]  testing build

* [JAVA-18181]  Added configuration for war plugin

* [JAVA-18182]  Added maven-war-plugin
---
 couchbase/pom.xml                          |  9 ++++-
 libraries-testing/pom.xml                  |  5 +--
 pom.xml                                    | 47 +++++++++++++++-------
 rule-engines-modules/easy-rules/pom.xml    |  2 +-
 rule-engines-modules/evrete/pom.xml        |  2 +-
 rule-engines-modules/openl-tablets/pom.xml |  2 +-
 rule-engines-modules/rulebook/pom.xml      |  2 +-
 spring-aop-2/pom.xml                       | 16 +++++++-
 spring-aop/pom.xml                         | 11 ++++-
 9 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/couchbase/pom.xml b/couchbase/pom.xml
index e87975a53c..095bda3610 100644
--- a/couchbase/pom.xml
+++ b/couchbase/pom.xml
@@ -64,11 +64,16 @@
             <version>${commons-lang3.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <couchbase.client.version>2.5.0</couchbase.client.version>
-        <spring-framework.version>4.3.5.RELEASE</spring-framework.version>
+        <couchbase.client.version>2.7.2</couchbase.client.version>
+        <spring-framework.version>5.3.25</spring-framework.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index 2aaad59e09..9274c292ba 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -179,17 +179,16 @@
         <serenity.version>1.9.9</serenity.version>
         <serenity.jbehave.version>1.9.0</serenity.jbehave.version>
         <serenity.jira.version>1.9.0</serenity.jira.version>
-        <serenity.plugin.version>1.9.27</serenity.plugin.version>
+        <serenity.plugin.version>3.6.12</serenity.plugin.version>
         <jsonassert.version>1.5.0</jsonassert.version>
         <awaitility.version>3.0.0</awaitility.version>
         <hoverfly-java.version>0.8.1</hoverfly-java.version>
         <spring.version>4.3.8.RELEASE</spring.version>
-        <spring-mock-mvc.version>4.1.1</spring-mock-mvc.version>
+        <spring-mock-mvc.version>5.3.0</spring-mock-mvc.version>
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
         <dbunit.version>2.7.0</dbunit.version>
         <archunit.version>0.14.1</archunit.version>
         <modelassert.version>1.0.0</modelassert.version>
-        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 39720032ff..1efdb44fa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,7 @@
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
 
                 <module>core-java-modules</module>
+
                 <module>couchbase</module>
 
                 <module>drools</module>
@@ -360,7 +361,7 @@
                 <module>jaxb</module>
                 <module>jersey</module>
                 <module>jhipster-5</module>
-                <module>jmeter</module>
+
                 <module>jmh</module>
 
                 <module>jsf</module>
@@ -378,7 +379,6 @@
                 <module>libraries-data-db</module>
                 <module>libraries-security</module>
                 <module>libraries-server-2</module>
-                <module>libraries-testing</module>
                 <module>logging-modules</module>
                 <module>lombok-modules</module>
 
@@ -400,8 +400,6 @@
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
 
-                <module>rule-engines-modules</module>
-
                 <module>security-modules</module>
 
                 <module>vavr-modules</module>
@@ -455,7 +453,6 @@
                 <module>spf4j</module>
                 <module>spring-4</module>
                 <module>spring-aop</module>
-                <module>spring-aop-2</module>
                 <module>spring-batch</module>
                 <module>spring-bom</module>
                 <module>spring-boot-modules</module>
@@ -598,6 +595,7 @@
 
                 <module>core-java-modules</module>
                 <module>couchbase</module>
+
                 <module>drools</module>
                 <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
@@ -618,7 +616,6 @@
                 <module>jaxb</module>
                 <module>jersey</module>
                 <module>jhipster-5</module>
-                <module>jmeter</module>
                 <module>jmh</module>
 
                 <module>jsf</module>
@@ -636,7 +633,6 @@
                 <module>libraries-data-db</module>
                 <module>libraries-security</module>
                 <module>libraries-server-2</module>
-                <module>libraries-testing</module>
                 <module>logging-modules</module>
                 <module>lombok-modules</module>
 
@@ -657,8 +653,6 @@
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
 
-                <module>rule-engines-modules</module>
-
                 <module>security-modules</module>
 
                 <module>vavr-modules</module>
@@ -703,8 +697,6 @@
                 <module>server-modules</module>
                 <module>spf4j</module>
                 <module>spring-4</module>
-                <module>spring-aop</module>
-                <module>spring-aop-2</module>
                 <module>spring-batch</module>
                 <module>spring-bom</module>
                 <module>spring-boot-modules</module>
@@ -859,6 +851,9 @@
             </build>
 
             <modules>
+                <module>spring-aop</module>
+                <module>jmeter</module>
+                <module>spring-aop-2</module>
                 <module>algorithms-modules</module>
                 <module>apache-libraries</module>
                 <module>apache-poi</module>
@@ -866,7 +861,10 @@
                 <module>di-modules</module>
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
+                
+                <module>couchbase</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>
@@ -904,7 +902,7 @@
                 <module>core-java-modules/core-java-networking-3</module>
                 <module>core-java-modules/core-java-strings</module>
                 <module>core-java-modules/core-java-httpclient</module>
-				<module>custom-pmd</module>
+				        <module>custom-pmd</module>
                 <module>spring-core-6</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
@@ -914,6 +912,7 @@
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
                 <module>libraries-concurrency</module>
+                <module>libraries-testing</module>
                 <module>maven-modules/compiler-plugin-java-9</module>
                 <module>maven-modules/maven-generate-war</module>
                 <module>maven-modules/multimodulemavenproject</module>
@@ -930,8 +929,12 @@
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+
+                <module>rule-engines-modules</module>
+
                 <module>reactive-systems</module>
                 <module>rxjava-modules</module>
+
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
@@ -1045,7 +1048,8 @@
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <java.version>11</java.version>
-                <java.version>11</java.version>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
             </properties>
         </profile>
 
@@ -1079,6 +1083,9 @@
                 <module>di-modules</module>
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
+
+                <module>couchbase</module>
+
                 <module>core-groovy-modules</module>
                 <module>core-java-modules/core-java-9</module>
                 <module>core-java-modules/core-java-9-improvements</module>
@@ -1117,16 +1124,21 @@
                 <module>core-java-modules/core-java-networking-3</module>
                 <module>core-java-modules/core-java-strings</module>
                 <module>core-java-modules/core-java-httpclient</module>
-				<module>custom-pmd</module>
+                <module>spring-aop</module>
+                <module>spring-aop-2</module>
+                
+				        <module>custom-pmd</module>
                 <module>spring-core-6</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
                 <module>deeplearning4j</module>
+                <module>jmeter</module>
                 <module>docker-modules</module>
                 <module>guava-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>kubernetes-modules/kubernetes-spring</module>
                 <module>libraries-concurrency</module>
+                <module>libraries-testing</module>
                 <module>maven-modules/compiler-plugin-java-9</module>
                 <module>maven-modules/maven-generate-war</module>
                 <module>maven-modules/multimodulemavenproject</module>
@@ -1143,8 +1155,12 @@
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+
+                <module>rule-engines-modules</module>
+
                 <module>reactive-systems</module>
                 <module>rxjava-modules</module>
+
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
@@ -1261,7 +1277,8 @@
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <java.version>11</java.version>
-                <java.version>11</java.version>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
             </properties>
         </profile>
 
diff --git a/rule-engines-modules/easy-rules/pom.xml b/rule-engines-modules/easy-rules/pom.xml
index c8e875944c..6f43307e89 100644
--- a/rule-engines-modules/easy-rules/pom.xml
+++ b/rule-engines-modules/easy-rules/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <easy-rules.version>3.0.0</easy-rules.version>
+        <easy-rules.version>4.1.0</easy-rules.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/evrete/pom.xml b/rule-engines-modules/evrete/pom.xml
index d94da2853f..5b7f195722 100644
--- a/rule-engines-modules/evrete/pom.xml
+++ b/rule-engines-modules/evrete/pom.xml
@@ -30,7 +30,7 @@
     </dependencies>
 
     <properties>
-        <evrete.version>2.1.04</evrete.version>
+        <evrete.version>3.0.01</evrete.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/openl-tablets/pom.xml b/rule-engines-modules/openl-tablets/pom.xml
index 204efce6c5..a24e06c44d 100644
--- a/rule-engines-modules/openl-tablets/pom.xml
+++ b/rule-engines-modules/openl-tablets/pom.xml
@@ -28,7 +28,7 @@
     </dependencies>
 
     <properties>
-        <openl.version>5.19.4</openl.version>
+        <openl.version>5.26.5</openl.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/rulebook/pom.xml b/rule-engines-modules/rulebook/pom.xml
index 55e312289e..88feb148e2 100644
--- a/rule-engines-modules/rulebook/pom.xml
+++ b/rule-engines-modules/rulebook/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <rulebook.version>0.6.2</rulebook.version>
+        <rulebook.version>0.12</rulebook.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml
index 76e4780e72..cb84ed4ca2 100644
--- a/spring-aop-2/pom.xml
+++ b/spring-aop-2/pom.xml
@@ -39,8 +39,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
-        <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml
index 0d48c479ca..ae5ab5fce1 100644
--- a/spring-aop/pom.xml
+++ b/spring-aop/pom.xml
@@ -69,11 +69,20 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
-        <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file