From 6f5d19cbe255d6ea9eb26e3fedf1085b7c9f4fc7 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:51:33 +0200
Subject: [PATCH] =?UTF-8?q?[JAVA-16376]=20Moved=20apache-poi,=20apache-vel?=
 =?UTF-8?q?ocity,di-modules,asciidoctor=E2=80=A6=20(#13461)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [JAVA-16376] Moved apache-poi, apache-velocity,di-modules,asciidoctor,aws-modules to jdk9-and-above profile

* [JAVA-16376] testing war plugin

* [JAVA-16376] Upgraded asciidoctor dependencies

* [JAVA-16376] Upgraded lombok version

* [JAVA-16376] Upgraded guice version

* [JAVA-16376] Clean up properties
---
 apache-velocity/pom.xml          |  1 +
 asciidoctor/pom.xml              |  8 ++++----
 aws-modules/aws-reactive/pom.xml |  2 ++
 di-modules/guice/pom.xml         |  2 +-
 pom.xml                          | 23 +++++++++++------------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml
index f4b6de8872..a562ebeec0 100644
--- a/apache-velocity/pom.xml
+++ b/apache-velocity/pom.xml
@@ -63,6 +63,7 @@
         <org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
         <velocity-version>1.7</velocity-version>
         <velocity-tools-version>2.0</velocity-tools-version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/asciidoctor/pom.xml b/asciidoctor/pom.xml
index e24917f2f4..b72f050379 100644
--- a/asciidoctor/pom.xml
+++ b/asciidoctor/pom.xml
@@ -62,10 +62,10 @@
     </build>
 
     <properties>
-        <asciidoctor-maven-plugin.version>1.5.6</asciidoctor-maven-plugin.version>
-        <asciidoctorj.version>1.5.6</asciidoctorj.version>
-        <asciidoctorj-pdf.version>1.5.0-alpha.15</asciidoctorj-pdf.version>
-        <asciidoctorj-pdf.plugin.version>1.5.0-alpha.15</asciidoctorj-pdf.plugin.version>
+        <asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
+        <asciidoctorj.version>2.5.7</asciidoctorj.version>
+        <asciidoctorj-pdf.version>2.3.4</asciidoctorj-pdf.version>
+        <asciidoctorj-pdf.plugin.version>2.3.4</asciidoctorj-pdf.plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/aws-modules/aws-reactive/pom.xml b/aws-modules/aws-reactive/pom.xml
index fbad5e30d0..e6b50cadb2 100644
--- a/aws-modules/aws-reactive/pom.xml
+++ b/aws-modules/aws-reactive/pom.xml
@@ -77,6 +77,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
         </dependency>
     </dependencies>
 
@@ -92,6 +93,7 @@
     <properties>
         <spring.version>2.2.1.RELEASE</spring.version>
         <awssdk.version>2.17.283</awssdk.version>
+        <lombok.version>1.18.20</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/di-modules/guice/pom.xml b/di-modules/guice/pom.xml
index cbadf2119d..a28dbe5297 100644
--- a/di-modules/guice/pom.xml
+++ b/di-modules/guice/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <guice.version>4.1.0</guice.version>
+        <guice.version>5.0.1</guice.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 83ba73229f..0b63defb49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,12 +332,6 @@
 
                 <module>apache-cxf-modules</module>
                 <module>apache-libraries</module>
-                <module>apache-poi</module>
-                <module>apache-velocity</module>
-                <module>di-modules</module>
-                <module>asciidoctor</module>
-
-                <module>aws-modules</module>
 
                 <module>azure</module>
                 <module>checker-plugin</module>
@@ -615,12 +609,6 @@
 
                 <module>apache-cxf-modules</module>
                 <module>apache-libraries</module>
-                <module>apache-poi</module>
-                <module>apache-velocity</module>
-                <module>di-modules</module>
-                <module>asciidoctor</module>
-
-                <module>aws-modules</module>
 
                 <module>azure</module>
                 <module>checker-plugin</module>
@@ -909,6 +897,11 @@
 
             <modules>
                 <module>algorithms-modules</module>
+                <module>apache-poi</module>
+                <module>apache-velocity</module>
+                <module>di-modules</module>
+                <module>asciidoctor</module>
+                <module>aws-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>
@@ -1108,6 +1101,12 @@
 
             <modules>
                 <module>algorithms-modules</module>
+                <module>apache-poi</module>
+                <module>apache-velocity</module>
+                <module>di-modules</module>
+                <module>asciidoctor</module>
+                <module>aws-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>