diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 6f1a3df3700..326df0539bb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.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 }} diff --git a/registration-processor/core-processor/pom.xml b/registration-processor/core-processor/pom.xml index fa91c1f0578..6ef7b7338ca 100644 --- a/registration-processor/core-processor/pom.xml +++ b/registration-processor/core-processor/pom.xml @@ -5,9 +5,9 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT - 1.2.0.1 + 1.2.0.2-SNAPSHOT core-processor core-processor diff --git a/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml index a37de58feed..2d53ad418b8 100644 --- a/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-abis-handler-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml index fa7793ec1ea..2cbcf4a14b0 100644 --- a/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-abis-middleware-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-abis/Dockerfile b/registration-processor/core-processor/registration-processor-abis/Dockerfile index ee5b26edf18..f05538e215d 100644 --- a/registration-processor/core-processor/registration-processor-abis/Dockerfile +++ b/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 diff --git a/registration-processor/core-processor/registration-processor-abis/pom.xml b/registration-processor/core-processor/registration-processor-abis/pom.xml index 6c2b745f082..9467e1c8eaa 100644 --- a/registration-processor/core-processor/registration-processor-abis/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-abis - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-abis UTF-8 diff --git a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml index 56ff425b0df..a6f0ef33649 100644 --- a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-bio-dedupe-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml index 23d4521323a..75b71ea29cb 100644 --- a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-biometric-authentication-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml b/registration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml index b520f750e72..348c186711f 100644 --- a/registration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-biometric-extraction-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml index 81de309f801..b5b1243f406 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-demo-dedupe-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-finalization-stage/pom.xml b/registration-processor/core-processor/registration-processor-finalization-stage/pom.xml index adb6556ca2c..adcf3a1bff6 100644 --- a/registration-processor/core-processor/registration-processor-finalization-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-finalization-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-finalization-stage registration-processor-finalization-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml b/registration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml index b2cb336df8c..5052c572b6a 100644 --- a/registration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-manual-adjudication-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml b/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml index f6ffd9f8f5c..1856e72fb13 100644 --- a/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml @@ -4,10 +4,10 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-uin-generator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/core-processor/registration-processor-verification-stage/pom.xml b/registration-processor/core-processor/registration-processor-verification-stage/pom.xml index 5be0233fbd7..ab10656f02a 100644 --- a/registration-processor/core-processor/registration-processor-verification-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-verification-stage/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor core-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-verification-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/init/pom.xml b/registration-processor/init/pom.xml index 3070a69db67..8bb74008528 100644 --- a/registration-processor/init/pom.xml +++ b/registration-processor/init/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT init - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile b/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile index a0ded0a963d..038adefd911 100644 --- a/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile +++ b/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;"] diff --git a/registration-processor/init/registration-processor-dmz-packet-server/version.xml b/registration-processor/init/registration-processor-dmz-packet-server/version.xml index 0caefe39b1b..26fc147065a 100644 --- a/registration-processor/init/registration-processor-dmz-packet-server/version.xml +++ b/registration-processor/init/registration-processor-dmz-packet-server/version.xml @@ -1,2 +1,2 @@ -1.2.0.1-SNAPSHOT +1.2.0.2-SNAPSHOT diff --git a/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml b/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml index dc7fd87d24e..052f61cc7ab 100644 --- a/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml +++ b/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml @@ -7,11 +7,11 @@ io.mosip.registrationprocessor init - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-packet-receiver-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar registration-processor-packet-receiver-stage diff --git a/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java b/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java index 7964727284c..dceb4550962 100644 --- a/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/service/impl/PacketReceiverServiceImpl.java +++ b/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); } diff --git a/registration-processor/init/registration-processor-registration-status-service/Dockerfile b/registration-processor/init/registration-processor-registration-status-service/Dockerfile index 6f4b8b88b67..5d1c142e1c0 100644 --- a/registration-processor/init/registration-processor-registration-status-service/Dockerfile +++ b/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 diff --git a/registration-processor/init/registration-processor-registration-status-service/pom.xml b/registration-processor/init/registration-processor-registration-status-service/pom.xml index 9ac761be270..b00e0bfcc49 100644 --- a/registration-processor/init/registration-processor-registration-status-service/pom.xml +++ b/registration-processor/init/registration-processor-registration-status-service/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor init - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-registration-status-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-registration-status-service diff --git a/registration-processor/mosip-stage-executor/pom.xml b/registration-processor/mosip-stage-executor/pom.xml index 5253f7e9848..ab59dca3d5b 100644 --- a/registration-processor/mosip-stage-executor/pom.xml +++ b/registration-processor/mosip-stage-executor/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index 108513e41b8..ec997afbe06 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -23,7 +23,7 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT pom registration-processor @@ -122,13 +122,13 @@ 0.1.55 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 1.2.0.1 diff --git a/registration-processor/post-processor/pom.xml b/registration-processor/post-processor/pom.xml index 1cb6d98e72b..e9138b76625 100644 --- a/registration-processor/post-processor/pom.xml +++ b/registration-processor/post-processor/pom.xml @@ -1,22 +1,22 @@ - - - 4.0.0 - pom - - io.mosip.registrationprocessor - registration-processor - 1.2.0.1 - - 1.2.0.1 - post-processor - post-processor - - UTF-8 - - - registration-processor-message-sender-stage - registration-processor-credential-requestor-stage - registration-processor-registration-transaction-service - - + + + 4.0.0 + pom + + io.mosip.registrationprocessor + registration-processor + 1.2.0.2-SNAPSHOT + + 1.2.0.2-SNAPSHOT + post-processor + post-processor + + UTF-8 + + + registration-processor-message-sender-stage + registration-processor-credential-requestor-stage + registration-processor-registration-transaction-service + + diff --git a/registration-processor/post-processor/registration-processor-credential-requestor-stage/pom.xml b/registration-processor/post-processor/registration-processor-credential-requestor-stage/pom.xml index 42b6df248be..45467c2a706 100644 --- a/registration-processor/post-processor/registration-processor-credential-requestor-stage/pom.xml +++ b/registration-processor/post-processor/registration-processor-credential-requestor-stage/pom.xml @@ -1,111 +1,111 @@ - - - 4.0.0 - - io.mosip.registrationprocessor - post-processor - 1.2.0.1 - - registration-processor-credential-requestor-stage - 1.2.0.1 - - UTF-8 - UTF-8 - - - - - org.springframework.cloud - spring-cloud-starter-config - ${spring-cloud-config.version} - - - org.mockito - mockito-core - ${mockito.version} - test - - - com.h2database - h2 - ${h2.version} - - - - - - org.springframework - spring-context - ${spring-framework.version} - - - org.springframework - spring-tx - ${spring-framework.version} - - - io.vertx - vertx-unit - ${vertx.version} - test - - - io.vertx - vertx-web-client - ${vertx.version} - - - org.apache.httpcomponents - httpmime - 4.3.1 - - - io.mosip.registrationprocessor - registration-processor-core - ${registration.processor.core.version} - - - io.mosip.registrationprocessor - registration-processor-registration-status-service-impl - ${registration.status.service.version} - - - io.mosip.registrationprocessor - registration-processor-rest-client - ${registration.processor.rest.client.version} - - - org.mvel - mvel2 - 2.4.12.Final - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - ${powermock.module.junit4.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.api.mockito.version} - test - - - io.mosip.registrationprocessor - registration-processor-info-storage-service - ${packet.info.storage.service.version} - - - - - - - + + + 4.0.0 + + io.mosip.registrationprocessor + post-processor + 1.2.0.2-SNAPSHOT + + registration-processor-credential-requestor-stage + 1.2.0.2-SNAPSHOT + + UTF-8 + UTF-8 + + + + + org.springframework.cloud + spring-cloud-starter-config + ${spring-cloud-config.version} + + + org.mockito + mockito-core + ${mockito.version} + test + + + com.h2database + h2 + ${h2.version} + + + + + + org.springframework + spring-context + ${spring-framework.version} + + + org.springframework + spring-tx + ${spring-framework.version} + + + io.vertx + vertx-unit + ${vertx.version} + test + + + io.vertx + vertx-web-client + ${vertx.version} + + + org.apache.httpcomponents + httpmime + 4.3.1 + + + io.mosip.registrationprocessor + registration-processor-core + ${registration.processor.core.version} + + + io.mosip.registrationprocessor + registration-processor-registration-status-service-impl + ${registration.status.service.version} + + + io.mosip.registrationprocessor + registration-processor-rest-client + ${registration.processor.rest.client.version} + + + org.mvel + mvel2 + 2.4.12.Final + + + junit + junit + test + + + org.powermock + powermock-module-junit4 + ${powermock.module.junit4.version} + test + + + org.powermock + powermock-api-mockito2 + ${powermock.api.mockito.version} + test + + + io.mosip.registrationprocessor + registration-processor-info-storage-service + ${packet.info.storage.service.version} + + + + + + + diff --git a/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml b/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml index 7c564fced35..5920857d00f 100644 --- a/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml +++ b/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml @@ -7,11 +7,11 @@ io.mosip.registrationprocessor post-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-message-sender-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile b/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile index 1d6dfc2031a..f4f55286b62 100644 --- a/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile +++ b/registration-processor/post-processor/registration-processor-registration-transaction-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 diff --git a/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml b/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml index 035c98fe7e2..4645b7ca737 100644 --- a/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml +++ b/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor post-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-registration-transaction-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-registration-transaction-service UTF-8 diff --git a/registration-processor/pre-processor/pom.xml b/registration-processor/pre-processor/pom.xml index cb84ff3c167..0ce22a333eb 100644 --- a/registration-processor/pre-processor/pom.xml +++ b/registration-processor/pre-processor/pom.xml @@ -7,9 +7,9 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT - 1.2.0.1 + 1.2.0.2-SNAPSHOT pre-processor pre-processor diff --git a/registration-processor/pre-processor/registration-processor-cmd-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-cmd-validator-stage/pom.xml index 511ddba8e67..eaf6c343e41 100644 --- a/registration-processor/pre-processor/registration-processor-cmd-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-cmd-validator-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-cmd-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-cmd-validator-stage UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-introducer-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-introducer-validator-stage/pom.xml index 75dd868d51d..f8579442fe6 100644 --- a/registration-processor/pre-processor/registration-processor-introducer-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-introducer-validator-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-introducer-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-introducer-validator-stage UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-operator-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-operator-validator-stage/pom.xml index 7fc3d0804fe..ff71e02b645 100644 --- a/registration-processor/pre-processor/registration-processor-operator-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-operator-validator-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-operator-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-operator-validator-stage UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml index d0a172f2f3f..16f93415792 100644 --- a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-packet-classifier-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml index 35cd8db8546..17923ac9007 100644 --- a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml @@ -9,9 +9,9 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml index d3e4625cc80..c5d71f6971a 100644 --- a/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-packet-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-quality-classifier-stage/pom.xml b/registration-processor/pre-processor/registration-processor-quality-classifier-stage/pom.xml index 348c648df3d..a17977d30d7 100644 --- a/registration-processor/pre-processor/registration-processor-quality-classifier-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-quality-classifier-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-quality-classifier-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml index d3ce4310014..b191fcfef4e 100644 --- a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml @@ -5,10 +5,10 @@ pre-processor io.mosip.registrationprocessor - 1.2.0.1 + 1.2.0.2-SNAPSHOT 4.0.0 - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-securezone-notification-stage diff --git a/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/pom.xml index 78fd91d1ec6..e4bbb93597b 100644 --- a/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor pre-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-supervisor-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-supervisor-validator-stage UTF-8 diff --git a/registration-processor/qc-users-manger/pom.xml b/registration-processor/qc-users-manger/pom.xml index c18da4a005b..63ab3172842 100644 --- a/registration-processor/qc-users-manger/pom.xml +++ b/registration-processor/qc-users-manger/pom.xml @@ -5,11 +5,11 @@ qc-users-manger - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml b/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml index 46d9250b4f7..b87fb9e4e2f 100644 --- a/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml +++ b/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-bio-dedupe-service-impl - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-bio-dedupe-service-impl diff --git a/registration-processor/registration-processor-common-camel-bridge/dependency-reduced-pom.xml b/registration-processor/registration-processor-common-camel-bridge/dependency-reduced-pom.xml index 69896df6196..902072c4051 100644 --- a/registration-processor/registration-processor-common-camel-bridge/dependency-reduced-pom.xml +++ b/registration-processor/registration-processor-common-camel-bridge/dependency-reduced-pom.xml @@ -3,11 +3,11 @@ registration-processor io.mosip.registrationprocessor - 1.2.0.1 + 1.2.0.2-SNAPSHOT 4.0.0 registration-processor-common-camel-bridge - 1.2.0.1 + 1.2.0.2-SNAPSHOT @@ -102,7 +102,7 @@ io.mosip.registration.processor.camel.bridge.MosipCamelBridge 1.0.5 - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/registration-processor-common-camel-bridge/pom.xml b/registration-processor/registration-processor-common-camel-bridge/pom.xml index 42de8bd5870..36af35c3512 100644 --- a/registration-processor/registration-processor-common-camel-bridge/pom.xml +++ b/registration-processor/registration-processor-common-camel-bridge/pom.xml @@ -6,16 +6,16 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-common-camel-bridge - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar io.mosip.registration.processor.camel.bridge.MosipCamelBridge 1.0.5 - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/registration-processor-core/pom.xml b/registration-processor/registration-processor-core/pom.xml index 3f7ea3481ac..bc7bb5066cf 100644 --- a/registration-processor/registration-processor-core/pom.xml +++ b/registration-processor/registration-processor-core/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-core - 1.2.0.1 + 1.2.0.2-SNAPSHOT org.mockito diff --git a/registration-processor/registration-processor-info-storage-service/pom.xml b/registration-processor/registration-processor-info-storage-service/pom.xml index c2ab483f216..549a99fe927 100644 --- a/registration-processor/registration-processor-info-storage-service/pom.xml +++ b/registration-processor/registration-processor-info-storage-service/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-info-storage-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-info-storage-service UTF-8 diff --git a/registration-processor/registration-processor-landing-zone/Dockerfile b/registration-processor/registration-processor-landing-zone/Dockerfile index b9e4a372aab..c1104542707 100644 --- a/registration-processor/registration-processor-landing-zone/Dockerfile +++ b/registration-processor/registration-processor-landing-zone/Dockerfile @@ -1,85 +1,94 @@ -FROM openjdk:11 - -#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 - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG spring_config_label - -# can be passed during Docker build as build time environment for spring profiles active -ARG active_profile - -# can be passed during Docker build as build time environment for config server URL -ARG spring_config_url - -# can be passed during Docker build as build time environment management rmi server hostname -ARG management_rmi_server_hostname - -# can be passed during Docker build as build time environment management rmi server port -ARG management_jmxremote_rmi_port - -# environment variable to pass active profile such as DEV, QA etc at docker runtime -ENV active_profile_env=${active_profile} - -# environment variable to pass github branch to pickup configuration from, at docker runtime -ENV spring_config_label_env=${spring_config_label} - -# environment variable to pass github branch to pickup configuration from, at docker runtime -ENV spring_config_label_env=${spring_config_label} - -# environment variable to pass iam_adapter url, at docker runtime -ENV iam_adapter_url_env=${iam_adapter_url} - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user=mosip -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_group=mosip - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_uid=1001 - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_gid=1001 - -RUN apt-get -y update \ -&& apt-get install -y unzip sudo \ -&& groupadd -g ${container_user_gid} ${container_user_group} \ -&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ -&& adduser ${container_user} sudo - -# set working directory for the user -WORKDIR /home/${container_user} - -ENV work_dir=/home/${container_user} - -ARG loader_path=${work_dir}/additional_jars/ - -RUN mkdir -p ${loader_path} - -ENV loader_path_env=${loader_path} - -# change volume to whichever storage directory you want to use for this container. -VOLUME /home/ftp1/ARCHIVE_PACKET_LOCATION /home/ftp1/LANDING_ZONE ${work_dir}/logs ${work_dir}/Glowroot - -ADD ./target/registration-processor-landing-zone-*.jar registration-processor-landing-zone.jar - -# change permissions of file inside working dir -RUN chown -R ${container_user}:${container_user} /home/${container_user} - -# select container user for all tasks -USER ${container_user_uid}:${container_user_gid} - -CMD if [ "$active_profile_env" = "preprod" ]; then \ - wget 'http://13.71.87.138:8040/artifactory/libs-release-local/io/mosip/testing/glowroot.zip' ; \ - wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - #java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar; \ - unzip glowroot.zip ; \ - rm -rf glowroot.zip ; \ - sed -i 's//registration-processor-registration-status-service/g' glowroot/glowroot.properties ; \ - java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -XX:+UseStringDeduplication -jar -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar ; \ - else \ - wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar; \ - fi - -#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","-javaagent:/home/Glowroot/glowroot.jar","registration-processor-landing-zone.jar"] +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 + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG spring_config_label + +# can be passed during Docker build as build time environment for spring profiles active +ARG active_profile + +# can be passed during Docker build as build time environment for config server URL +ARG spring_config_url + +# can be passed during Docker build as build time environment management rmi server hostname +ARG management_rmi_server_hostname + +# can be passed during Docker build as build time environment management rmi server port +ARG management_jmxremote_rmi_port + +# environment variable to pass active profile such as DEV, QA etc at docker runtime +ENV active_profile_env=${active_profile} + +# environment variable to pass github branch to pickup configuration from, at docker runtime +ENV spring_config_label_env=${spring_config_label} + +# environment variable to pass github branch to pickup configuration from, at docker runtime +ENV spring_config_label_env=${spring_config_label} + +# environment variable to pass iam_adapter url, at docker runtime +ENV iam_adapter_url_env=${iam_adapter_url} + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user=mosip +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_group=mosip + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_uid=1001 + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_gid=1001 + +RUN apt-get -y update \ +&& apt-get install -y unzip sudo \ +&& groupadd -g ${container_user_gid} ${container_user_group} \ +&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ +&& adduser ${container_user} sudo + +# set working directory for the user +WORKDIR /home/${container_user} + +ENV work_dir=/home/${container_user} + +ARG loader_path=${work_dir}/additional_jars/ + +RUN mkdir -p ${loader_path} + +ENV loader_path_env=${loader_path} + +# change volume to whichever storage directory you want to use for this container. +VOLUME /home/ftp1/ARCHIVE_PACKET_LOCATION /home/ftp1/LANDING_ZONE ${work_dir}/logs ${work_dir}/Glowroot + +ADD ./target/registration-processor-landing-zone-*.jar registration-processor-landing-zone.jar + +# change permissions of file inside working dir +RUN chown -R ${container_user}:${container_user} /home/${container_user} + +# select container user for all tasks +USER ${container_user_uid}:${container_user_gid} + +CMD if [ "$active_profile_env" = "preprod" ]; then \ + wget 'http://13.71.87.138:8040/artifactory/libs-release-local/io/mosip/testing/glowroot.zip' ; \ + wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + #java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar; \ + unzip glowroot.zip ; \ + rm -rf glowroot.zip ; \ + sed -i 's//registration-processor-registration-status-service/g' glowroot/glowroot.properties ; \ + java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -XX:+UseStringDeduplication -jar -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar ; \ + else \ + wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" registration-processor-landing-zone.jar; \ + fi + +#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","-javaagent:/home/Glowroot/glowroot.jar","registration-processor-landing-zone.jar"] diff --git a/registration-processor/registration-processor-landing-zone/pom.xml b/registration-processor/registration-processor-landing-zone/pom.xml index ed97ba99ef2..c5e986cf5d0 100644 --- a/registration-processor/registration-processor-landing-zone/pom.xml +++ b/registration-processor/registration-processor-landing-zone/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-landing-zone registration-processor-landing-zone - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-message-sender-impl/pom.xml b/registration-processor/registration-processor-message-sender-impl/pom.xml index bb35f136232..22a3407d2bc 100644 --- a/registration-processor/registration-processor-message-sender-impl/pom.xml +++ b/registration-processor/registration-processor-message-sender-impl/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-message-sender-impl - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-notification-service/pom.xml b/registration-processor/registration-processor-notification-service/pom.xml index de69ecf163a..9807961c20a 100644 --- a/registration-processor/registration-processor-notification-service/pom.xml +++ b/registration-processor/registration-processor-notification-service/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-notification-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/registration-processor-packet-manager/pom.xml b/registration-processor/registration-processor-packet-manager/pom.xml index 7fc4de5a7a4..9cfff5ad8af 100644 --- a/registration-processor/registration-processor-packet-manager/pom.xml +++ b/registration-processor/registration-processor-packet-manager/pom.xml @@ -7,12 +7,12 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-packet-manager registration-processor-packet-manager - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-registration-status-service-impl/pom.xml b/registration-processor/registration-processor-registration-status-service-impl/pom.xml index 5be0a472f78..d9eaa9ca2f2 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/pom.xml +++ b/registration-processor/registration-processor-registration-status-service-impl/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-registration-status-service-impl - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-rest-client/pom.xml b/registration-processor/registration-processor-rest-client/pom.xml index 9333d20cd69..0c7569071d2 100644 --- a/registration-processor/registration-processor-rest-client/pom.xml +++ b/registration-processor/registration-processor-rest-client/pom.xml @@ -9,12 +9,12 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-rest-client registration-processor-rest-client - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 diff --git a/registration-processor/stage-groups/pom.xml b/registration-processor/stage-groups/pom.xml index 9cd56ab6468..ee21d6be5ed 100644 --- a/registration-processor/stage-groups/pom.xml +++ b/registration-processor/stage-groups/pom.xml @@ -7,9 +7,9 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT - 1.2.0.1 + 1.2.0.2-SNAPSHOT stage-groups stage-groups diff --git a/registration-processor/stage-groups/registration-processor-stage-group-1/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-1/pom.xml index 6fd025521cd..a0a7e3e022e 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-1/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-1/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,14 +21,14 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-packet-receiver-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-2/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-2/pom.xml index c691dc33a0e..8a69e324c68 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-2/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-2/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,24 +21,24 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-quality-classifier-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-securezone-notification-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-message-sender-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-3/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-3/pom.xml index 9564721fe7d..d54804f220b 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-3/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-3/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-3 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,29 +21,29 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-abis-handler-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-abis-middleware-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-bio-dedupe-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-manual-adjudication-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-4/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-4/pom.xml index 073f75ad8e8..43417ad3b9e 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-4/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-4/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-4 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,19 +21,19 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-biometric-authentication-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-demo-dedupe-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-5/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-5/pom.xml index 568b76c0274..a52006de8b5 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-5/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-5/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-5 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,34 +21,34 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-cmd-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-operator-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-supervisor-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-introducer-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-packet-validator-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-6/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-6/pom.xml index 860cf10a48e..93590cc789e 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-6/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-6/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor stage-groups - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-stage-group-6 - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -21,24 +21,24 @@ io.mosip.registrationprocessor mosip-stage-executor - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-packet-uploader-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-packet-classifier-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.registrationprocessor registration-processor-verification-stage - 1.2.0.1 + 1.2.0.2-SNAPSHOT diff --git a/registration-processor/stage-groups/registration-processor-stage-group-7/pom.xml b/registration-processor/stage-groups/registration-processor-stage-group-7/pom.xml index ec539470a35..e14b1611516 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-7/pom.xml +++ b/registration-processor/stage-groups/registration-processor-stage-group-7/pom.xml @@ -1,74 +1,74 @@ - - - 4.0.0 - - io.mosip.registrationprocessor - stage-groups - 1.2.0.1 - - - registration-processor-stage-group-7 - 1.2.0.1 - - - UTF-8 - - - - - - - io.mosip.registrationprocessor - mosip-stage-executor - 1.2.0.1 - - - - - io.mosip.registrationprocessor - registration-processor-uin-generator-stage - 1.2.0.1 - - - io.mosip.registrationprocessor - registration-processor-biometric-extraction-stage - 1.2.0.1 - - - io.mosip.registrationprocessor - registration-processor-finalization-stage - 1.2.0.1 - - - io.mosip.registrationprocessor - registration-processor-credential-requestor-stage - 1.2.0.1 - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - io.mosip.registration.processor.stages.executor.MosipStageExecutorApplication - ZIP - - - - - build-info - repackage - - - - - - + + + 4.0.0 + + io.mosip.registrationprocessor + stage-groups + 1.2.0.2-SNAPSHOT + + + registration-processor-stage-group-7 + 1.2.0.2-SNAPSHOT + + + UTF-8 + + + + + + + io.mosip.registrationprocessor + mosip-stage-executor + 1.2.0.2-SNAPSHOT + + + + + io.mosip.registrationprocessor + registration-processor-uin-generator-stage + 1.2.0.2-SNAPSHOT + + + io.mosip.registrationprocessor + registration-processor-biometric-extraction-stage + 1.2.0.2-SNAPSHOT + + + io.mosip.registrationprocessor + registration-processor-finalization-stage + 1.2.0.2-SNAPSHOT + + + io.mosip.registrationprocessor + registration-processor-credential-requestor-stage + 1.2.0.2-SNAPSHOT + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + io.mosip.registration.processor.stages.executor.MosipStageExecutorApplication + ZIP + + + + + build-info + repackage + + + + + + \ No newline at end of file diff --git a/registration-processor/workflow-engine/pom.xml b/registration-processor/workflow-engine/pom.xml index 49b52d674ad..c4b290d6ce4 100644 --- a/registration-processor/workflow-engine/pom.xml +++ b/registration-processor/workflow-engine/pom.xml @@ -5,9 +5,9 @@ io.mosip.registrationprocessor registration-processor - 1.2.0.1 + 1.2.0.2-SNAPSHOT - 1.2.0.1 + 1.2.0.2-SNAPSHOT workflow-engine workflow-engine diff --git a/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile b/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile index 2585338e371..85087966f15 100644 --- a/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile +++ b/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile @@ -1,96 +1,105 @@ -FROM openjdk:11 - -#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 - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG spring_config_label - -# can be passed during Docker build as build time environment for spring profiles active -ARG active_profile - -# can be passed during Docker build as build time environment for config server URL -ARG spring_config_url - -# can be passed during Docker build as build time environment for glowroot -ARG is_glowroot - -# can be passed during Docker build as build time environment for artifactory URL -ARG artifactory_url - -# environment variable to pass active profile such as DEV, QA etc at docker runtime -ENV active_profile_env=${active_profile} - -# environment variable to pass github branch to pickup configuration from, at docker runtime -ENV spring_config_label_env=${spring_config_label} - -# environment variable to pass github branch to pickup configuration from, at docker runtime -ENV spring_config_label_env=${spring_config_label} - -# environment variable to pass glowroot, at docker runtime -ENV is_glowroot_env=${is_glowroot} - -# environment variable to pass artifactory url, at docker runtime -ENV artifactory_url_env=${artifactory_url} - -# environment variable to pass iam_adapter url, at docker runtime -ENV iam_adapter_url_env=${iam_adapter_url} - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user=mosip - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_group=mosip - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_uid=1001 - -# can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_gid=1001 - -RUN apt-get -y update \ -&& apt-get install -y unzip sudo \ -&& groupadd -g ${container_user_gid} ${container_user_group} \ -&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ -&& adduser ${container_user} sudo - -# set working directory for the user -WORKDIR /home/${container_user} - -ENV work_dir=/home/${container_user} - -ARG loader_path=${work_dir}/additional_jars/ - -RUN mkdir -p ${loader_path} - -ENV loader_path_env=${loader_path} - -# change volume to whichever storage directory you want to use for this container. -VOLUME ${work_dir}/logs ${work_dir}/Glowroot - -ADD ./target/registration-processor-reprocessor-*.jar registration-processor-reprocessor.jar - -#Below 4 lines is added only as a temporary fix to downloaded the ceylon dependencies for chime scheduler -#later this chime to be replaced with something else -# change permissions of file inside working dir -RUN chown -R ${container_user}:${container_user} /home/${container_user} - -# select container user for all tasks -USER ${container_user_uid}:${container_user_gid} - -CMD wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/regproc-reprocessor-ceylon-cache-repo.zip ; \ - unzip regproc-reprocessor-ceylon-cache-repo.zip ; \ - rm -rf regproc-reprocessor-ceylon-cache-repo.zip ; \ - if [ "$is_glowroot_env" = "present" ]; then \ - wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ - unzip glowroot.zip ; \ - rm -rf glowroot.zip ; \ - sed -i 's//registration-processor-reprocessor/g' glowroot/glowroot.properties ; \ - java -jar -Dloader.path="${loader_path_env}" -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dceylon.cache.repo=./regproc-reprocessor-ceylon-cache-repo registration-processor-reprocessor.jar ; \ - else \ - wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dceylon.cache.repo=./regproc-reprocessor-ceylon-cache-repo registration-processor-reprocessor.jar ; \ - fi - -#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","registration-processor-reprocessor.jar"] +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 + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG spring_config_label + +# can be passed during Docker build as build time environment for spring profiles active +ARG active_profile + +# can be passed during Docker build as build time environment for config server URL +ARG spring_config_url + +# can be passed during Docker build as build time environment for glowroot +ARG is_glowroot + +# can be passed during Docker build as build time environment for artifactory URL +ARG artifactory_url + +# environment variable to pass active profile such as DEV, QA etc at docker runtime +ENV active_profile_env=${active_profile} + +# environment variable to pass github branch to pickup configuration from, at docker runtime +ENV spring_config_label_env=${spring_config_label} + +# environment variable to pass github branch to pickup configuration from, at docker runtime +ENV spring_config_label_env=${spring_config_label} + +# environment variable to pass glowroot, at docker runtime +ENV is_glowroot_env=${is_glowroot} + +# environment variable to pass artifactory url, at docker runtime +ENV artifactory_url_env=${artifactory_url} + +# environment variable to pass iam_adapter url, at docker runtime +ENV iam_adapter_url_env=${iam_adapter_url} + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user=mosip + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_group=mosip + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_uid=1001 + +# can be passed during Docker build as build time environment for github branch to pickup configuration from. +ARG container_user_gid=1001 + +RUN apt-get -y update \ +&& apt-get install -y unzip sudo \ +&& groupadd -g ${container_user_gid} ${container_user_group} \ +&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ +&& adduser ${container_user} sudo + +# set working directory for the user +WORKDIR /home/${container_user} + +ENV work_dir=/home/${container_user} + +ARG loader_path=${work_dir}/additional_jars/ + +RUN mkdir -p ${loader_path} + +ENV loader_path_env=${loader_path} + +# change volume to whichever storage directory you want to use for this container. +VOLUME ${work_dir}/logs ${work_dir}/Glowroot + +ADD ./target/registration-processor-reprocessor-*.jar registration-processor-reprocessor.jar + +#Below 4 lines is added only as a temporary fix to downloaded the ceylon dependencies for chime scheduler +#later this chime to be replaced with something else +# change permissions of file inside working dir +RUN chown -R ${container_user}:${container_user} /home/${container_user} + +# select container user for all tasks +USER ${container_user_uid}:${container_user_gid} + +CMD wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/regproc-reprocessor-ceylon-cache-repo.zip ; \ + unzip regproc-reprocessor-ceylon-cache-repo.zip ; \ + rm -rf regproc-reprocessor-ceylon-cache-repo.zip ; \ + if [ "$is_glowroot_env" = "present" ]; then \ + wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ + unzip glowroot.zip ; \ + rm -rf glowroot.zip ; \ + sed -i 's//registration-processor-reprocessor/g' glowroot/glowroot.properties ; \ + java -jar -Dloader.path="${loader_path_env}" -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dceylon.cache.repo=./regproc-reprocessor-ceylon-cache-repo registration-processor-reprocessor.jar ; \ + else \ + wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + java -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dceylon.cache.repo=./regproc-reprocessor-ceylon-cache-repo registration-processor-reprocessor.jar ; \ + fi + +#CMD ["java","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","-jar","registration-processor-reprocessor.jar"] diff --git a/registration-processor/workflow-engine/registration-processor-reprocessor/pom.xml b/registration-processor/workflow-engine/registration-processor-reprocessor/pom.xml index 9b76dffed6e..b1e51727ddf 100644 --- a/registration-processor/workflow-engine/registration-processor-reprocessor/pom.xml +++ b/registration-processor/workflow-engine/registration-processor-reprocessor/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor workflow-engine - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-reprocessor - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-reprocessor UTF-8 diff --git a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile b/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile index 869902c1ee6..cdeafeb63a7 100644 --- a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile +++ b/registration-processor/workflow-engine/registration-processor-workflow-manager-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 diff --git a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/pom.xml b/registration-processor/workflow-engine/registration-processor-workflow-manager-service/pom.xml index 9923d3e4dc1..0bf2c3f6c52 100644 --- a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/pom.xml +++ b/registration-processor/workflow-engine/registration-processor-workflow-manager-service/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor workflow-engine - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-workflow-manager-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT registration-processor-workflow-manager-service UTF-8