From 9b6831011807b547eaec9932db7f380d3d2fa1a4 Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <rahul.ramesh@thoughtworks.com>
Date: Sun, 23 Jun 2024 22:38:39 +0530
Subject: [PATCH] [Rahul] | BAH-3987 | Add. Bump Java Version 8 -> 11

---
 package/docker/Dockerfile | 6 ++----
 pom.xml                   | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/docker/Dockerfile b/package/docker/Dockerfile
index 0fd661b..94383b6 100644
--- a/package/docker/Dockerfile
+++ b/package/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:8
+FROM amazoncorretto:11
 
 ENV SERVER_PORT=8053
 ENV BASE_DIR=/var/run/bahmni-erp-connect
@@ -8,9 +8,7 @@ ENV SERVER_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=
 ENV DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=8002,server=y,suspend=n"
 
 # Used by envsubst command for replacing environment values at runtime
-RUN yum install -y gettext
-RUN yum install -y nc
-RUN yum install -y postgresql
+RUN yum install -y gettext nc postgresql
 
 ADD https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for wait-for.sh
 
diff --git a/pom.xml b/pom.xml
index 9eabfb4..4b81aa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
     <url>http://maven.apache.org</url>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <spring.version>5.3.30</spring.version>
         <cglib.version>2.2.2</cglib.version>
         <quartz.version>2.3.2</quartz.version>
@@ -28,7 +28,7 @@
         <junit.version>4.13.1</junit.version>
         <mockito-core.version>4.9.0</mockito-core.version>
         <jackson.version>2.13.5</jackson.version>
-        <httpcore.version>4.4.5</httpcore.version>
+        <httpcore.version>4.4.15</httpcore.version>
         <httpClient.version>4.5.13</httpClient.version>
         <servlet-api.version>3.0.1</servlet-api.version>
         <slf4j.version>2.0.9</slf4j.version>
@@ -68,7 +68,7 @@
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.7.1</version>
+                <version>1.9.7</version>
             </dependency>
             <!--
             Make all spring dependencies provided
@@ -233,7 +233,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>2.0.9</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>