From f1c1f9970d9675a81daae12f193d796e94126625 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
Date: Fri, 19 Apr 2024 15:46:35 +0530
Subject: [PATCH] MOSIP-32461 code changes

Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
---
 .github/workflows/push-trigger.yml          | 6 +++---
 kernel/kernel-ref-idobjectvalidator/pom.xml | 3 ---
 kernel/kernel-virusscanner-clamav/pom.xml   | 5 +----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 635c9b4e39..e05ac3fc4e 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   build-maven-kernel:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: kernel
       BUILD_ARTIFACT: kernel
@@ -36,7 +36,7 @@ jobs:
   publish_to_nexus_kernel:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
     needs: build-maven-kernel
-    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
     with:
       SERVICE_LOCATION: kernel
     secrets:
@@ -49,7 +49,7 @@ jobs:
   sonar_analysis_kernel:
     needs: build-maven-kernel
     if: "${{  github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: kernel
       PROJECT_KEY: mosip_kernel-ref-idobjectvalidator
diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml
index 57c4281639..cca3c7cf07 100644
--- a/kernel/kernel-ref-idobjectvalidator/pom.xml
+++ b/kernel/kernel-ref-idobjectvalidator/pom.xml
@@ -12,9 +12,6 @@
 	<version>1.2.1-java21-SNAPSHOT</version>
 
 	<properties>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-		<maven.compiler.version>3.8.0</maven.compiler.version>
 		<kernel-logger-logback.version>1.2.1-java21-SNAPSHOT</kernel-logger-logback.version>
 	</properties>
 	<dependencyManagement>
diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml
index fdfef677e8..e3d85122ef 100644
--- a/kernel/kernel-virusscanner-clamav/pom.xml
+++ b/kernel/kernel-virusscanner-clamav/pom.xml
@@ -11,10 +11,7 @@
 
 	<artifactId>kernel-virusscanner-clamav</artifactId>
     	<version>1.2.1-java21-SNAPSHOT</version>
-	<properties>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-		<maven.compiler.version>3.8.0</maven.compiler.version>		
+	<properties>	
 		<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
 		<clamav.client.version>1.0.4</clamav.client.version>
 	</properties>