Release 1.2.0.1 b4 (#1064)

* Reverted dependencies snapshot versions (#1059) Co-authored-by: Loganathan Sekar <[email protected]> * Fix compilation issue after snapshot version revert. (#1060) * Reverted dependencies snapshot versions * Fixed compilation issue --------- Co-authored-by: Loganathan Sekar <[email protected]> * Release changes (#1063) * Release Bot Pre-release changes * Update README.md Signed-off-by: Keshav Mishra <[email protected]> --------- Signed-off-by: Keshav Mishra <[email protected]> Co-authored-by: ckm007 <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update push_trigger.yml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> * Update pom.xml Signed-off-by: Keshav Mishra <[email protected]> --------- Signed-off-by: Keshav Mishra <[email protected]> Co-authored-by: Loganathan Sekar <[email protected]> Co-authored-by: Loganathan Sekar <[email protected]> Co-authored-by: ckm007 <[email protected]>
mosip · Aug 21, 2023 · 5060833 · 5060833
1 parent dc07b68
commit 5060833
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/authentication/authentication-core/pom.xml b/authentication/authentication-core/pom.xml
@@ -191,4 +191,4 @@
 			</exclusions>
 		</dependency>
 	</dependencies>
-</project>
+</project>
diff --git a/...main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java b/...main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java
@@ -28,9 +28,9 @@
 import io.mosip.authentication.common.service.impl.DemoAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl;
 import io.mosip.authentication.common.service.impl.IdServiceImpl;
+import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.OTPServiceImpl;
-import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl;
 import io.mosip.authentication.common.service.impl.idevent.CredentialStoreServiceImpl;
 import io.mosip.authentication.common.service.impl.idevent.IdChangeEventHandlerServiceImpl;
@@ -83,7 +83,6 @@
 import io.mosip.kernel.cryptomanager.util.CryptomanagerUtils;
 import io.mosip.kernel.dataaccess.hibernate.config.HibernateDaoConfig;
 import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator;
-import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck;
 import io.mosip.kernel.keymanager.hsm.impl.KeyStoreImpl;
 import io.mosip.kernel.keymanagerservice.controller.KeymanagerController;
 import io.mosip.kernel.keymanagerservice.entity.CACertificateStore;
@@ -134,7 +133,7 @@
 		io.mosip.kernel.keymanagerservice.dto.AuthorizedRolesDTO.class,
 		io.mosip.kernel.partnercertservice.dto.AuthorizedRolesDTO.class,
 		io.mosip.kernel.signature.dto.AuthorizedRolesDTO.class,
-		EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class })
+		EnvUtil.class, KeyBindedTokenMatcherUtil.class })
 @ComponentScan(basePackages = { "io.mosip.authentication.internal.service.*", "${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.kernel.core.logger.config",
 		"io.mosip.authentication.common.service.config" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {

diff --git a/...ication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java b/...ication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java
@@ -27,9 +27,9 @@
 import io.mosip.authentication.common.service.impl.AuthtypeStatusImpl;
 import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl;
 import io.mosip.authentication.common.service.impl.IdServiceImpl;
+import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.OTPServiceImpl;
-import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl;
 import io.mosip.authentication.common.service.impl.masterdata.MasterDataCacheUpdateServiceImpl;
 import io.mosip.authentication.common.service.impl.notification.NotificationServiceImpl;
@@ -66,7 +66,6 @@
 import io.mosip.kernel.cryptomanager.util.CryptomanagerUtils;
 import io.mosip.kernel.dataaccess.hibernate.config.HibernateDaoConfig;
 import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator;
-import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck;
 import io.mosip.kernel.keymanager.hsm.impl.KeyStoreImpl;
 import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper;
 import io.mosip.kernel.keymanagerservice.helper.SessionKeyDecrytorHelper;
@@ -106,7 +105,7 @@
 		MasterDataUpdateEventInitializer.class, IdAuthFraudAnalysisEventManager.class, IdAuthFraudAnalysisEventPublisher.class,
 		LangComparatorConfig.class, OpenApiProperties.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class,
 		PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, 
-		IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class })
+		IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class })
 @ComponentScan(basePackages = { "io.mosip.authentication.otp.service.*",
 		"io.mosip.kernel.core.logger.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
 				"io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }))

diff --git a/...on-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java b/...on-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java
@@ -1,6 +1,5 @@
 package io.mosip.authentication.service;
 
-import io.mosip.authentication.common.service.util.KeyBindedTokenMatcherUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -31,8 +30,8 @@
 import io.mosip.authentication.common.service.impl.DemoAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl;
 import io.mosip.authentication.common.service.impl.IdServiceImpl;
-import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl;
+import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl;
 import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl;
 import io.mosip.authentication.common.service.impl.masterdata.MasterDataCacheUpdateServiceImpl;
 import io.mosip.authentication.common.service.impl.notification.NotificationServiceImpl;
@@ -49,6 +48,7 @@
 import io.mosip.authentication.common.service.util.BioMatcherUtil;
 import io.mosip.authentication.common.service.util.EnvUtil;
 import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil;
+import io.mosip.authentication.common.service.util.KeyBindedTokenMatcherUtil;
 import io.mosip.authentication.common.service.validator.AuthFiltersValidator;
 import io.mosip.authentication.common.service.validator.AuthRequestValidator;
 import io.mosip.authentication.common.service.websub.IdAuthWebSubInitializer;
@@ -88,7 +88,6 @@
 import io.mosip.kernel.tokenidgenerator.generator.TokenIDGenerator;
 import io.mosip.kernel.tokenidgenerator.service.impl.TokenIDGeneratorServiceImpl;
 import io.mosip.kernel.zkcryptoservice.service.impl.ZKCryptoManagerServiceImpl;
-import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck;
 
 /**
  * Spring-boot class for ID Authentication Application.
@@ -117,7 +116,7 @@
 		MasterDataUpdateEventInitializer.class, DemoNormalizer.class, DemoMatcherUtil.class,
 		IdAuthFraudAnalysisEventManager.class, IdAuthFraudAnalysisEventPublisher.class, AuthFiltersValidator.class,
 		AuthAnonymousProfileServiceImpl.class, AuthAnonymousEventPublisher.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class,
-		PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class })
+		PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class })
 @ComponentScan(basePackages = { "io.mosip.authentication.service.*", "io.mosip.kernel.core.logger.config",
 		"io.mosip.authentication.common.service.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
 				"io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }))

diff --git a/authentication/pom.xml b/authentication/pom.xml
@@ -106,7 +106,7 @@
 		<kernel-websubclient-api.version>${kernel.parent.version}</kernel-websubclient-api.version>
 		<id-repository-core.version>1.2.0.1-SNAPSHOT</id-repository-core.version>
 		<json.utility.version>20180130</json.utility.version>
-		<kernel-demoapi.version>${kernel.parent.version}</kernel-demoapi.version>
+		<kernel-demoapi.version>1.2.0.1-SNAPSHOT</kernel-demoapi.version>
 		<kernel-idauthenticationfilter-api.version>${kernel.parent.version}</kernel-idauthenticationfilter-api.version>
 		<kernel-biometrics-util>1.2.0</kernel-biometrics-util>