Merge pull request mosip#1869 from sowmya695/MOSIP-32283

MOSIP-32283 code fix and version change

.github/workflows/push-trigger.yml

@@ -43,7 +43,7 @@ jobs:
     secrets:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_URL: ${{ secrets.RELEASE_URL }}
+      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

registration-processor/core-processor/pom.xml

@@ -5,9 +5,9 @@
   <parent>
     <groupId>io.mosip.registrationprocessor</groupId>
     <artifactId>registration-processor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   </parent>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   <artifactId>core-processor</artifactId>
   <name>core-processor</name>
   <properties>

registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>io.mosip.registrationprocessor</groupId>
         <artifactId>core-processor</artifactId>
-        <version>1.2.0.1</version>
+        <version>1.2.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>registration-processor-abis-handler-stage</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml

@@ -5,10 +5,10 @@
   <parent>
     <groupId>io.mosip.registrationprocessor</groupId>
     <artifactId>core-processor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>registration-processor-abis-middleware-stage</artifactId>
-  <version>1.2.0.1</version>
+  <version>1.2.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-abis/Dockerfile

@@ -1,5 +1,14 @@
 FROM openjdk:11
 
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
 #FROM openjdk:8-jdk-alpine
 

registration-processor/core-processor/registration-processor-abis/pom.xml

@@ -8,10 +8,10 @@
     <parent>
         <groupId>io.mosip.registrationprocessor</groupId>
         <artifactId>core-processor</artifactId>
-        <version>1.2.0.1</version>
+        <version>1.2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>registration-processor-abis</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
     <name>registration-processor-abis</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml

@@ -5,11 +5,11 @@
   <parent>
     <groupId>io.mosip.registrationprocessor</groupId>
     <artifactId>core-processor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>registration-processor-bio-dedupe-stage</artifactId>
-  <version>1.2.0.1</version>
+  <version>1.2.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml

@@ -5,10 +5,10 @@
   <parent>
     <groupId>io.mosip.registrationprocessor</groupId>
     <artifactId>core-processor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>registration-processor-biometric-authentication-stage</artifactId>
-  	<version>1.2.0.1</version>
+  	<version>1.2.0.2-SNAPSHOT</version>
   	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml

@@ -5,10 +5,10 @@
 	<parent>
     	<groupId>io.mosip.registrationprocessor</groupId>
     	<artifactId>core-processor</artifactId>
-    	<version>1.2.0.1</version>
+    	<version>1.2.0.2-SNAPSHOT</version>
   	</parent>
 	<artifactId>registration-processor-biometric-extraction-stage</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml

@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>core-processor</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>registration-processor-demo-dedupe-stage</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-finalization-stage/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
     	<groupId>io.mosip.registrationprocessor</groupId>
     	<artifactId>core-processor</artifactId>
-    	<version>1.2.0.1</version>
+    	<version>1.2.0.2-SNAPSHOT</version>
   	</parent>
 	<artifactId>registration-processor-finalization-stage</artifactId>
 	<name>registration-processor-finalization-stage</name>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml

@@ -8,11 +8,11 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>core-processor</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>registration-processor-manual-adjudication-stage</artifactId>
-     <version>1.2.0.1</version>
+     <version>1.2.0.2-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml

@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>core-processor</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>registration-processor-uin-generator-stage</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

registration-processor/core-processor/registration-processor-verification-stage/pom.xml

@@ -8,11 +8,11 @@
     <parent>
         <groupId>io.mosip.registrationprocessor</groupId>
         <artifactId>core-processor</artifactId>
-        <version>1.2.0.1</version>
+        <version>1.2.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>registration-processor-verification-stage</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

registration-processor/init/pom.xml

@@ -6,10 +6,10 @@
   <parent>
     <groupId>io.mosip.registrationprocessor</groupId>
     <artifactId>registration-processor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>init</artifactId>
-  <version>1.2.0.1</version>
+  <version>1.2.0.2-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

registration-processor/init/registration-processor-dmz-packet-server/Dockerfile

@@ -1,11 +1,20 @@
-FROM nginx
-
-VOLUME /home/mosip
-
-COPY nginx.conf /etc/nginx/nginx.conf
-
-COPY healthcheck.txt /home/mosip/landing/healthcheck.txt
-
-EXPOSE 8082
-
-CMD ["nginx", "-g", "daemon off;"]
+FROM nginx
+
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
+VOLUME /home/mosip
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+COPY healthcheck.txt /home/mosip/landing/healthcheck.txt
+
+EXPOSE 8082
+
+CMD ["nginx", "-g", "daemon off;"]

registration-processor/init/registration-processor-dmz-packet-server/version.xml

@@ -1,2 +1,2 @@
 <!-- The project version used to build docker -->
-<version>1.2.0.1-SNAPSHOT</version>
+<version>1.2.0.2-SNAPSHOT</version>

registration-processor/init/registration-processor-packet-receiver-stage/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>init</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>registration-processor-packet-receiver-stage</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>registration-processor-packet-receiver-stage</name>
 

registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java

@@ -523,7 +523,8 @@ public MessageDTO processPacket(File file)  {
 							DirectoryPathDto.LANDING_ZONE);
 				}
 				else if(landingZoneType.equalsIgnoreCase(LandingZoneTypeConstant.OBJECT_STORE)) {
-					 boolean result =objectStoreAdapter.putObject(landingZoneAccount, registrationId, null, null, packetId, encryptedInputStream);
+					boolean result = objectStoreAdapter.putObject(landingZoneAccount, registrationId, null, null,
+							packetId, new ByteArrayInputStream(encryptedByteArray));
 					 if(!result) {
 						 throw new ObjectStoreNotAccessibleException("Failed to store packet : " + packetId);
 					 }

registration-processor/init/registration-processor-registration-status-service/Dockerfile

@@ -1,5 +1,14 @@
 FROM openjdk:11
 
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
 #FROM openjdk:8-jdk-alpine
 

registration-processor/init/registration-processor-registration-status-service/pom.xml

@@ -8,10 +8,10 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>init</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>registration-processor-registration-status-service</artifactId>
-	 <version>1.2.0.1</version>
+	 <version>1.2.0.2-SNAPSHOT</version>
 
 	<name>registration-processor-registration-status-service</name>
 

registration-processor/mosip-stage-executor/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>io.mosip.registrationprocessor</groupId>
 		<artifactId>registration-processor</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mosip-stage-executor</artifactId>
-    <version>1.2.0.1</version>
+    <version>1.2.0.2-SNAPSHOT</version>
 
     <dependencies>
     	<dependency>

registration-processor/pom.xml

@@ -23,7 +23,7 @@
 	</developers>
 	<groupId>io.mosip.registrationprocessor</groupId>
 	<artifactId>registration-processor</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>registration-processor</name>
@@ -122,13 +122,13 @@
 		<jsch.version>0.1.55</jsch.version>
 
 		<!-- local -->
-		<registration.status.service.version>1.2.0.1</registration.status.service.version>
-		<registration.processor.core.version>1.2.0.1</registration.processor.core.version>
-		<packet.manager.version>1.2.0.1</packet.manager.version>
-		<registration.processor.rest.client.version>1.2.0.1</registration.processor.rest.client.version>
-		<packet.info.storage.service.version>1.2.0.1</packet.info.storage.service.version>
-		<packet.bio.dedupe.service.impl.version>1.2.0.1</packet.bio.dedupe.service.impl.version>
-		<registration.processor.message.sender.version>1.2.0.1</registration.processor.message.sender.version>
+		<registration.status.service.version>1.2.0.2-SNAPSHOT</registration.status.service.version>
+		<registration.processor.core.version>1.2.0.2-SNAPSHOT</registration.processor.core.version>
+		<packet.manager.version>1.2.0.2-SNAPSHOT</packet.manager.version>
+		<registration.processor.rest.client.version>1.2.0.2-SNAPSHOT</registration.processor.rest.client.version>
+		<packet.info.storage.service.version>1.2.0.2-SNAPSHOT</packet.info.storage.service.version>
+		<packet.bio.dedupe.service.impl.version>1.2.0.2-SNAPSHOT</packet.bio.dedupe.service.impl.version>
+		<registration.processor.message.sender.version>1.2.0.2-SNAPSHOT</registration.processor.message.sender.version>
 
 		<!-- Kernel -->
 		<kernel.core.version>1.2.0.1</kernel.core.version>

registration-processor/post-processor/pom.xml

@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  	<packaging>pom</packaging>
-  <parent>
-    <groupId>io.mosip.registrationprocessor</groupId>
-    <artifactId>registration-processor</artifactId>
-    <version>1.2.0.1</version>
-  </parent>
-    <version>1.2.0.1</version>
-  <artifactId>post-processor</artifactId>
-  <name>post-processor</name>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  	<modules>
-    	<module>registration-processor-message-sender-stage</module>
-    	<module>registration-processor-credential-requestor-stage</module>
-		<module>registration-processor-registration-transaction-service</module>
-  </modules>
-</project>
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  	<packaging>pom</packaging>
+  <parent>
+    <groupId>io.mosip.registrationprocessor</groupId>
+    <artifactId>registration-processor</artifactId>
+    <version>1.2.0.2-SNAPSHOT</version>
+  </parent>
+    <version>1.2.0.2-SNAPSHOT</version>
+  <artifactId>post-processor</artifactId>
+  <name>post-processor</name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  	<modules>
+    	<module>registration-processor-message-sender-stage</module>
+    	<module>registration-processor-credential-requestor-stage</module>
+		<module>registration-processor-registration-transaction-service</module>
+  </modules>
+</project>