From f7b2c7bc416749eaaf1683a6171ed113281b3861 Mon Sep 17 00:00:00 2001
From: Serhii Nosko <serhii_nosko@epam.com>
Date: Fri, 15 Nov 2024 20:14:48 +0400
Subject: [PATCH] [FOLIO-4209] Update to mod-orders Java 21

---
 .github/workflows/buildMaven.yml |  9 ++++-----
 Dockerfile                       |  2 +-
 Jenkinsfile                      |  2 +-
 pom.xml                          | 21 ++++++++++++---------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/buildMaven.yml b/.github/workflows/buildMaven.yml
index 957bb84df..ab1401980 100644
--- a/.github/workflows/buildMaven.yml
+++ b/.github/workflows/buildMaven.yml
@@ -15,7 +15,7 @@ jobs:
         ref: ${{ github.REF }}
     - uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '21'
     - run: echo "FOLIO registry is $folioRegistry"
       env:
         folioRegistry:  https://repository.folio.org/repository/maven-snapshots/
@@ -28,7 +28,7 @@ jobs:
     - run: echo "Starting MvnDeploy stage..."
     - run: mvn dependency:list | { grep -i snapshot || true; }
     - run: >
-        mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install 
+        mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
         org.jacoco:jacoco-maven-plugin:report
     - run: docker build --pull=true --no-cache=true -t ${{ env.module_name }}:${{ env.module_version }} .
     # - if: github.REF == 'master'
@@ -70,8 +70,7 @@ jobs:
           name: ci-raml-lint
           path: ci/lintRamlCop.html
       - run: rm -rf ci && rm -rf folio-tools
-      
 
-        
 
-  
\ No newline at end of file
+
+
diff --git a/Dockerfile b/Dockerfile
index 566f9b35c..09180c8d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM folioci/alpine-jre-openjdk17:latest
+FROM folioci/alpine-jre-openjdk21:latest
 
 # Install latest patch versions of packages: https://pythonspeed.com/articles/security-updates-in-docker/
 USER root
diff --git a/Jenkinsfile b/Jenkinsfile
index 7030e1d52..e47d96f9b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 buildMvn {
   publishModDescriptor = 'yes'
   mvnDeploy = 'yes'
-  buildNode = 'jenkins-agent-java17'
+  buildNode = 'jenkins-agent-java21'
 
   doDocker = {
     buildJavaDocker {
diff --git a/pom.xml b/pom.xml
index d9a680294..cdeacf677 100755
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,9 @@
   </licenses>
 
   <properties>
+    <java.version>21</java.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
 
     <!--Configurations-->
     <module_name>mod-orders</module_name>
@@ -57,33 +60,33 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <!--Dependency Management Properties-->
-    <vertx.version>4.5.10</vertx.version>
+    <vertx.version>4.5.13</vertx.version>
     <jackson-bom.version>2.18.0</jackson-bom.version>
     <log4j.version>2.24.1</log4j.version>
     <testcontainers-bom.version>1.20.2</testcontainers-bom.version>
 
     <!--Dependency Properties-->
-    <spring.version>6.1.14</spring.version>
+    <spring.version>6.2.3</spring.version>
     <aspectj.version>1.9.22.1</aspectj.version>
-    <rest-assured.version>5.5.0</rest-assured.version>
+    <rest-assured.version>5.5.1</rest-assured.version>
 
     <!--Folio dependencies properties-->
     <folio-module-descriptor-validator.version>1.0.0</folio-module-descriptor-validator.version>
     <mod-configuration-client.version>5.11.0</mod-configuration-client.version>
-    <folio-di-support.version>2.1.0</folio-di-support.version>
+    <folio-di-support.version>2.2.0</folio-di-support.version>
 
     <!--Maven plugin dependencies-->
     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
     <aspectj-maven-plugin.version>1.14</aspectj-maven-plugin.version>
-    <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
+    <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
     <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
-    <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
     <copy-rename-maven-plugin.version>1.0.1</copy-rename-maven-plugin.version>
-    <maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
+    <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
 
     <!--Test dependencies-->
     <junit-jupiter.version>5.11.2</junit-jupiter.version>
@@ -586,7 +589,7 @@
         <version>${aspectj-maven-plugin.version}</version>
         <configuration>
           <verbose>true</verbose>
-          <complianceLevel>17</complianceLevel>
+          <complianceLevel>21</complianceLevel>
           <XaddSerialVersionUID>true</XaddSerialVersionUID>
           <showWeaveInfo>true</showWeaveInfo>
           <forceAjcCompile>true</forceAjcCompile>