Skip to content

Commit

Permalink
Merge pull request #1618 from mosip/release-1.2.0.1
Browse files Browse the repository at this point in the history 
Release 1.2.0.1
  • Loading branch information
@ckm007
ckm007 authored Oct 13, 2022
2 parents d7af27d + 59ea188 commit 96faaa8
Show file tree
Hide file tree
Showing 56 changed files with 172 additions and 160 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_trigger.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ jobs:

- name: Publish the maven package
run: |
mvn deploy -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml
mvn deploy -DaltDeploymentRepository=ossrh::default::${{ secrets.OSSRH_SNAPSHOT_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GPG_TTY: $(tty)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip</groupId>
<artifactId>registration</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>MOSIP Registration Parent POM</name>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<artifactId>core-processor</artifactId>
<name>core-processor</name>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-abis-handler-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
14 changes: 13 additions & 1 deletion ...ge/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ private String getDataShareUrl(String id, String process) throws Exception {
priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
}

byte[] content = cbeffutil.createXML(biometricRecord.getSegments());
byte[] content = cbeffutil.createXML(filterExceptionBiometrics(biometricRecord).getSegments());

MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
map.add("name", individualBiometricsLabel);
Expand Down Expand Up @@ -706,6 +706,18 @@ private void validateBiometricRecord(BiometricRecord biometricRecord, List<Strin
}
}

private BiometricRecord filterExceptionBiometrics(BiometricRecord biometricRecord) {
List<BIR> segments = biometricRecord.getSegments().stream().filter(bio -> {
Map<String, String> othersMap = bio.getOthers().entrySet().stream()
.collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
return (othersMap == null || !othersMap.containsKey("EXCEPTION")) ? true
: !(Boolean.parseBoolean(othersMap.get("EXCEPTION")));
}).collect(Collectors.toList());
BiometricRecord biorecord = new BiometricRecord();
biorecord.setSegments(segments);
return biorecord;
}

public Map<String, List<String>> createTypeSubtypeMapping() throws ApisResourceAccessException, DataShareException,
IOException {

Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-abis-middleware-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-abis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-abis</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<name>registration-processor-abis</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-bio-dedupe-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions ...on-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-biometric-authentication-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion ...ration-processor/core-processor/registration-processor-biometric-extraction-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-biometric-extraction-stage</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-demo-dedupe-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion registration-processor/core-processor/registration-processor-finalization-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-finalization-stage</artifactId>
<name>registration-processor-finalization-stage</name>
Expand Down
4 changes: 2 additions & 2 deletions ...tration-processor/core-processor/registration-processor-manual-adjudication-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-manual-adjudication-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-uin-generator-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/core-processor/registration-processor-verification-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-verification-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion registration-processor/init/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>init</artifactId>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/init/registration-processor-packet-receiver-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>init</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-packet-receiver-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>registration-processor-packet-receiver-stage</name>

Expand Down
4 changes: 2 additions & 2 deletions registration-processor/init/registration-processor-registration-status-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>init</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-registration-status-service</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>

<name>registration-processor-registration-status-service</name>

Expand Down
4 changes: 2 additions & 2 deletions registration-processor/mosip-stage-executor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>mosip-stage-executor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
50 changes: 25 additions & 25 deletions registration-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.mosip</groupId>
<artifactId>registration</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>registration-processor</name>
Expand Down Expand Up @@ -108,32 +108,32 @@
<jsch.version>0.1.55</jsch.version>

<!-- local -->
<registration.status.service.version>1.2.0.1-B1</registration.status.service.version>
<registration.processor.core.version>1.2.0.1-B1</registration.processor.core.version>
<packet.manager.version>1.2.0.1-B1</packet.manager.version>
<registration.processor.rest.client.version>1.2.0.1-B1</registration.processor.rest.client.version>
<packet.info.storage.service.version>1.2.0.1-B1</packet.info.storage.service.version>
<packet.bio.dedupe.service.impl.version>1.2.0.1-B1</packet.bio.dedupe.service.impl.version>
<registration.processor.message.sender.version>1.2.0.1-B1</registration.processor.message.sender.version>
<registration.status.service.version>1.2.0.1-SNAPSHOT</registration.status.service.version>
<registration.processor.core.version>1.2.0.1-SNAPSHOT</registration.processor.core.version>
<packet.manager.version>1.2.0.1-SNAPSHOT</packet.manager.version>
<registration.processor.rest.client.version>1.2.0.1-SNAPSHOT</registration.processor.rest.client.version>
<packet.info.storage.service.version>1.2.0.1-SNAPSHOT</packet.info.storage.service.version>
<packet.bio.dedupe.service.impl.version>1.2.0.1-SNAPSHOT</packet.bio.dedupe.service.impl.version>
<registration.processor.message.sender.version>1.2.0.1-SNAPSHOT</registration.processor.message.sender.version>

<!-- Kernel -->
<kernel.core.version>1.2.0.1-B1</kernel.core.version>
<kernel.dataaccess.hibernate.version>1.2.0.1-B1</kernel.dataaccess.hibernate.version>
<kernel.templatemanager.velocity.version>1.2.0.1-B1</kernel.templatemanager.velocity.version>
<kernel.idvalidator.uin.version>1.2.0.1-B1</kernel.idvalidator.uin.version>
<kernel.idvalidator.rid.version>1.2.0.1-B1</kernel.idvalidator.rid.version>
<kernel.cbeffutil.version>1.2.0.1-B1</kernel.cbeffutil.version>
<kernel.core.version>1.2.0.1-SNAPSHOT</kernel.core.version>
<kernel.dataaccess.hibernate.version>1.2.0.1-SNAPSHOT</kernel.dataaccess.hibernate.version>
<kernel.templatemanager.velocity.version>1.2.0.1-SNAPSHOT</kernel.templatemanager.velocity.version>
<kernel.idvalidator.uin.version>1.2.0.1-SNAPSHOT</kernel.idvalidator.uin.version>
<kernel.idvalidator.rid.version>1.2.0.1-SNAPSHOT</kernel.idvalidator.rid.version>
<kernel.cbeffutil.version>1.2.0.1-SNAPSHOT</kernel.cbeffutil.version>
<kernel.bioapi.provider.version>1.2.0</kernel.bioapi.provider.version>
<kernel.auth.adapter.version>1.2.0.1-B1</kernel.auth.adapter.version>
<kernel.pdfgenerator.itext.version>1.2.0.1-B1</kernel.pdfgenerator.itext.version>
<kernel.qrcodegenerator.zxing.version>1.2.0.1-B1</kernel.qrcodegenerator.zxing.version>
<kernel.logger.logback.version>1.2.0.1-B1</kernel.logger.logback.version>
<kernel.idvalidator.vid.version>1.2.0.1-B1</kernel.idvalidator.vid.version>
<object.store.khazana.version>1.2.0.1-B1</object.store.khazana.version>
<kernel.biometrics.api.version>1.2.0.1-B1</kernel.biometrics.api.version>
<kernel-keymanager-service.version>1.2.0.1-B1</kernel-keymanager-service.version>
<kernel.websubclient.version>1.2.0.1-B1</kernel.websubclient.version>
<kernel-biosdk-provider.version>1.2.0.1-B1</kernel-biosdk-provider.version>
<kernel.auth.adapter.version>1.2.0.1-SNAPSHOT</kernel.auth.adapter.version>
<kernel.pdfgenerator.itext.version>1.2.0.1-SNAPSHOT</kernel.pdfgenerator.itext.version>
<kernel.qrcodegenerator.zxing.version>1.2.0.1-SNAPSHOT</kernel.qrcodegenerator.zxing.version>
<kernel.logger.logback.version>1.2.0.1-SNAPSHOT</kernel.logger.logback.version>
<kernel.idvalidator.vid.version>1.2.0.1-SNAPSHOT</kernel.idvalidator.vid.version>
<object.store.khazana.version>1.2.0.1-SNAPSHOT</object.store.khazana.version>
<kernel.biometrics.api.version>1.2.0.1-SNAPSHOT</kernel.biometrics.api.version>
<kernel-keymanager-service.version>1.2.0.1-SNAPSHOT</kernel-keymanager-service.version>
<kernel.websubclient.version>1.2.0.1-SNAPSHOT</kernel.websubclient.version>
<kernel-biosdk-provider.version>1.2.0.1-SNAPSHOT</kernel-biosdk-provider.version>
<sonar.coverage.exclusions>**/dto/**,
**/exception/*Exception.java,
**/config/*Config.java,
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/post-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<artifactId>post-processor</artifactId>
<name>post-processor</name>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>post-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-message-sender-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/post-processor/registration-processor-printing-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>post-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-printing-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
4 changes: 2 additions & 2 deletions ...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>post-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-registration-transaction-service</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<name>registration-processor-registration-transaction-service</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/pre-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<artifactId>pre-processor</artifactId>
<name>pre-processor</name>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions registration-processor/pre-processor/registration-processor-cmd-validator-stage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-cmd-validator-stage</artifactId>
<version>1.2.0.1-B1</version>
<version>1.2.0.1-SNAPSHOT</version>
<name>registration-processor-cmd-validator-stage</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Loading

0 comments on commit 96faaa8

Please sign in to comment.