Merged ES-393 changes to develop

.github/workflows/push-trigger.yml

@@ -4,19 +4,15 @@ on:
   release:
     types: [published]
   pull_request:
-    types: [opened]
-    branches:
-      - '!release-branch'
-      - release-1*
-      - 1.*
-      - develop
-      - MOSIP*
+    types: [opened, reopened, synchronize]
   push:
     branches:
+      - master
       - develop
-      - 1.1.5
-      - MOSIP-17721
+      - 1.*
+      - MOSIP*
       - release*
+      - ES-393
 
 jobs:
   build-docker-artifactory-server:

.github/workflows/tag.yml

@@ -14,14 +14,28 @@ on:
         type: string
       PRE_RELEASE:
         description: 'Pre-release? True/False'
-        required: true
-        default: False
+        required: false
+        default: 'false'
         type: string
       DRAFT:
         description: 'Draft? True/False'
         required: false
-        default: False
+        default: 'false'
+        type: string
+      ONLY_TAG:
+        description: "Only Tag"
+        required: false
+        type: string
+        default: 'false'
+      BRANCH:
+        description: 'Branch name'
+        required: true
+        type: string
+      LATEST:
+        description: 'Latest release'
+        required: false
         type: string
+        default: 'true'
 
 jobs:
   tag-branch:
@@ -31,5 +45,9 @@ jobs:
       BODY: ${{ inputs.BODY }}
       PRE_RELEASE: ${{ inputs.PRE_RELEASE }}
       DRAFT: ${{ inputs.DRAFT }}
+      ONLY_TAG: ${{ inputs.ONLY_TAG }}
+      BRANCH: ${{ inputs.BRANCH }}
+      LATEST: ${{ inputs.LATEST }}
     secrets:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      TOKEN: ${{ secrets.ACTION_PAT }}

artifacts/Dockerfile

@@ -128,8 +128,6 @@ COPY /src/hsm/client.zip ${hsm_client_path}/
 
 COPY /src/mosip-plugins/sign-in-with-esignet/sign-in-with-esignet.zip ${mosip_plugins_zip_path}/
 
-COPY /src/mosip-plugins/secure-biometric-interface-integrator/secure-biometric-interface-integrator.zip ${mosip_plugins_zip_path}/
-
 COPY /src/testing/regproc-reprocessor-ceylon-cache-repo.zip ${test_jar_path}/
 
 COPY /src/testing/glowroot.zip ${test_jar_path}/
@@ -178,4 +176,3 @@ USER ${container_user_uid}:${container_user_gid}
 EXPOSE 8080
 
 CMD ["nginx", "-g", "daemon off;"]
-

artifacts/pom.xml

@@ -88,18 +88,19 @@
 		<clamav-client.location>/usr/share/nginx/html/artifactory/libs-release-local/clamav</clamav-client.location>
 		<clamav-client.fileName>clamav.jar</clamav-client.fileName>
 		<!-- biosdk-client-->
-		<biosdk-client.version>1.2.0.1-B2</biosdk-client.version>
+		<biosdk-client.version>1.2.1-SNAPSHOT</biosdk-client.version>
 		<biosdk-client.location>/usr/share/nginx/html/artifactory/libs-release-local/biosdk/mock/0.9/biosdk-client</biosdk-client.location>
 		<biosdk-client-lib.location>/usr/share/nginx/html/artifactory/libs-release-local/biosdk/biosdk-lib</biosdk-client-lib.location>
 		<biosdk-client.fileName>biosdk-client-jar-with-dependencies.jar</biosdk-client.fileName>
 		<!-- demosdk-client -->
-		<demosdk-client.version>1.2.0</demosdk-client.version>
+		<demosdk-client.version>1.2.1-SNAPSHOT</demosdk-client.version>
 		<demosdk-client.location>/usr/share/nginx/html/artifactory/libs-release-local/demosdk/default/demosdk</demosdk-client.location>
 		<demosdk-client.fileName>demosdk-client-jar-with-dependencies.jar</demosdk-client.fileName>
 		<!-- mock-sdk -->
 		<mock-sdk.version>1.2.1-SNAPSHOT</mock-sdk.version>
 		<mock-sdk.location>/usr/share/nginx/html/artifactory/libs-release-local/mock-sdk/1.1.5</mock-sdk.location>
-		<mock-sdk.fileName>mock-sdk-jar-with-dependencies.jar</mock-sdk.fileName>
+		<mock-sdk.fileName>mock-sdk.jar</mock-sdk.fileName>
+		<mock-sdk-dep.fileName>mock-sdk-jar-with-dependencies.jar</mock-sdk-dep.fileName>
 		<!-- mock-sdk-jpeg-extractor -->
 		<mock-sdk-jpeg-extractor.version>1.2.1-SNAPSHOT</mock-sdk-jpeg-extractor.version>
 		<mock-sdk-jpeg-extractor.location>/usr/share/nginx/html/artifactory/libs-release-local/jpeg-mock-sdk/1.1.5</mock-sdk-jpeg-extractor.location>
@@ -114,7 +115,7 @@
 		<hazelcast.location>/usr/share/nginx/html/artifactory/libs-release-local/cache</hazelcast.location>
 		<hazelcast.fileName>cache-provider.jar</hazelcast.fileName>
 		<!-- authentication-childauthfilter-impl -->
-		<authentication-childauthfilter-impl.version>1.2.0.1-B1</authentication-childauthfilter-impl.version>
+		<authentication-childauthfilter-impl.version>1.2.1-SNAPSHOT</authentication-childauthfilter-impl.version>
 		<authentication-childauthfilter-impl.location>/usr/share/nginx/html/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl</authentication-childauthfilter-impl.location>
 		<authentication-childauthfilter-impl.fileName>authentication-childauthfilter-impl.jar</authentication-childauthfilter-impl.fileName>
 		<!-- idp authentication wrapper -->
@@ -123,11 +124,13 @@
 		<authentication-wrapper.fileName>authentication-wrapper.jar</authentication-wrapper.fileName>
 		<!-- esignet mock authentication wrapper -->
 		<esignet-wrapper.location>/usr/share/nginx/html/artifactory/libs-release-local/esignet/esignet-wrapper</esignet-wrapper.location>
-		<esignet-mock-wrapper.version>0.9.1-SNAPSHOT</esignet-mock-wrapper.version>
+		<esignet-mock-wrapper.version>0.9.2-SNAPSHOT</esignet-mock-wrapper.version>
 		<esignet-mock-wrapper.fileName>esignet-mock-wrapper.jar</esignet-mock-wrapper.fileName>
 		<!-- esignet IDA wrapper -->
 		<esignet-ida-wrapper.version>1.2.1-SNAPSHOT</esignet-ida-wrapper.version>
 		<esignet-ida-wrapper.fileName>esignet-ida-wrapper.jar</esignet-ida-wrapper.fileName>
+		<esignet-digital-credential-wrapper.version>0.1.0-SNAPSHOT</esignet-digital-credential-wrapper.version>
+                <esignet-digital-credential-wrapper.fileName>sunbird-rc-esignet-integration-impl.jar</esignet-digital-credential-wrapper.fileName>
 	</properties>
 
 	<build>
@@ -218,7 +221,7 @@
 					<version>${demosdk-client.version}</version>
 					 <outputDirectory>${demosdk-client.location}</outputDirectory> 
 					<destFileName>${demosdk-client.fileName}</destFileName>
-					<classifier>jar-with-dependencies</classifier>
+			 		<classifier>jar-with-dependencies</classifier>
 					<type>jar</type>
                 </artifactItem>
 <!-- artifactItem section for image-compressor dependency -->
@@ -274,7 +277,7 @@
 					<artifactId>mock-sdk</artifactId>
 					<version>${mock-sdk.version}</version>
 					 <outputDirectory>${biosdk-client-lib.location}</outputDirectory> 
-					<destFileName>${mock-sdk.fileName}</destFileName>
+					<destFileName>${mock-sdk-dep.fileName}</destFileName>
 					<classifier>jar-with-dependencies</classifier>
 					<type>jar</type>
 				</artifactItem>
@@ -322,6 +325,14 @@
 						<destFileName>${esignet-ida-wrapper.fileName}</destFileName>
 						<type>jar</type>
 					</artifactItem>
+					<artifactItem>
+                                                <groupId>io.mosip.esignet.sunbirdrc</groupId>
+	                                        <artifactId>sunbird-rc-esignet-integration-impl</artifactId>
+						<version>${esignet-digital-credential-wrapper.version}</version>
+						<outputDirectory>${esignet-wrapper.location}</outputDirectory>
+						<destFileName>${esignet-digital-credential-wrapper.fileName}</destFileName>
+						<type>jar</type>
+					</artifactItem>
 				</artifactItems>
 			<overWriteReleases>true</overWriteReleases>
               		<overWriteSnapshots>true</overWriteSnapshots>

artifacts/src/i18n/admin-i18n-bundle/i18n/default.json

@@ -29,6 +29,11 @@
       "name": "Kannada",
       "nativeName": "ಕನ್ನಡ",
       "locale": "kn_IN"
+    },
+    "spa": {
+      "name": "Spanish",
+      "nativeName": "Española",
+      "locale": "es_ES"
     }
   },
   "keyboardMapping" :{
@@ -37,12 +42,14 @@
     "ara": "ar",
     "hin": "hi",
     "tam": "ta",
-    "kan": "kn"
+    "kan": "kn",
+    "spa": "es"
   },
   "masterdataMapping" :{
     "blocklisted-words": {
       "name": {
         "eng": "Blocklisted Words",
+        "spa": "Palabras bloqueadas",
         "ara": "الكلمات المحظورة",
         "fra": "Mots bloqués",
         "tam": "தடுப்புப்பட்டியலில் உள்ள வார்த்தைகள்",
@@ -53,6 +60,7 @@
     "holiday": {
       "name": {
         "eng": "Holiday",
+        "spa": "Día festivo",
         "ara": "قائمة عطلة",
         "fra": "Liste de vacances",
         "tam": "விடுமுறை",
@@ -63,6 +71,7 @@
     "document-type": {
       "name": {
         "eng": "Document Type",
+        "spa": "Tipo de Documento",
         "ara": "أنواع المستندات",
         "fra": "Types de documents",
         "tam": "ஆவண வகை",
@@ -73,6 +82,7 @@
     "templates": {
       "name": {
         "eng": "Templates",
+        "spa": "Plantillas",
         "ara": "قوالب",
         "fra": "Modèles",
         "tam": "வார்ப்புருக்கள்",
@@ -83,6 +93,7 @@
     "machine-type": {
       "name": {
         "eng": "Machine Types",
+        "spa": "Tipos de máquinas",
         "ara": "أنواع الآلات",
         "fra": "Types de machines",
         "tam": "இயந்திர வகைகள்",
@@ -93,6 +104,7 @@
     "device-types": {
       "name": {
         "eng": "Device Types",
+        "spa": "Tipos de dispositivos",
         "ara": "أنواع الأجهزة",
         "fra": "Types de périphériques",
         "tam": "சாதன வகைகள்",
@@ -103,6 +115,7 @@
     "document-categories": {
       "name": {
         "eng": "Document Categories",
+        "spa": "Categorías de documentos",
         "ara": "فئات المستندات",
         "fra": "Catégories de document",
         "tam": "ஆவண வகைகள்",
@@ -113,6 +126,7 @@
     "machine-specs": {
       "name": {
         "eng": "Machine Specification",
+        "spa": "Especificación de la máquina",
         "ara": "المواصفات الجهاز",
         "fra": "Spécifications de la machin",
         "tam": "இயந்திர விவரக்குறிப்பு",
@@ -123,6 +137,7 @@
     "device-specs": {
       "name": {
         "eng": "Device Specification",
+        "spa": "Especificación del dispositivo",
         "ara": "مواصفات الجهاز",
         "fra": "Spécifications de l\"appareil",
         "tam": "சாதன விவரக்குறிப்பு",
@@ -133,6 +148,7 @@
     "center-type": {
       "name": {
         "eng": "Center Type",
+        "spa": "Tipo de centro",
         "ara": "نوع المركز",
         "fra": "Type de centre",
         "tam": "மைய வகை",
@@ -143,6 +159,7 @@
     "dynamicfields": {
       "name": {
         "eng": "Dynamic Field",
+        "spa": "Campo Dinámico",
         "ara": "مجال ديناميكي",
         "fra": "Champ dynamique",
         "tam": "டைனமிக் புலம்",
@@ -153,6 +170,7 @@
     "documentCategoryMapping": {
       "name": {
         "eng": "Document Category - Type Mapping",
+        "spa": "Categoría de documento: asignación de tipos",
         "ara": "فئة الوثيقة - نوع التعيين",
         "fra": "Catégorie de document - Mappage de types",
         "tam": "ஆவண வகை - வகை மேப்பிங்",