MOSIP-32453: merge java21 back to develop (#1001)

* MOSIP-32363 JAVA 21 upgrade Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32363 JAVA 21 upgrade (#962) Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID Signed-off-by: Mohanachandran S <[email protected]> * Updated the API commons artifact ID (#966) * MOSIP-32363 JAVA 21 upgrade 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]> * Java 21 migration for syncdata & hotlist Signed-off-by: GOKULRAJ136 <[email protected]> * changes regarding the bean & Autowired Signed-off-by: GOKULRAJ136 <[email protected]> * Updated the Lombok versions Signed-off-by: GOKULRAJ136 <[email protected]> * changing annotations Signed-off-by: GOKULRAJ136 <[email protected]> * DSD-5319 : Java21 Migration - Updated push-trigger.yml for docker image push (#972) * Update push-trigger.yml for docker image push Signed-off-by: Gokulraj C <[email protected]> Signed-off-by: GOKULRAJ136 <[email protected]> * Update push-trigger.yml Signed-off-by: GOKULRAJ136 <[email protected]> --------- Signed-off-by: Gokulraj C <[email protected]> Signed-off-by: GOKULRAJ136 <[email protected]> * updated rest template to resolve token issue Signed-off-by: GOKULRAJ136 <[email protected]> * updated ChronoUnit Signed-off-by: GOKULRAJ136 <[email protected]> * [DSD-5366] Updated apitest in push-trigger.yml Signed-off-by: shubham_G <[email protected]> * Updated the maven plugins Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-32453 Signed-off-by: dhanendra06 <[email protected]> * fixed test cases for admin-service Signed-off-by: dhanendra06 <[email protected]> * fixed test cases for masterdata Signed-off-by: dhanendra06 <[email protected]> * fixed test cases for masterdata Signed-off-by: dhanendra06 <[email protected]> * fixed test cases for masterdata Signed-off-by: dhanendra06 <[email protected]> * fixed test cases for masterdata Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453: Added the db script for spring batch Signed-off-by: dhanendra06 <[email protected]> * fixed db script order issue Signed-off-by: dhanendra06 <[email protected]> * Added revoke script Signed-off-by: dhanendra06 <[email protected]> * Added VM arguments in docker file Signed-off-by: dhanendra06 <[email protected]> * Added VM arguments in docker file Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453 (#989) * MOSIP-32453 * MOSIP-32453 Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453: resolved audit issue (#990) * MOSIP-32453 * MOSIP-32453 Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453 Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453: fixed delete query issue (#991) Signed-off-by: dhanendra06 <[email protected]> * [DSD-5366] Updated Dockerfile Signed-off-by: shubham_G <[email protected]> * MOSIP-32453: fixed center creation issue (#995) * MOSIP-32453: fixed delete query issue Signed-off-by: dhanendra06 <[email protected]> * fixed registrationcenter creation issue Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: dhanendra06 <[email protected]> * MOSIP-32453: fixed bulkupload issue (#997) * MOSIP-32453: fixed delete query issue Signed-off-by: dhanendra06 <[email protected]> * fixed registrationcenter creation issue Signed-off-by: dhanendra06 <[email protected]> * fixed bulkupload issue Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: dhanendra06 <[email protected]> * removed commented code Signed-off-by: dhanendra06 <[email protected]> * fixed the test cases Signed-off-by: dhanendra06 <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> Signed-off-by: GOKULRAJ136 <[email protected]> Signed-off-by: Gokulraj C <[email protected]> Signed-off-by: shubham_G <[email protected]> Signed-off-by: dhanendra06 <[email protected]> Co-authored-by: Mohanachandran S <[email protected]> Co-authored-by: Mohanachandran S <[email protected]> Co-authored-by: GOKULRAJ136 <[email protected]> Co-authored-by: Chandra Keshav Mishra <[email protected]> Co-authored-by: shubham_G <[email protected]>
mosip · Jun 13, 2024 · c26a11a · c26a11a
1 parent b121056
commit c26a11a
Show file tree

Hide file tree

Showing 687 changed files with 5,810 additions and 6,399 deletions.
diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml
@@ -34,6 +34,6 @@ jobs:
             DB_NAME: 'mosip_master'
       fail-fast: false
     name: ${{ matrix.DB_NAME }}
-    uses: mosip/kattu/.github/workflows/db-test.yml@master
+    uses: mosip/kattu/.github/workflows/db-test.yml@master-java21
     with:
       DB_LOCATION: ${{ matrix.DB_LOCATION}}
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -18,12 +18,12 @@ on:
       - release-1*
       - master
       - 1.*
-      - develop
+      - develop*
       - MOSIP*
 
 jobs:
   build-maven-admin-services:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: ./admin
       BUILD_ARTIFACT: admin
@@ -37,7 +37,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-maven-admin-services
-    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: ./admin
     secrets:
@@ -67,7 +67,7 @@ jobs:
             BUILD_ARTIFACT: 'admin'
       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 }}
@@ -81,7 +81,7 @@ jobs:
   sonar_analysis:
     needs: build-maven-admin-services
     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: ./admin
     secrets:
@@ -94,7 +94,7 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   build-maven-apitest-masterdata:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: ./apitest
       BUILD_ARTIFACT: apitest-masterdata
@@ -108,7 +108,7 @@ jobs:
   publish_to_nexus_apitest:
     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-apitest-masterdata
-    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: ./apitest
     secrets:
@@ -128,15 +128,15 @@ jobs:
       SERVICE_LOCATION: apitest
       BUILD_ARTIFACT: apitest-masterdata-local
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - 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
-
+          
       - name: Setup the settings file for ossrh server
         run: echo "<settings> <servers>  <server>  <id>ossrh</id>    <username>${{secrets.ossrh_user}}</username> <password>${{secrets.ossrh_secret}}</password> </server> </servers> <profiles> <profile>     <id>ossrh</id> <activation> <activeByDefault>true</activeByDefault> </activation>  <properties> <gpg.executable>gpg2</gpg.executable> <gpg.passphrase>${{secrets.gpg_secret}}</gpg.passphrase> </properties> </profile> <profile> <id>allow-snapshots</id>       <activation><activeByDefault>true</activeByDefault></activation> <repositories> <repository>        <id>snapshots-repo</id> <url>https://oss.sonatype.org/content/repositories/snapshots</url> <releases><enabled>false</enabled></releases> <snapshots><enabled>true</enabled></snapshots> </repository>  <repository>         <id>releases-repo</id>  <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>         <releases><enabled>true</enabled></releases>         <snapshots><enabled>false</enabled></snapshots> </repository> </repositories>  </profile> <profile> <id>sonar</id> <properties>  <sonar.sources>.</sonar.sources> <sonar.host.url>https://sonarcloud.io</sonar.host.url>  </properties> <activation> <activeByDefault>false</activeByDefault> </activation> </profile> </profiles> </settings>" > $GITHUB_WORKSPACE/settings.xml
 
@@ -182,7 +182,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 }}
@@ -197,7 +197,7 @@ jobs:
   sonar_analysis_apitest_masterdata:
     needs: build-maven-apitest-masterdata
     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: ./apitest
     secrets:

diff --git a/admin/admin-service/Dockerfile b/admin/admin-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11
+FROM eclipse-temurin:21-jre-alpine
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -48,16 +48,16 @@ ARG container_user=mosip
 ARG container_user_group=mosip
 
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
-ARG container_user_uid=1001
+ARG container_user_uid=1002
 
 # 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 \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user}
+RUN apk -q update \
+&& apk add -q unzip wget \
+&& addgroup -g ${container_user_gid} ${container_user_group} \
+&& adduser -s /bin/sh -u ${container_user_uid} -G ${container_user_group} -h /home/${container_user} --disabled-password ${container_user}
 
 # set working directory for the user
 WORKDIR /home/${container_user}
@@ -86,8 +86,8 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \
     rm -rf glowroot.zip ; \
     sed -i 's/<service_name>/kernel-auditmanager-service/g' glowroot/glowroot.properties ; \
     wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
-    java -jar  -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \
+    java -jar  -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}"  --add-modules=ALL-SYSTEM --add-opens=java.base/java.lang=ALL-UNNAMED -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \
     else \
     wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
-    java -jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \
+    java -jar -Dloader.path="${loader_path_env}"  --add-modules=ALL-SYSTEM --add-opens=java.base/java.lang=ALL-UNNAMED -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \
     fi