Merge branch 'develop' of https://github.com/mosip/registration into …

…MOSIP-29780_develop
mosip · Jan 23, 2024 · 1003d8f · 1003d8f
2 parents ab30bb0 + f467ae3
commit 1003d8f
Show file tree

Hide file tree

Showing 47 changed files with 1,902 additions and 1,719 deletions.
diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml
@@ -0,0 +1,37 @@
+name: PostgreSQL Test
+
+on:
+  release:
+    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:
+      - '!release-branch'
+      - release*
+      - master
+      - 1.*
+      - develop*
+      - MOSIP*
+    paths:
+      - 'db_scripts/**'
+
+jobs:
+  build-db-test:
+    strategy:
+      matrix:
+        include:
+          - DB_LOCATION: 'db_scripts/mosip_regprc'
+            DB_NAME: 'mosip_regprc'
+      fail-fast: false
+    name: ${{ matrix.DB_NAME }}
+    uses: mosip/kattu/.github/workflows/db-test.yml@master
+    with:
+      DB_LOCATION: ${{ matrix.DB_LOCATION}}
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
   pull_request:
-    types: [opened]
+    types: [opened, reopened, synchronize]
 
   workflow_dispatch:
     inputs:
@@ -35,7 +35,7 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   publish_to_nexus:
-    if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}"
+    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
     with:

diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
diff --git a/pom.xml b/pom.xml
diff --git a/.../mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java b/.../mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java
@@ -117,10 +117,10 @@ public class PacketReceiverServiceImpl implements PacketReceiverService<File, Me
 	@Value("${registration.processor.packet.ext}")
 	private String extention;
 
-	@Value("${landing.zone.account.name}")
+	@Value("${mosip.regproc.landing.zone.account.name}")
     private String landingZoneAccount;
 
-	@Value("${landing.zone.type:ObjectStore}")
+	@Value("${mosip.regproc.landing.zone.type:ObjectStore}")
     private String landingZoneType;
 
 	/** The file size. */

diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>io.mosip</groupId>
-		<artifactId>registration</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
-	</parent>
-
 	<licenses>
 		<license>
 			<name>MPL 2.0</name>
@@ -251,9 +244,8 @@
 			**/registration/processor/core/queue/impl/*.java,
 			**/registration/processor/core/tracing/*.java,
 			**/registration/processor/message/sender/config/MsgNotificationBeanCofig.java,
-			**/registration/processor/print/exception/QueueConnectionNotFound.java,
+			**/registration/processor/abis/exception/QueueConnectionNotFound.java,
 			**/registration/processor/stages/demodedupe/StatusMessage.java,
-			**/registration/processor/print/service/utility/UINCardConstant.java,
 			**/registration/processor/stages/demodedupe/BiometricValidation.java,
 			**/registration/processor/camel/bridge/MosipBridgeFactory.java,
 			**/registration/processor/manual/verification/stage/ManualVerificationStage.java,
@@ -267,17 +259,13 @@
 			**/registration/processor/packet/storage/dao/PacketInfoDao.java,
 			**/registration/processor/packet/uploader/constants/*.java,
 			**/registration/processor/packet/manager/constant/*.java,
-			**/registration/processor/print/exception/PrintGlobalExceptionHandler.java,
 			**/registration/processor/packet/receiver/constants/*.java,
-			**/registration/processor/print/service/exception/*.java,
-			**/registration/processor/print/exception/*.java,
+			**/registration/processor/credentialrequestor/stage/exception/*.java,
 			**/registration/processor/packet/uploader/constants/*.java,
 			**/registration/processor/packet/uploader/decryptor/*.java,
 			**/registration/processor/core/abstractverticle/MosipRouter.java,
 			**/registration/processor/packet/uploader/decryptor/*.java,
 
-			**/registration/processor/print/service/impl/PrintPostServiceImpl.java,
-
 			**/registration/processor/message/sender/constants/*.java,
 			**/registration/processor/core/abstractverticle/BaseHealthCheckModel.java,
 			**/registration/processor/core/**/TokenValidator.java,

diff --git a/registration-processor/post-processor/pom.xml b/registration-processor/post-processor/pom.xml
@@ -16,7 +16,7 @@
   </properties>
   	<modules>
     	<module>registration-processor-message-sender-stage</module>
-    	<module>registration-processor-printing-stage</module>
+    	<module>registration-processor-credential-requestor-stage</module>
 		<module>registration-processor-registration-transaction-service</module>
   </modules>
 </project>