The pull request is created for cross checking the difference between the release-1.3.x branch and master.

.github/workflows/push-trigger.yml

@@ -5,6 +5,13 @@ on:
     types: [published]
   pull_request:
     types: [opened, reopened, synchronize]
+  workflow_dispatch:
+    inputs:
+      message:
+        description: 'Message for manually triggering'
+        required: false
+        default: 'Triggered for Updates'
+        type: string
   push:
     branches:
       - master
@@ -20,12 +27,16 @@ jobs:
         include:
           - SERVICE_LOCATION: 'artifacts'
             SERVICE_NAME: 'artifactory-server'
+            SQUASH_LAYERS: '77'
+            PLATFORMS: "linux/amd64"
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
     uses: mosip/kattu/.github/workflows/docker-build.yml@master
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
+      SQUASH_LAYERS: ${{ matrix.SQUASH_LAYERS }}
+      PLATFORMS: ${{ matrix.PLATFORMS }}
     secrets:
       DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }}
       ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }}

README.md

@@ -1,15 +1,30 @@
 # artifactory-server
 
-This is a refeference implementation of artifactory service used within MOSIP. The artifactory service contains the dynamically loaded libraries and services. The current repository is a reference implementation of the artifactory service and it packages the necessary mocks, reference implementation to run the default version of MOSIP.
-
-Following are the artifacts which is being served by the service:
-  1. Auth-adapter.jar
-  2. Ref-Idobjectvalidator.jar
-  3. Biosdk.zip
-  4. hsm client
-  5. cache jar
-  6. sms-notification.jar
-  7. clamav-antivirus.jar
+* This is a reference implementation of artifactory service used within MOSIP.
+* The artifactory service contains the dynamically loaded libraries and services.
+* The current repository is a reference implementation of the artifactory service and it packages the necessary mocks, reference implementation to run the default version of MOSIP.
+* Following are the artifacts which is being served by the service:
+  * Kernel auth adapter jars.
+  * Referenced IDObjectvalidator jar.
+  * Sms service provider jar.
+  * Transliteration ICU4J jar.
+  * Registration api stub impl jar.
+  * Virusscanner jar.
+  * ClamAV client jar.
+  * mock-sdk jar.
+  * Biosdk client jar.
+  * Biosdk client zip
+  * Demo sdk jar and zip.
+  * Childauth filter jar.
+  * Hazelcast cache jar.
+  * Redis cache jar.
+  * Authentication wrapper jar.
+  * Sunbird RC Certify plugin integration impl jar.
+  * Softhsm client zip.
+  * i18n bundles for multiple MOSIP UI's.
+  * Masterdata templates for admin service module.
+  * themes for multiple UI's.
+* All these artifacts are released as a part of the Mosip Release with some of them being taken from open sourced repository as per the need.
 
 All these artifacts are released as a part of the Mosip Release with some of them being taken from open sourced repository as per the need.
 
@@ -33,4 +48,4 @@ All these artifacts are released as a part of the Mosip Release with some of the
   ```
     $ cd deploy
     $ ./restart.sh
-   ```
+   ```

artifacts/Dockerfile

@@ -28,8 +28,8 @@ apt-get update -y && \
 apt-get install -y --no-install-recommends unzip wget zip openjdk-11-jdk && \
 groupadd -g ${container_user_gid} ${container_user_group} &&\
 rm -rf /var/lib/apt/lists/* &&\
-wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz &&\
-tar -xzf apache-maven-3.8.8-bin.tar.gz && mv apache-maven-3.8.8 /usr/local/maven && rm apache-maven-3.8.8-bin.tar.gz &&\
+wget https://dlcdn.apache.org/maven/maven-3/3.8.9/binaries/apache-maven-3.8.9-bin.tar.gz &&\
+tar -xzf apache-maven-3.8.9-bin.tar.gz && mv apache-maven-3.8.9 /usr/local/maven && rm apache-maven-3.8.9-bin.tar.gz &&\
 useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
 && mkdir -p /var/run/nginx /var/tmp/nginx \
 && chown -R ${container_user}:${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx
@@ -75,9 +75,6 @@ ENV mosip_plugins_zip_path=${base_path}/libs-release-local/mosip-plugins
 # environment valiable for sdk jar
 ENV sdk_path=${base_path}/libs-release-local/mock-sdk/1.1.5/
 
-# environment valiable for sdk jar
-ENV jpeg_sdk_path=${base_path}/libs-release-local/jpeg-mock-sdk/1.1.5/
-
 # environment valiable for image-compressor jar
 ENV image_compressor_path=${base_path}/libs-release-local/compressor/
 
@@ -117,6 +114,9 @@ ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet
 # environment variable for Clamav dependency
 ENV clamav_path=${base_path}/libs-release-local/clamav
 
+# environment variable for registration-api-impl zip path
+ENV registration_api_impl_zip_path=${base_path}/libs-release-local/registration-client
+
 ENV regclient_jar_path=${base_path}/libs-release-local
 
 ENV master_template_path=${base_path}/libs-release-local/master-templates
@@ -131,8 +131,11 @@ ENV scripts_path=/home/mosip/scripts
 ENV version=1.2.1-SNAPSHOT
 ENV idp_auth_wrapper_version=0.0.1-SNAPSHOT
 
+#environment variable for pdf generator
+ENV pdf_generator_path=${base_path}/libs-release-local/pdf-generator
+
 # Create all the jar, i18n & theme paths.
-RUN mkdir -p ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${mosip_plugins_zip_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${regproc_jar_path} ${sdk_path} ${image_compressor_path}/image-compressor ${icu4j_jar_path} ${clamav_path} ${i18n_zip_path} ${theme_zip_path} ${image_zip_path} ${child_auth_filter_jar_path} ${base_path}/libs-release-local/reg-client ${scripts_path} ${master_template_path} ${jpeg_sdk_path} ${jpegsdk_lib_zip_path}/jpeg-sdk-lib/ ${idp_auth_wrapper_lib_zip_path} ${esignet_wrapper_lib_zip_path}/esignet-wrapper ${certify_plugin_zip_path}/certify-plugin
+RUN mkdir -p ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${mosip_plugins_zip_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${regproc_jar_path} ${sdk_path} ${image_compressor_path}/image-compressor ${icu4j_jar_path} ${clamav_path} ${i18n_zip_path} ${theme_zip_path} ${image_zip_path} ${child_auth_filter_jar_path} ${base_path}/libs-release-local/reg-client ${scripts_path} ${master_template_path} ${pdf_generator_path} ${idp_auth_wrapper_lib_zip_path} ${esignet_wrapper_lib_zip_path}/esignet-wrapper ${certify_plugin_zip_path}/certify-plugin ${registration_api_impl_zip_path}/registration-api-impl
 
 # Copy all the respective jars to the location
 
@@ -144,8 +147,6 @@ COPY /src/deployment/docker/id-authentication/* ${ida_sh_path}/
 
 COPY /src/hsm/client.zip ${hsm_client_path}/
 
-COPY /src/hsm/client-21.zip ${hsm_client_path}/
-
 COPY /src/mosip-plugins/sign-in-with-esignet/sign-in-with-esignet.zip ${mosip_plugins_zip_path}/
 
 COPY /src/testing/regproc-reprocessor-ceylon-cache-repo.zip ${test_jar_path}/
@@ -166,8 +167,6 @@ COPY /src/i18n/pre-registration-i18n-bundle/*  ${work_dir}/pre-registration-i18n
 
 COPY /src/master-templates/* ${work_dir}/master-templates/
 
-COPY /src/i18n/idp-i18n-bundle/*  ${work_dir}/idp-i18n-bundle/
-
 COPY /src/i18n/oidc-demo-i18n-bundle/*  ${work_dir}/oidc-demo-i18n-bundle/
 
 COPY /src/i18n/mock-relying-party-i18n-bundle/*  ${work_dir}/mock-relying-party-i18n-bundle/
@@ -184,10 +183,13 @@ COPY /src/i18n/esignet-signup-i18n-bundle/*  ${work_dir}/esignet-signup-i18n-bun
 
 COPY /src/theme/esignet-signup-theme/* ${work_dir}/esignet-signup-theme/
 
-COPY /src/jre/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip ${regclient_jar_path}/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip
+COPY /src/jre/* ${regclient_jar_path}/
 
 COPY /src/icu4j/* ${icu4j_jar_path}/
 
+COPY /src/pdf-generator/* ${work_dir}/pdf-generator/
+
+
 COPY /src/auth/* ${regproc_jar_path}/
 
 COPY ./configure.sh ${work_dir}/

artifacts/build_version.sh

@@ -8,41 +8,41 @@ echo Script to fetch the timestamp for each required snapshot artifactory
 
 echo timestamp for auth adapter.
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/kernel/kernel-auth-adapter/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/kernel/kernel-auth-adapter/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for msg91 sms jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/kernel/kernel-smsserviceprovider-msg91/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/kernel/kernel-smsserviceprovider-msg91/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for ref-idobjectvalidator jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/kernel/kernel-ref-idobjectvalidator/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/kernel/kernel-ref-idobjectvalidator/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for virus scanner jar 
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/kernel/kernel-virusscanner-clamav/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/kernel/kernel-virusscanner-clamav/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for mock-sdk jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/mock/sdk/mock-sdk/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/mock/sdk/mock-sdk/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for  biosdk client jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/biosdk/biosdk-client/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/biosdk/biosdk-client/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for  demosdk client jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/demosdk/demosdk/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/demosdk/demosdk/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for  child auth filter jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/authentication/authentication-childauthfilter-impl/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/authentication/authentication-childauthfilter-impl/$version/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 echo timestamp for IDP auth wrapper jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/idp/authentication-wrapper/${idp_auth_wrapper_version}/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/idp/authentication-wrapper/${idp_auth_wrapper_version}/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
 
 
 echo timestamp for Esignet auth wrapper jar
 
-curl -s https://oss.sonatype.org/content/repositories/snapshots/io/mosip/idp/authentication-wrapper/${esignet_auth_wrapper_version}/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'
+curl -s https://central.sonatype.com/repository/maven-snapshots/io/mosip/idp/authentication-wrapper/${esignet_auth_wrapper_version}/maven-metadata.xml | grep value | sed "s/.*<value>\([^<]*\)<\/value>.*/\1/" | sed -n '1p'

artifacts/configure.sh

@@ -5,27 +5,28 @@ set -e
 # This scripts performs multiple commands to set up the libraries inside the artifactory server docker.
 # Activies performed are listed as below
 # 1. biosdk-client zip creation
-# 2. jpeg-sdk-lib zip creation
-# 3. biosdk-lib zip ceation
+# 2. biosdk-lib zip ceation
+# 3. image-compressor zip ceation
 # 4. demosdk-lib zip creation
 # 5. Create resources zip for reg-client
 # 6. Create i18n and entity-spec bundles zip files for all the required modules
+# 7. registration-api-impl zip creation
 
 echo biosdk client zip creation started
 zip -r -j ${biosdk_client_zip_path}/biosdk-client.zip ${biosdk_client_zip_path}/biosdk-client/*
 rm -rf ${biosdk_client_zip_path}/biosdk-client
 echo biosdk client zip creation completed
 
-echo jpeg-sdk-lib zip creation started
-zip -r -j ${jpegsdk_lib_zip_path}/jpeg-sdk-lib.zip ${jpegsdk_lib_zip_path}/jpeg-sdk-lib/*
-rm -rf ${jpegsdk_lib_zip_path}/jpeg-sdk-lib
-echo jpeg-sdk-lib zip creation completed
-
 echo biosdk-lib zip creation started
 zip -r -j ${biosdk_lib_zip_path}/biosdk-lib.zip ${biosdk_lib_zip_path}/biosdk-lib/*
 rm -rf ${biosdk_lib_zip_path}/biosdk-lib
 echo biosdk-lib zip creation completed
 
+echo image-compressor zip creation started
+zip -r -j ${image_compressor_path}/image-compressor.zip ${image_compressor_path}/image-compressor/*
+rm -rf ${image_compressor_path}/image-compressor
+echo image-compressor zip creation completed
+
 echo demosdk-client zip creation started
 zip -r -j ${demosdk_zip_path}/demosdk.zip ${demosdk_zip_path}/demosdk/*
 rm -rf ${demosdk_zip_path}/demosdk
@@ -53,19 +54,17 @@ rm -rf ${work_dir}/admin-entity-spec-bundle ${work_dir}/pmp-entity-spec-bundle
 echo spec-bundle zip creation completed
 
 echo i18n-bundles zip creation for all the mentioned modules started
-zip -r -j ${i18n_zip_path}/admin-i18n-bundle.zip ${work_dir}/admin-i18n-bundle/* 
+zip -r -j ${i18n_zip_path}/admin-i18n-bundle.zip ${work_dir}/admin-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/pmp-i18n-bundle.zip ${work_dir}/pmp-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/pre-registration-i18n-bundle.zip ${work_dir}/pre-registration-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/oidc-demo-i18n-bundle.zip ${work_dir}/oidc-demo-i18n-bundle/*
-zip -r -j ${i18n_zip_path}/idp-i18n-bundle.zip ${work_dir}/idp-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/mock-relying-party-i18n-bundle.zip ${work_dir}/mock-relying-party-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/esignet-i18n-bundle.zip ${work_dir}/esignet-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/esignet-signup-i18n-bundle.zip ${work_dir}/esignet-signup-i18n-bundle/*
 rm -rf ${work_dir}/admin-i18n-bundle \
  ${work_dir}/pmp-i18n-bundle \
  ${work_dir}/pre-registration-i18n-bundle \
  ${work_dir}/oidc-demo-i18n-bundle \
- ${work_dir}/idp-i18n-bundle \
  ${work_dir}/mock-relying-party-i18n-bundle \
  ${work_dir}/esignet-i18n-bundle \
  ${work_dir}/resident-i18n-bundle \
@@ -89,4 +88,12 @@ echo master-templates zip creation started
 zip -r -j ${master_template_path}/master-templates.zip ${work_dir}/master-templates/*
 echo master-templates zip creation completed
 
+echo pdf-generator zip creation started
+ls -ltr ${work_dir}/pdf-generator/
+zip -r -j ${pdf_generator_path}/pdf-generator.zip ${work_dir}/pdf-generator/*
+echo pdf-generator zip creation completed
 
+echo registration-api-impl zip creation started
+zip -r -j ${registration_api_impl_zip_path}/registration-api-impl.zip ${registration_api_impl_zip_path}/registration-api-impl/*
+rm -rf ${registration_api_impl_zip_path}/registration-api-impl
+echo registration-api-impl zip creation completed