MOSIP-32454: Merging java21 changes (#648)

* MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Java21 Migration (#633) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version (#634) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh (#638) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-33878 (#639) Signed-off-by: Jayesh Kharode <jayesh.kharode@technoforte.co.in> Co-authored-by: Jayesh Kharode <jayesh.kharode@technoforte.co.in> * [DSD-5625] updated regclient Dockerfile for java21 migration Signed-off-by: syed salman <syedsalman3753@gmail.com> * MOSIP-32454: Changed spring versions and run.bat script (#641) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies (#642) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Modified virusscanner jar path (#643) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Modified virusscanner jar path Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixes for doc scan issue and app startup issue (#644) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Modified virusscanner jar path Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed document scan issue Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed startup issue from zip file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed doc scanner issue (#645) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Modified virusscanner jar path Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed document scan issue Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed startup issue from zip file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed doc scanner issue Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Fixed nullpointer issue in error case (#647) * MOSIP-32454: Java21 Migration Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-api Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added version to registration-client pom Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added versions in pom files Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Changes in pom file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Upgraded JavaFX version Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Version changes in Dockerfile and configure.sh Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Rolled back Dockerfile changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Changed spring versions and run.bat script Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Added spring dependencies Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Modified virusscanner jar path Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed document scan issue Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed startup issue from zip file Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Fixed doc scanner issue Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Fixed nullpointer issue in error case Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * MOSIP-32454: Merging Java21 changes Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Initializing secureRandom once Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Added upgrade scripts Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Fixed test cases failure Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> * Fixed test case error Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> --------- Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Signed-off-by: Jayesh Kharode <jayesh.kharode@technoforte.co.in> Signed-off-by: syed salman <syedsalman3753@gmail.com> Co-authored-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com> Co-authored-by: jayesh12234 <111957576+jayesh12234@users.noreply.github.com> Co-authored-by: Jayesh Kharode <jayesh.kharode@technoforte.co.in> Co-authored-by: syed salman <syedsalman3753@gmail.com> Co-authored-by: Chandra Keshav Mishra <chandrakeshavmishra@gmail.com>
mosip · Jul 17, 2024 · 09d9452 · 09d9452
1 parent 3878f0d
commit 09d9452
Show file tree

Hide file tree

Showing 111 changed files with 694 additions and 558 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-regclient:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: registration
       BUILD_ARTIFACT: registration
@@ -43,11 +43,11 @@ jobs:
       BUILD_ARTIFACT: registration-local
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          ref: ${{ github.ref }}
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '21'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
@@ -83,7 +83,7 @@ jobs:
   publish_to_nexus:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
     needs: build-regclient-local
-    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: registration
     secrets:
@@ -105,7 +105,7 @@ jobs:
             ONLY_DOCKER: true
       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 }}
@@ -120,7 +120,7 @@ jobs:
   sonar_analysis:
     needs: build-regclient-local
     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: registration
     secrets:

diff --git a/registration/Dockerfile b/registration/Dockerfile
@@ -1,4 +1,4 @@
-FROM mosipdev/javafx-reg-client-openjdk:latest
+FROM mosipdev/openjdk-21-jdk:latest
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -48,12 +48,6 @@ ARG container_user_uid=1001
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user_gid=1001
 
-# install packages and create user
-RUN apt-get -y update \
-&& apt-get install -y unzip zip nginx \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user}
-
 # set working directory for the user
 WORKDIR /home/${container_user}
 
@@ -67,15 +61,17 @@ ADD registration-test/src/main/resources ./registration-test/resources
 
 ADD configure.sh configure.sh
 
-RUN chmod a+x configure.sh \
- && rm -f ./registration-client/target/registration-client-*-javadoc.jar \
- && rm -f ./registration-client/target/registration-client-*-sources.jar
-
-# change permissions of file inside working dir
-RUN chown -R ${container_user}:${container_user} /home/${container_user}
-RUN chown -R ${container_user}:${container_user} /var/www
+# install packages and create user
+RUN apt-get -y update \
+&& apt-get install -y unzip zip nginx \
+&& groupadd -g ${container_user_gid} ${container_user_group} \
+&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} \
+&& chmod a+x configure.sh && touch /run/nginx.pid && mkdir -p /var/cache/nginx /var/lib/nginx /var/run /var/log/nginx \
+&& rm -f ./registration-client/target/registration-client-*-javadoc.jar \
+&& rm -f ./registration-client/target/registration-client-*-sources.jar \
+&& chown -R ${container_user}:${container_user} /home/${container_user} /var/www /var/lib/nginx /var/cache/nginx /var/run /etc/nginx /var/log/nginx /run/nginx.pid
 
 # select container user for all tasks
-#USER ${container_user_uid}:${container_user_gid}
+USER ${container_user_uid}:${container_user_gid}
 
 ENTRYPOINT ["./configure.sh" ]
diff --git a/registration/configure.sh b/registration/configure.sh
@@ -79,15 +79,20 @@ fi
 wget "${artifactory_url}/artifactory/libs-release-local/icu4j/icu4j.jar" -O "${work_dir}"/registration-client/target/lib/icu4j.jar
 wget "${artifactory_url}/artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar" -O "${work_dir}"/registration-client/target/lib/kernel-transliteration-icu4j.jar
 wget "${artifactory_url}/artifactory/libs-release-local/clamav/clamav.jar" -O "${work_dir}"/registration-client/target/lib/clamav.jar
-wget "${artifactory_url}/artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar" -O "${work_dir}"/registration-client/target/lib/kernel-virusscanner-clamav.jar
+wget "${artifactory_url}/artifactory/libs-release-local/clamav/java21/kernel-virusscanner-clamav.jar" -O "${work_dir}"/registration-client/target/lib/kernel-virusscanner-clamav.jar
 
 #unzip Jre to be bundled
-wget "${artifactory_url}/artifactory/libs-release-local/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip" -O "${work_dir}"/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip
-/usr/bin/unzip "${work_dir}"/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip
+wget "${artifactory_url}/artifactory/libs-release-local/zulu21.34.19-ca-fx-jre21.0.3-win_x64.zip" -O "${work_dir}"/zulu21.34.19-ca-fx-jre21.0.3-win_x64.zip
+/usr/bin/unzip "${work_dir}"/zulu21.34.19-ca-fx-jre21.0.3-win_x64.zip
 mkdir -p "${work_dir}"/registration-client/target/jre
-mv "${work_dir}"/zulu11.41.23-ca-fx-jre11.0.8-win_x64/* "${work_dir}"/registration-client/target/jre/
+mv "${work_dir}"/zulu21.34.19-ca-fx-jre21.0.3-win_x64/* "${work_dir}"/registration-client/target/jre/
 chmod -R a+x "${work_dir}"/registration-client/target/jre
 
+#unzip registration-api-impl jars
+wget "${artifactory_url}/artifactory/libs-release-local/registration-client/registration-api-impl.zip" -O "${work_dir}"/registration-api-impl.zip
+/usr/bin/unzip "${work_dir}"/registration-api-impl.zip
+mv "${work_dir}"/registration-api-impl/* "${work_dir}"/registration-client/target/lib/
+
 cp "${work_dir}"/build_files/logback.xml "${work_dir}"/registration-client/target/lib/logback.xml
 cp "${work_dir}"/registration-client/target/registration-client-${client_version_env}.jar "${work_dir}"/registration-client/target/lib/registration-client-${client_version_env}.jar
 
@@ -100,19 +105,19 @@ echo "FOR /F \"tokens=* delims=\" %%x in (.UNKNOWN_JARS) DO DEL /Q lib\%%x" >> "
 echo ")" >> "${work_dir}"/registration-client/target/run.bat
 echo "if exist .TEMP (" >> "${work_dir}"/registration-client/target/run.bat
 echo "echo Starting Registration Client after Upgrade" >> "${work_dir}"/registration-client/target/run.bat
-echo "xcopy /f/k/y/v/q .TEMP lib && rmdir /s /q .TEMP && start jre\bin\javaw -Xmx2048m -Xms2048m -Dfile.encoding=UTF-8 -cp lib/*;/* io.mosip.registration.controller.Initialization > startup.log 2>&1" >> "${work_dir}"/registration-client/target/run.bat
+echo "xcopy /f/k/y/v/q .TEMP lib && rmdir /s /q .TEMP && start jre\bin\javaw -Xmx2048m -Xms2048m -Dfile.encoding=UTF-8 -cp lib/*;/* --add-modules=javafx.controls,javafx.fxml --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED io.mosip.registration.controller.Initialization > startup.log 2>&1" >> "${work_dir}"/registration-client/target/run.bat
 echo ") else (" >> "${work_dir}"/registration-client/target/run.bat
 echo "echo Starting Registration Client" >> "${work_dir}"/registration-client/target/run.bat
-echo "start jre\bin\javaw -Xmx2048m -Xms2048m -Dfile.encoding=UTF-8 -cp lib/*;/* io.mosip.registration.controller.Initialization > startup.log 2>&1" >> "${work_dir}"/registration-client/target/run.bat
+echo "start jre\bin\javaw -Xmx2048m -Xms2048m -Dfile.encoding=UTF-8 -cp lib/*;/* --add-modules=javafx.controls,javafx.fxml --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED io.mosip.registration.controller.Initialization > startup.log 2>&1" >> "${work_dir}"/registration-client/target/run.bat
 echo ")" >> "${work_dir}"/registration-client/target/run.bat
 
-cp "${work_dir}"/registration-client/target/run.bat "${work_dir}"/registration-client/target/lib/114to1201_run.bat
+cp "${work_dir}"/registration-client/target/run.bat "${work_dir}"/registration-client/target/lib/1201to121_run.bat
 
 ## jar signing
 jarsigner -keystore "${work_dir}"/build_files/keystore.p12 -storepass ${keystore_secret} -tsa ${signer_timestamp_url_env} -digestalg SHA-256 "${work_dir}"/registration-client/target/lib/registration-client-${client_version_env}.jar CodeSigning
 jarsigner -keystore "${work_dir}"/build_files/keystore.p12 -storepass ${keystore_secret} -tsa ${signer_timestamp_url_env} -digestalg SHA-256 "${work_dir}"/registration-client/target/lib/registration-services-${client_version_env}.jar CodeSigning
 
-/usr/local/openjdk-11/bin/java -cp "${work_dir}"/registration-client/target/registration-client-${client_version_env}.jar:"${work_dir}"/registration-client/target/lib/* io.mosip.registration.update.ManifestCreator "${client_version_env}" "${work_dir}/registration-client/target/lib" "${work_dir}/registration-client/target"
+java -cp "${work_dir}"/registration-client/target/registration-client-${client_version_env}.jar:"${work_dir}"/registration-client/target/lib/* io.mosip.registration.update.ManifestCreator "${client_version_env}" "${work_dir}/registration-client/target/lib" "${work_dir}/registration-client/target"
 
 cd "${work_dir}"/registration-client/target/
 

diff --git a/registration/pom.xml b/registration/pom.xml
@@ -71,12 +71,12 @@
 
 	<properties>
 		<main.basedir>${project.basedir}</main.basedir>
-		<maven.jacoco.version>0.8.5</maven.jacoco.version>
+		<maven.jacoco.version>0.8.11</maven.jacoco.version>
 		<javafx.version>2.2</javafx.version>
 		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<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.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
@@ -88,29 +88,31 @@
 		<mockito.version>3.4.4</mockito.version>
 
 		<!-- Lombok -->
-		<lombok.version>1.18.16</lombok.version>
+		<lombok.version>1.18.32</lombok.version>
 
 		<!-- Orika Mapper -->
 		<orika.version>1.4.6</orika.version>
 
 		<!-- Spring version -->
-		<spring.version>5.0.6.RELEASE</spring.version>
+		<spring.version>6.1.4</spring.version>
 
 		<!-- Hibernate version -->
-		<hibernate.version>5.2.9.Final</hibernate.version>
+		<hibernate.version>6.4.4.Final</hibernate.version>
 
 		<!-- Apache Commons DPC2 version -->
 		<apache.commons.dpce.version>2.1.1</apache.commons.dpce.version>
 
 		<!-- Jackson -->
-		<jackson.version>2.14.0</jackson.version>
-		<jackson.mapper.asl.version>1.7.1</jackson.mapper.asl.version>
+		<jackson.version>2.15.4</jackson.version>
+		<jackson.mapper.asl.version>1.9.7</jackson.mapper.asl.version>
+		<mosip.registration.client.version>1.2.1-SNAPSHOT</mosip.registration.client.version>
 		<mosip.core.kernel.version>1.2.1-SNAPSHOT</mosip.core.kernel.version>
 		<mosip.biometric.util.version>1.2.1-SNAPSHOT</mosip.biometric.util.version>
 		<mosip.commons.packet.manager.version>1.2.1-SNAPSHOT</mosip.commons.packet.manager.version>
 		<mosip.kernel.virusscanner.version>1.1.3</mosip.kernel.virusscanner.version>
 		<!-- Derby Version -->
-		<apache.derby.version>10.13.1.1</apache.derby.version>
+		<apache.derby.version>10.17.1.0</apache.derby.version>
+		<bytebuddy.version>1.12.9</bytebuddy.version>
 
 		<!-- sourceafis Version -->
 		<sourceafis.version>3.4.0</sourceafis.version>
@@ -121,27 +123,18 @@
 		<!-- webcam-capture version -->
 		<webcam-capture.version>0.3.12</webcam-capture.version>
 
-
-		<!-- powermock-module-junit4 version -->
-		<powermock-module-junit4.version>2.0.0</powermock-module-junit4.version>
-
-		<!--powermock-api-mockito version -->
-		<powermock-api-mockito.version>1.7.4</powermock-api-mockito.version>
-
-		<!-- powermock-core version -->
-		<powermock-core.version>2.0.7</powermock-core.version>
-
 		<!-- powermock-api-mockito2 version -->
-		<powermock-api-mockito2.version>2.0.7</powermock-api-mockito2.version>
-
+		<powermock.version>2.0.9</powermock.version>
+
+		<mockito-version>3.4.3</mockito-version>
 
 		<!-- TSS Version -->
 		<tss.version>0.3.0</tss.version>
 
 		<!-- support jaxb in java11 -->
 		<javax.activation.version>1.2.0</javax.activation.version>
-        <jaxb.api.version>2.3.0</jaxb.api.version>
-		<openjfx.version>11.0.2</openjfx.version>
+        <jaxb.api.version>2.3.1</jaxb.api.version>
+		<openjfx.version>21.0.3</openjfx.version>
 
 		<sonar.coverage.exclusions>
 			**/dto/**,
@@ -341,6 +334,11 @@
 				<artifactId>spring-context-support</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
+			<dependency>
+    			<groupId>org.springframework</groupId>
+    			<artifactId>spring-context</artifactId>
+    			<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.quartz-scheduler</groupId>
 				<artifactId>quartz</artifactId>
@@ -384,29 +382,29 @@
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-module-junit4</artifactId>
-				<version>${powermock-module-junit4.version}</version>
+				<version>${powermock.version}</version>
 				<scope>test</scope>
 			</dependency>
 
 			<!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-api-mockito</artifactId>
-				<version>${powermock-api-mockito.version}</version>
+				<version>${powermock.version}</version>
 				<scope>test</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-core</artifactId>
-				<version>${powermock-core.version}</version>
+				<version>${powermock.version}</version>
 				<scope>test</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-api-mockito2</artifactId>
-				<version>${powermock-api-mockito2.version}</version>
+				<version>${powermock.version}</version>
 				<scope>test</scope>
 			</dependency>
 				<!-- jaxb for java 11 -->

diff --git a/registration/ref-impl/ref-document-scanner/pom.xml b/registration/ref-impl/ref-document-scanner/pom.xml
@@ -9,8 +9,8 @@
     <version>1.2.1-SNAPSHOT</version>
 
     <properties>
-        <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>
         <spring.boot.version>2.0.2.RELEASE</spring.boot.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     </properties>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>morena7-win</groupId>
             <artifactId>morena7-win</artifactId>
-           <!-- <scope>system</scope>-->
+           <!--<scope>system</scope>-->
             <version>1.0</version>
            <!-- <systemPath>${basedir}/lib/morena/morena7_win.jar</systemPath>-->
         </dependency>

diff --git a/...ref-document-scanner/src/main/java/io/mosip/registration/ref/sarxos/WebCamSarxosImpl.java b/...ref-document-scanner/src/main/java/io/mosip/registration/ref/sarxos/WebCamSarxosImpl.java
@@ -8,7 +8,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;

diff --git a/registration/ref-impl/ref-geoposition-rxtx/pom.xml b/registration/ref-impl/ref-geoposition-rxtx/pom.xml
@@ -9,8 +9,8 @@
     <version>1.2.1-SNAPSHOT</version>
 
     <properties>
-        <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>
         <spring.boot.version>2.0.2.RELEASE</spring.boot.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     </properties>

diff --git a/registration/registration-api-stub-impl/pom.xml b/registration/registration-api-stub-impl/pom.xml
@@ -10,14 +10,14 @@
 		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
-    <groupId>io.mosip.registration</groupId>
+	<groupId>io.mosip.registration</groupId>
     <artifactId>registration-api-stub-impl</artifactId>
     <version>1.2.1-SNAPSHOT</version>
-
+    
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <spring.version>5.0.6.RELEASE</spring.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <spring.version>6.1.4</spring.version>
         <mosip.core.kernel.version>1.2.1-SNAPSHOT</mosip.core.kernel.version>
         <mosip.registration.api.version>1.2.1-SNAPSHOT</mosip.registration.api.version>
     </properties>
@@ -39,8 +39,7 @@
 
         <dependency>
             <groupId>io.mosip.kernel</groupId>
-            <artifactId>kernel-logger-logback</artifactId>
-            <version>${mosip.core.kernel.version}</version>
+            <artifactId>kernel-logger-logback</artifactId>            
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

diff --git a/...n-api-stub-impl/src/main/java/io/mosip/registration/api/impl/scanner/ScannerStubImpl.java b/...n-api-stub-impl/src/main/java/io/mosip/registration/api/impl/scanner/ScannerStubImpl.java
@@ -25,7 +25,7 @@ public class ScannerStubImpl implements DocScannerService {
     private static int index = 0;
 
     static {
-        DOC_STUB_PATHS.add("/images/morena_img.BMP");
+        DOC_STUB_PATHS.add("/images/scanner_image.bmp");
         DOC_STUB_PATHS.add("/images/stubdoc.png");
 
     }

diff --git a/registration/registration-api-stub-impl/src/main/resources/images/scanner_image.bmp b/registration/registration-api-stub-impl/src/main/resources/images/scanner_image.bmp