Merge pull request #926 from vharsh/sync-0.9.0

[INJICERT-421] Manually add changes from release-0.9.0-INJI branch
mosip · Sep 10, 2024 · 5ce06bb · 5ce06bb
2 parents 2c099d9 + c45a2b5
commit 5ce06bb
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 8 deletions.
diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile
@@ -108,6 +108,9 @@ ENV idp_auth_wrapper_lib_zip_path=${base_path}/libs-release-local/idp/idp-auth-w
 # environment variable for esignet wrappers zip path
 ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet
 
+#environment variable for certify plugins zip path
+ENV certify_plugin_zip_path=${base_path}/libs-release-local/certify
+
 # environment variable for Clamav dependency
 ENV clamav_path=${base_path}/libs-release-local/clamav
 
@@ -126,7 +129,7 @@ ENV version=1.2.1-SNAPSHOT
 ENV idp_auth_wrapper_version=0.0.1-SNAPSHOT
 
 # 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} ${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
+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} ${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
 
 # Copy all the respective jars to the location
 
@@ -138,6 +141,8 @@ 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}/

diff --git a/artifacts/configure.sh b/artifacts/configure.sh
@@ -36,6 +36,11 @@ zip -r -j ${esignet_wrapper_lib_zip_path}/esignet-wrapper.zip ${esignet_wrapper_
 rm -rf ${esignet_wrapper_lib_zip_path}/esignet-wrapper
 echo esignet-wrapper zip creation completed
 
+echo certify-plugin zip creation started
+zip -r -j ${certify_plugin_zip_path}/certify-plugin.zip ${certify_plugin_zip_path}/certify-plugin/*
+rm -rf ${certify_plugin_zip_path}/certify-plugin
+echo certify-plugin zip creation completed
+
 echo Creating resources.zip file for all the resources provided
 zip -r -j ${base_path}/libs-release-local/reg-client/resources.zip ${work_dir}/resources
 rm -rf ${work_dir}/resources

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
@@ -130,10 +130,21 @@
 		<esignet-ida-wrapper.version>1.2.0.1</esignet-ida-wrapper.version>
 		<esignet-ida-wrapper.fileName>esignet-ida-wrapper.jar</esignet-ida-wrapper.fileName>
 		<!-- esignet sunbird wrapper -->
-		<esignet-digital-credential-wrapper.version>0.1.0</esignet-digital-credential-wrapper.version>
+		<esignet-digital-credential-wrapper.version>0.2.1-SNAPSHOT</esignet-digital-credential-wrapper.version>
 		<esignet-digital-credential-wrapper.fileName>sunbird-rc-esignet-integration-impl.jar</esignet-digital-credential-wrapper.fileName>
 		<!-- latest mock-sdk -->
 		<mock-sdk-latest.version>1.2.0.2</mock-sdk-latest.version>
+
+		<certify-plugin.location>/usr/share/nginx/html/artifactory/libs-release-local/certify/certify-plugin</certify-plugin.location>
+		<!-- certify sunbird plugin -->
+		<certify-sunbird-plugin.version>0.2.1-SNAPSHOT</certify-sunbird-plugin.version>
+		<certify-sunbird-plugin.fileName>certify-sunbird-plugin.jar</certify-sunbird-plugin.fileName>
+		<!-- certify mosip identity plugin -->
+		<certify-mosip-identity-plugin.version>0.2.1-SNAPSHOT</certify-mosip-identity-plugin.version>
+		<certify-mosip-identity-plugin.fileName>certify-mosip-identity-plugin.jar</certify-mosip-identity-plugin.fileName>
+		<!-- certify mock plugin -->
+		<certify-mock-plugin.version>0.2.1-SNAPSHOT</certify-mock-plugin.version>
+		<certify-mock-plugin.fileName>certify-mock-identity-plugin.jar</certify-mock-plugin.fileName>
 	</properties>
 
 	<build>
@@ -337,7 +348,33 @@
 						<destFileName>${esignet-digital-credential-wrapper.fileName}</destFileName>
 						<type>jar</type>
 					</artifactItem>
-
+					<!-- artifactItem section for certify sunbird plugin -->
+					<artifactItem>
+						<groupId>io.mosip.certify.sunbirdrc</groupId>
+						<artifactId>sunbird-rc-certify-integration-impl</artifactId>
+						<version>${certify-sunbird-plugin.version}</version>
+						<outputDirectory>${certify-plugin.location}</outputDirectory>
+						<destFileName>${certify-sunbird-plugin.fileName}</destFileName>
+						<type>jar</type>
+					</artifactItem>
+					<!-- artifactItem section for certify mosip identity plugin -->
+					<artifactItem>
+						<groupId>io.mosip.certify</groupId>
+						<artifactId>mosip-identity-certify-plugin</artifactId>
+						<version>${certify-mosip-identity-plugin.version}</version>
+						<outputDirectory>${certify-plugin.location}</outputDirectory>
+						<destFileName>${certify-mosip-identity-plugin.fileName}</destFileName>
+						<type>jar</type>
+					</artifactItem>
+					<!-- artifactItem section for certify mock identity plugin -->
+					<artifactItem>
+						<groupId>io.mosip.certify</groupId>
+						<artifactId>mock-certify-plugin</artifactId>
+						<version>${certify-mock-plugin.version}</version>
+						<outputDirectory>${certify-plugin.location}</outputDirectory>
+						<destFileName>${certify-mock-plugin.fileName}</destFileName>
+						<type>jar</type>
+					</artifactItem>
 				</artifactItems>
 			<overWriteReleases>true</overWriteReleases>
               		<overWriteSnapshots>true</overWriteSnapshots>

diff --git a/artifacts/src/hsm/client-21.zip b/artifacts/src/hsm/client-21.zip
diff --git a/deploy/install.sh b/deploy/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=artifactory
-CHART_VERSION=12.0.3
+CHART_VERSION=0.9.1-INJI
 
 echo Create $NS namespace
 kubectl create ns $NS 

diff --git a/helm/artifactory/Chart.yaml b/helm/artifactory/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: artifactory
 description: A Helm chart for MOSIP Artifactory
 type: application
-version: 12.0.3
+version: 0.9.1-INJI
 appVersion: ""
 dependencies:
   - name: common

diff --git a/helm/artifactory/templates/configmap-share.yaml b/helm/artifactory/templates/configmap-share.yaml
@@ -21,6 +21,10 @@ data:
   regproc_jars_env:  {{ .Values.artifacts.regprocJars}}
   runtime_dep_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.runtimeDepUrl }}
   preregistration_i18n_bundle_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.preregistrationBundleUrl }}
+  residentBundleUrl_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.residentBundleUrl }}
   virusscanner_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.virusscannerUrl }}
   auth_wrapper_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.authwrapperUrl }}
-  esignet_wrapper_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.esignetauthwrapperUrl }}
+  esignet_wrapper_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.esignetauthwrapperUrl }}
+  kernel_ref_idobjectvalidator_url: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.kernelRefIdObjectValidator }}
+  icu4j_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.icu4j }}
+  kernel_transliteration_icu4j_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.kernelTransliterationIcu4j }}
diff --git a/helm/artifactory/values.yaml b/helm/artifactory/values.yaml
@@ -2,7 +2,7 @@
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
-# global:
+## global:
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
@@ -53,7 +53,7 @@ service:
 image:
   registry: docker.io
   repository: mosipid/artifactory-server
-  tag: 1.2.0.3
+  tag: 0.9.1-INJI
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -363,6 +363,10 @@ artifacts:
   regprocJars: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
   runtimeDepUrl: /artifactory/libs-release-local/io/mosip/kernel/
   preregistrationBundleUrl: /artifactory/libs-release-local/i18n/pre-registration-i18n-bundle.zip
+  residentBundleUrl: /artifactory/libs-release-local/i18n/resident-i18n-bundle.zip
   virusscannerUrl: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
   authwrapperUrl: /artifactory/libs-release-local/idp/idp-auth-wrapper/authentication-wrapper.jar
   esignetauthwrapperUrl: /artifactory/libs-release-local/esignet/esignet-wrapper.zip
+  kernelRefIdObjectValidator: /artifactory/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator/java21/kernel-ref-idobjectvalidator.jar
+  icu4j: /artifactory/libs-release-local/icu4j/icu4j.jar
+  kernelTransliterationIcu4j: /artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar