Merge branch 'mosip:develop' into develop

mosip · Sep 10, 2024 · bccc630 · bccc630
2 parents 94b1990 + 76e5dd8
commit bccc630
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -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-registration
-    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus1.yml@master-java21
     with:
       SERVICE_LOCATION: ./registration-processor
     secrets:
@@ -128,4 +128,4 @@ jobs:
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/...mosip/registration/processor/biometric/authentication/config/BiometricAuthConfigBean.java b/...mosip/registration/processor/biometric/authentication/config/BiometricAuthConfigBean.java
@@ -12,7 +12,6 @@
 import io.mosip.kernel.biosdk.provider.factory.BioAPIFactory;
 import io.mosip.kernel.core.crypto.spi.CryptoCoreSpec;
 import io.mosip.kernel.crypto.jce.core.CryptoCore;
-import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator;
 import io.mosip.registration.processor.packet.storage.utils.BioSdkUtil;
 
 @Configuration
@@ -23,10 +22,6 @@ public BioSdkUtil getBioSdkUtil() {
 		return new BioSdkUtil();
 	}
 
-	@Bean
-	public KeyGenerator getKeyGenerator() {
-		return new KeyGenerator();
-	}
 
 	@Bean
 	@Primary

diff --git a/...n/java/io/mosip/registration/processor/packet/storage/config/PacketStorageBeanConfig.java b/...n/java/io/mosip/registration/processor/packet/storage/config/PacketStorageBeanConfig.java
@@ -27,7 +27,6 @@
 import io.mosip.kernel.crypto.jce.core.CryptoCore;
 import io.mosip.kernel.dataaccess.hibernate.config.HibernateDaoConfig;
 import io.mosip.kernel.dataaccess.hibernate.repository.impl.HibernateRepositoryImpl;
-import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator;
 import io.mosip.registration.processor.core.packet.dto.Identity;
 import io.mosip.registration.processor.core.spi.packetmanager.PacketInfoManager;
 import io.mosip.registration.processor.packet.manager.idreposervice.IdRepoService;
@@ -98,10 +97,6 @@ public BioSdkUtil getBioSdkUtil() {
 	}
 
 
-	@Bean
-	public KeyGenerator getKeyGenerator() {
-		return new KeyGenerator();
-	}
 
 	@Bean
 	@Primary