From 75fcfd1348b8f417a13e58d08d13823b0d10ed37 Mon Sep 17 00:00:00 2001
From: Ankit Singh <101859999+ankitmashu@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:47:01 +0530
Subject: [PATCH 1/2] Pom update with java 21 and docker files update

---
 Jenkinsfile            |  4 ++--
 docker/depl.dockerfile |  4 ++--
 docker/dev.dockerfile  |  4 ++--
 pom.xml                | 52 +++++++++++++++++++++---------------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fe6a657..3c8c8f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,13 +41,13 @@ pipeline {
                             recordIssues(
                               enabledForFailure: true,
                               skipBlames: true,
-                              qualityGates: [[threshold:0, type: 'TOTAL', unstable: false]],
+                              qualityGates: [[threshold:100, type: 'TOTAL', unstable: false]],
                               tool: checkStyle(pattern: 'target/checkstyle-result.xml')
                             )
                             recordIssues(
                               enabledForFailure: true,
                               skipBlames: true,
-                              qualityGates: [[threshold:0, type: 'TOTAL', unstable: false]],
+                              qualityGates: [[threshold:100, type: 'TOTAL', unstable: false]],
                               tool: pmdParser(pattern: 'target/pmd.xml')
                             )
                           }
diff --git a/docker/depl.dockerfile b/docker/depl.dockerfile
index ad06a9e..34d3ec8 100644
--- a/docker/depl.dockerfile
+++ b/docker/depl.dockerfile
@@ -1,7 +1,7 @@
 ARG VERSION="0.0.1-SNAPSHOT"
 
 # Maven base image for building the java code
-FROM maven:3-openjdk-11-slim as builder
+FROM maven:3-eclipse-temurin-21-jammy as builder
 
 WORKDIR /usr/share/app
 COPY pom.xml .
@@ -12,7 +12,7 @@ COPY src src
 RUN mvn clean package -Dmaven.test.skip=true
 
 # Java runtime as final base image
-FROM openjdk:11-jre-slim-buster
+FROM eclipse-temurin:21.0.5_11-jre-jammy
 
 ARG VERSION
 ENV JAR="iudx.data.ingestion.server-cluster-0.0.1-SNAPSHOT-fat.jar"
diff --git a/docker/dev.dockerfile b/docker/dev.dockerfile
index 164a69a..844d973 100644
--- a/docker/dev.dockerfile
+++ b/docker/dev.dockerfile
@@ -1,7 +1,7 @@
 ARG VERSION="0.0.1-SNAPSHOT"
 
 # Using maven base image in builder stage to build Java code
-FROM maven:3-openjdk-11-slim as builder
+FROM maven:3-eclipse-temurin-21-jammy as builder
 
 WORKDIR /usr/share/app
 COPY pom.xml .
@@ -12,7 +12,7 @@ COPY src src
 RUN mvn clean package -Dmaven.test.skip=true
 
 # Java Runtime as the base for final image
-FROM openjdk:11-jre-slim-buster
+FROM eclipse-temurin:21.0.5_11-jre-jammy
 
 ARG VERSION
 ENV JAR="iudx.data.ingestion.server-dev-0.0.1-SNAPSHOT-fat.jar"
diff --git a/pom.xml b/pom.xml
index ba01c4f..d24e3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,29 +6,29 @@
     <name>iudx-data-ingestion-server</name>
 
     <properties>
-        <vertx.version>4.5.4</vertx.version>
-        <openjdk.version>11</openjdk.version>
+        <vertx.version>4.5.11</vertx.version>
+        <openjdk.version>21</openjdk.version>
         <hazelcast.version>4.0.2</hazelcast.version>
-        <micrometer.version>1.12.3</micrometer.version>
-        <curator.version>5.6.0</curator.version>
-        <apache-commons-lang3.version>3.14.0</apache-commons-lang3.version>
-        <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
-        <apache-log4j2.version>2.23.0</apache-log4j2.version>
-        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
-        <checkstyle.version>10.13.0</checkstyle.version>
-        <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
-        <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
-        <maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
-        <maven-checkstyle-plugin-google.version>3.3.1</maven-checkstyle-plugin-google.version>
-        <maven-surefire-report-plugin.version>3.2.1</maven-surefire-report-plugin.version>
-        <junit-jupiter.params>5.10.2</junit-jupiter.params>
-        <junit-jupiter.version>5.10.2</junit-jupiter.version>
+        <micrometer.version>1.14.1</micrometer.version>
+        <curator.version>5.7.1</curator.version>
+        <apache-commons-lang3.version>3.17.0</apache-commons-lang3.version>
+        <junit-jupiter-engine.version>5.11.3</junit-jupiter-engine.version>
+        <apache-log4j2.version>2.24.1</apache-log4j2.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <checkstyle.version>10.20.0</checkstyle.version>
+        <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+        <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
+        <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
+        <maven-checkstyle-plugin-google.version>3.6.0</maven-checkstyle-plugin-google.version>
+        <maven-surefire-report-plugin.version>3.5.2</maven-surefire-report-plugin.version>
+        <junit-jupiter.params>5.11.3</junit-jupiter.params>
+        <junit-jupiter.version>5.11.3</junit-jupiter.version>
         <lmax-disruptor.version>4.0.0</lmax-disruptor.version>
-        <jackson-core.version>2.16.1</jackson-core.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <jackson-core.version>2.18.1</jackson-core.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <exec.mainClass>iudx.data.ingestion.server.deploy.Deployer</exec.mainClass>
         <exec.mainClassDev>iudx.data.ingestion.server.deploy.DeployerDev
@@ -59,13 +59,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.10.0</version>
+            <version>5.14.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>5.10.0</version>
+            <version>5.14.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -173,7 +173,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.16.1</version>
+            <version>1.17.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -450,8 +450,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                  <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>21</source>
+                    <target>21</target>
                     <annotationProcessors>
                         <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
                     </annotationProcessors>

From 7b7fbc5f0c0a3e7ff895dacbbde0e6afa29a5e06 Mon Sep 17 00:00:00 2001
From: Ankit Singh <101859999+ankitmashu@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:44:19 +0530
Subject: [PATCH 2/2] pomu update

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index d24e3d7..9b37534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,14 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <version>${micrometer.version}</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus-simpleclient -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
+            <version>1.14.1</version>
+        </dependency>
+
         <!-- Packages for Vertx Hazelcast cluster manager  -->
         <dependency>
             <groupId>io.vertx</groupId>