Mosip 35176 Merge develop-java21 branch to develop. (#1356)

* MOSIP-32363 (#1256) Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID (#1264) * MOSIP-32363 Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32460 (#1278) * MOSIP-32460 Signed-off-by: dhanendra06 <[email protected]> * fixed test cases Signed-off-by: dhanendra06 <[email protected]> * fixed test cases Signed-off-by: dhanendra06 <[email protected]> * fixed docker issue Signed-off-by: dhanendra06 <[email protected]> * removed commented code Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32363 - Merged from develop branch and updated the maven plugins (#1277) * MOSIP-32363 Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32363 Updated the maven plugins Signed-off-by: Mohanachandran S <[email protected]> * Merged the develop branch Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32460 : Java21 Migration test cases fixes (#1279) * MOSIP-32460 : Java21 Migration test case fixes Signed-off-by: GOKULRAJ136 <[email protected]> * Update application.properties Signed-off-by: GOKULRAJ136 <[email protected]> * skipped vci test cases causing assertion error Signed-off-by: GOKULRAJ136 <[email protected]> * updated application properties Signed-off-by: GOKULRAJ136 <[email protected]> * test case fixes Signed-off-by: GOKULRAJ136 <[email protected]> --------- Signed-off-by: GOKULRAJ136 <[email protected]> * [DSD-5420] Updated push-trigger.yml Signed-off-by: Praful Rakhade <[email protected]> * [DSD-] Signed-off-by: techno-467 <[email protected]> * [DSD-5420] updated Dockerfile in develop-java21 branch Signed-off-by: techno-467 <[email protected]> * [DSD-5420] updated Dockerfile in develop-java21 branch Signed-off-by: techno-467 <[email protected]> * [DSD-5366] Updated push-trigger.yml Signed-off-by: shubham_G <[email protected]> * [DSD-5366] Updated Dockerfile Signed-off-by: shubham_G <[email protected]> * MOSIP-32418 Updated the POM for the apitest commons groupId (#1284) * MOSIP-32363 Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32363 Updated the maven plugins Signed-off-by: Mohanachandran S <[email protected]> * Merged the develop branch Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32418 Updated the POM for the apitest commons groupId Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * [DSD-5652] Signed-off-by: bhumi46 <[email protected]> * [DSD-5652] Signed-off-by: bhumi46 <[email protected]> * [DSD-5652] Signed-off-by: bhumi46 <[email protected]> * [DSD-5652] Signed-off-by: bhumi46 <[email protected]> * code fix or java 21 Signed-off-by: khuddus shariff <[email protected]> * code fix or java 21 Signed-off-by: khuddus shariff <[email protected]> * code fix or java 21 Signed-off-by: khuddus shariff <[email protected]> * Update bootstrap.properties Signed-off-by: mahammedtaheer <[email protected]> * MOSIP-35176 Migrated to java21. (#1309) * MOSIP-35176 Added exclusion of hibernate auto config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added cache auto config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Deleted keystore entity Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * Fixed startup isse Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed circular dependency Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed circular dependency Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed circular dependency Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed circular dependency Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed circular dependency Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35178 Fixed ida startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35178 Fixed ida startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35178 Fixed ida startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35178 Fixed ida startup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed dependency issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed dependency issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed unnecesarry files Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added exclusion Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida starup failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed configure.sh Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed pom Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added Match type helper test class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Test case fixes Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added base config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected class name Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected class name Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added javadocs Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Combined EntityInfoHelper and map class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected package name Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed BioAuthServiceTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed DemoAuthServiceTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed DemoAuthServiceTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed DemoAuthServiceTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed OtpMatchingStrategy class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed OTPServiceImpl class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed IdInfoFetcherimplTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed KycServiceImplTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed KycServiceImplTest class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed test case failure Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added author to new class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed commented code Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added auth-adapter in docker Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added demosdk Signed-off-by: kameshsr <[email protected]> * Revert "MOSIP-35176 Added demosdk" This reverts commit 01e8997. Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed commented code Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed Ida otp service crashloop issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added auth adapter in pom Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed caching issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added cache Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added cache Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added cache Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed version to 121 snapshot Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added Eckeypair class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed debug log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file of otp service Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added Eckey class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Migrated ida auth service Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file issue in auth service Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed commented code in docker Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed docker file Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed version to 121 java21 snapshot Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added hardcoded value for topic and callback url Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Hardcoded secret Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added custom Websubconfig Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed custom Websubconfig Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added custom Websubconfig Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added custom Websubconfig Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed websub version to 1201 Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed websub version to 121 java21 snapshot Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added dbscript Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected dbscript Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added subscription request Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug statement Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Testing get callback api Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Reverted un-necessary code Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed websub issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed startup issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 updated auth adapter version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed websub issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed slash issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed slash issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed slash issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added extra slash Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added slash Signed-off-by: kameshsr <[email protected]> * Removed extra slash Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added WebConfiguration Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added WebConfiguration Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added author Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed lob Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed batch job issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed batch job issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Increased limit Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Increased limit Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added commit Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added file size limit Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added webflux class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 corrected version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added resttemplate Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added comments Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Refactor code Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed lazy annotation Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added info log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed ida auth issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logger Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logger Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed java.base error Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed java.base error Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed java.base error Signed-off-by: kameshsr <[email protected]> * MOISP-35176 COmmented for testing Signed-off-by: kameshsr <[email protected]> * MOISP-35176 COmmented for testing Signed-off-by: kameshsr <[email protected]> * MOISP-35176 Add loggers Signed-off-by: kameshsr <[email protected]> * MOISP-35176 Corrected if condition Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added java.base Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added debug statement Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed unnecessary log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed keymanager version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed karnel-core version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed sensitive logging data Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed sensitive logging data Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed base config Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logs to check signature Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Enabled debug log Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added request Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added property Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added property Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added property Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logs Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logs Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed system.out.println Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logs Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed multiple calls to chain filter Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added loggers Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added logs Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added check Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed digital signature failed issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed component from filter Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Corrected properties Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 removed id check for testing Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 removed id check for testing Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Reverted component removal Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 added loggers Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 added loggers Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 added loggers Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-31576 removed component Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Moved Trailing slash filter class Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed kyc auth issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed kyc auth issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed kyc auth issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added gitattributes file Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added gitattributes file Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added normalize Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Changed code as per review comment Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed actuator issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 commented push trigger Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: kameshsr <[email protected]> Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 updated pom version Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Added trailing slash issue Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 un-commented api test auth Signed-off-by: kameshsr <[email protected]> * MOSIP-35176 Fixed api test auth issue Signed-off-by: kameshsr <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> Signed-off-by: dhanendra06 <[email protected]> Signed-off-by: GOKULRAJ136 <[email protected]> Signed-off-by: Praful Rakhade <[email protected]> Signed-off-by: techno-467 <[email protected]> Signed-off-by: shubham_G <[email protected]> Signed-off-by: bhumi46 <[email protected]> Signed-off-by: khuddus shariff <[email protected]> Signed-off-by: mahammedtaheer <[email protected]> Signed-off-by: kameshsr <[email protected]> Signed-off-by: kameshsr <[email protected]> Co-authored-by: Mohanachandran S <[email protected]> Co-authored-by: dhanendra06 <[email protected]> Co-authored-by: Gokulraj C <[email protected]> Co-authored-by: Praful Rakhade <[email protected]> Co-authored-by: techno-467 <[email protected]> Co-authored-by: Chandra Keshav Mishra <[email protected]> Co-authored-by: shubham_G <[email protected]> Co-authored-by: bhumi46 <[email protected]> Co-authored-by: khuddus shariff <[email protected]> Co-authored-by: mahammedtaheer <[email protected]>
mosip · Oct 16, 2024 · a43cfc7 · a43cfc7
1 parent ab3fe53
commit a43cfc7
Show file tree

Hide file tree

Showing 185 changed files with 3,472 additions and 2,439 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -18,12 +18,12 @@ on:
       - release*
       - master
       - 1.*
-      - develop
+      - develop*
       - MOSIP*
 
 jobs:
   build-maven-authentication:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: ./authentication
       BUILD_ARTIFACT: authentication
@@ -37,7 +37,7 @@ jobs:
   publish_to_nexus:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}"
     needs: build-maven-authentication
-    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: ./authentication
     secrets:
@@ -64,7 +64,7 @@ jobs:
             BUILD_ARTIFACT: 'authentication'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -78,7 +78,7 @@ jobs:
   sonar_analysis:
     needs: build-maven-authentication
     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: ./authentication
     secrets:

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-[![Maven Package upon a push](https://github.com/mosip/id-authentication/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/id-authentication/actions/workflows/push_trigger.yml)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mosip_id-authentication&id=mosip_id-authentication&branch=release-1.2.0.1&metric=alert_status)](https://sonarcloud.io/dashboard?id=mosip_id-authentication&branch=release-1.2.0.1)
+[![Maven Package upon a push](https://github.com/mosip/id-authentication/actions/workflows/push-trigger.yml/badge.svg?branch=develop-java21)](https://github.com/mosip/id-authentication/actions/workflows/push-trigger.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mosip_id-authentication&id=mosip_id-authentication&branch=develop-java21&metric=alert_status)](https://sonarcloud.io/dashboard?id=mosip_id-authentication&branch=develop-java21)
 
 # ID-Authentication 
 

diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml
@@ -17,8 +17,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- maven -->
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
 		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
 
@@ -30,14 +30,9 @@
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
 		<!-- spring -->
-		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
-		<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
 		<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
-		<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>
 
 		<!-- swagger -->
-		<swagger.core.version>2.0.7</swagger.core.version>
-		<swagger.annotations.version>1.5.21</swagger.annotations.version>
 		<springfox.version>2.9.2</springfox.version>
 
 		<!-- vertx -->
@@ -80,9 +75,7 @@
 		<jsonsimple.version>1.1.1</jsonsimple.version>
 
 		<!-- utilities -->
-		<commons-math3>3.6.1</commons-math3>
 		<commons-lang3>3.7</commons-lang3>
-		<commons-io>2.6</commons-io>
 		<commons-codec>1.11</commons-codec>
 		<commons-collections4.version>4.3</commons-collections4.version>
 		<commons.beanutils.version>1.9.2</commons.beanutils.version>
@@ -118,8 +111,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- maven -->
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
 		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
 
@@ -131,14 +124,9 @@
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
 		<!-- spring -->
-		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
-		<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
 		<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
-		<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>
 
 		<!-- swagger -->
-		<swagger.core.version>2.0.7</swagger.core.version>
-		<swagger.annotations.version>1.5.21</swagger.annotations.version>
 		<springfox.version>2.9.2</springfox.version>
 
 		<!-- vertx -->
@@ -224,7 +212,6 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -279,27 +266,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 			<version>${springdoc.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-annotations</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
-			<version>${spring.boot.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
@@ -331,7 +303,6 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>${jackson.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
@@ -350,7 +321,6 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${jackson.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>

diff --git a/...test/java/io/mosip/authentication/authtypelockfilter/impl/AuthTypeLockFilterImplTest.java b/...test/java/io/mosip/authentication/authtypelockfilter/impl/AuthTypeLockFilterImplTest.java
@@ -10,15 +10,16 @@
 import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants;
 import io.mosip.authentication.core.indauth.dto.*;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestContext;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -31,7 +32,9 @@
 import io.mosip.idrepository.core.dto.AuthtypeStatus;
 import io.mosip.kernel.templatemanager.velocity.builder.TemplateManagerBuilderImpl;
 
-@RunWith(SpringRunner.class)
+import static org.mockito.Mockito.lenient;
+
+@RunWith(MockitoJUnitRunner.class)
 @WebMvcTest
 @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class, TemplateManagerBuilderImpl.class })
 public class AuthTypeLockFilterImplTest {
@@ -132,7 +135,7 @@ public void TestvalidateAuthTypeStatusOTPLocked() throws Throwable {
 		status1.setAuthSubType("phone");
 		status1.setLocked(true);
 		authtypeStatusList.add(status1);
-		Mockito.when(authTypeStatusService.fetchAuthtypeStatus(Mockito.anyString())).thenReturn(authtypeStatusList);
+		lenient().when(authTypeStatusService.fetchAuthtypeStatus(Mockito.anyString())).thenReturn(authtypeStatusList);
 		try {
 			ReflectionTestUtils.invokeMethod(authTypeLockFilterImpl, "validateAuthTypeStatus", authRequestDTO, status,
 					authtypeStatusList);
@@ -196,7 +199,6 @@ public void validateExceptionTest2() throws IdAuthenticationBusinessException {
 		status.setLocked(true);
 		List<AuthtypeStatus> authtypeStatusList = new ArrayList<>();
 		authtypeStatusList.add(status);
-		System.out.println("1= "+authtypeStatusList);
 		IdAuthenticationBusinessException exception = new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorCode(),
 				String.format(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorMessage(),
 						MatchType.Category.SPIN.getType()));

diff --git a/authentication/authentication-common/pom.xml b/authentication/authentication-common/pom.xml
@@ -50,12 +50,10 @@
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>${json.utility.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
@@ -87,7 +85,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<version>${spring.boot.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
@@ -99,7 +96,7 @@
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
-			<version>2.1.7.RELEASE</version>
+			<version>2.5.8.RELEASE</version>
 		</dependency>
 		<!-- Kernel Template -->
 		<dependency>
@@ -126,12 +123,11 @@
              <dependency>
                     <groupId>org.tensorflow</groupId>
                     <artifactId>tensorflow</artifactId>
-                    <version>1.12.0</version>
+                    <version>1.15.0</version>
              </dependency>
              <dependency>
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpclient</artifactId>
-                    <version>4.5.9</version>
              </dependency>
              <dependency>
                     <groupId>org.apache.httpcomponents</groupId>
@@ -142,32 +138,27 @@
              <dependency>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-lang3</artifactId>
-                    <version>3.9</version>
              </dependency>
 
 
 		<dependency>
 		    <groupId>org.mockito</groupId>
 		    <artifactId>mockito-core</artifactId>
-		    <version>${mockito.version}</version>
 		    <scope>test</scope>
 		</dependency>
 		<dependency>
 	      <groupId>net.bytebuddy</groupId>
 	      <artifactId>byte-buddy</artifactId>
-	      <version>${byte-buddy.version}</version>
 	      <scope>compile</scope>
 	    </dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito2</artifactId>
-			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -235,19 +226,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 			<version>${springdoc.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
-			<version>${spring.boot.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
@@ -272,5 +256,9 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-infrastructure</artifactId>
+		</dependency>
 	</dependencies>
 </project>