Skip to content

Commit

Permalink
MOSIP-24027 rest template issue fix (#1612)
Browse files Browse the repository at this point in the history
* rest template issue fix
* version modified for parent and child, commented unchnaged modules and lib
* Update push_trigger.yml
Co-authored-by: Vishwa <[email protected]>
  • Loading branch information
urviljoshi authored Oct 7, 2022
1 parent 63eb8a1 commit 0e0a444
Show file tree
Hide file tree
Showing 31 changed files with 85 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,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
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>MOSIP Registration Parent POM</name>
Expand Down
12 changes: 6 additions & 6 deletions registration-processor/core-processor/pom.xml
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<artifactId>core-processor</artifactId>
<name>core-processor</name>
<properties>
Expand All @@ -17,11 +17,11 @@
<module>registration-processor-demo-dedupe-stage</module>
<module>registration-processor-bio-dedupe-stage</module>
<module>registration-processor-uin-generator-stage</module>
<module>registration-processor-abis</module>
<module>registration-processor-manual-verification-stage</module>
<module>registration-processor-reprocessor-stage</module>
<!-- <module>registration-processor-abis</module> -->
<module>registration-processor-manual-verification-stage</module>
<module>registration-processor-reprocessor-stage</module>
<module>registration-processor-abis-handler-stage</module>
<module>registration-processor-abis-middleware-stage</module>
<module>registration-processor-biometric-authentication-stage</module>
</modules>
</project>
</project>
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-abis-handler-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-abis-middleware-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-abis</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<name>registration-processor-abis</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-bio-dedupe-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-biometric-authentication-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-demo-dedupe-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-manual-verification-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>core-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-reprocessor-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<name>registration-processor-reprocessor-stage</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-uin-generator-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-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/init/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>init</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>registration-processor-packet-receiver-stage</module>
<module>registration-processor-registration-status-service</module>
<module>registration-processor-registration-status-service</module>
</modules>
</project>
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-packet-receiver-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<name>registration-processor-packet-receiver-stage</name>

<properties>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-registration-status-service</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>

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

Expand Down
18 changes: 9 additions & 9 deletions registration-processor/pom.xml
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

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

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

<!-- local -->
<registration.status.service.version>1.1.5.5</registration.status.service.version>
<registration.status.service.version>1.1.5.5-p1-SNAPSHOT</registration.status.service.version>
<registration.processor.core.version>1.1.5.5</registration.processor.core.version>
<packet.manager.version>1.1.5.5</packet.manager.version>
<registration.processor.rest.client.version>1.1.5.5</registration.processor.rest.client.version>
<registration.processor.rest.client.version>1.1.5.5-p1-SNAPSHOT</registration.processor.rest.client.version>
<packet.info.storage.service.version>1.1.5.5</packet.info.storage.service.version>
<packet.bio.dedupe.service.impl.version>1.1.5.5</packet.bio.dedupe.service.impl.version>
<registration.processor.message.sender.version>1.1.5.5</registration.processor.message.sender.version>
Expand Down Expand Up @@ -310,15 +310,15 @@
</dependencyManagement>

<modules>
<module>registration-processor-core</module>
<!-- <module>registration-processor-core</module> -->
<module>registration-processor-rest-client</module>
<module>registration-processor-packet-manager</module>
<!-- <module>registration-processor-packet-manager</module> -->
<module>registration-processor-common-camel-bridge</module>
<module>registration-processor-bio-dedupe-service-impl</module>
<module>registration-processor-info-storage-service</module>
<!-- <module>registration-processor-bio-dedupe-service-impl</module>
<module>registration-processor-info-storage-service</module> -->
<module>registration-processor-registration-status-service-impl</module>
<!-- <module>registration-processor-quality-checker</module> -->
<module>registration-processor-message-sender-impl</module>
<!-- <module>registration-processor-message-sender-impl</module> -->
<module>init</module>
<module>pre-processor</module>
<module>core-processor</module>
Expand Down
6 changes: 3 additions & 3 deletions registration-processor/post-processor/pom.xml
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<artifactId>post-processor</artifactId>
<name>post-processor</name>
<properties>
Expand All @@ -17,6 +17,6 @@
<modules>
<module>registration-processor-message-sender-stage</module>
<module>registration-processor-printing-stage</module>
<module>registration-processor-registration-transaction-service</module>
<!-- <module>registration-processor-registration-transaction-service</module> -->
</modules>
</project>
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-message-sender-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
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.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-printing-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
10 changes: 5 additions & 5 deletions registration-processor/pre-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>registration-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<artifactId>pre-processor</artifactId>
<name>pre-processor</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>registration-processor-packet-validator-stage</module>
<module>registration-processor-packet-validator-stage</module>
<module>registration-processor-osi-validator-stage</module>
<module>registration-processor-packet-uploader-stage</module>
<module>registration-processor-external-stage</module>
<module>registration-processor-external-integration-service</module>
<!-- <module>registration-processor-external-integration-service</module> -->
<module>registration-processor-quality-checker-stage</module>
<module>registration-processor-securezone-notification-stage</module>
<module>registration-processor-packet-classifier-stage</module>
<module>registration-processor-packet-classifier-stage</module>
</modules>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>

<artifactId>registration-processor-external-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-osi-validator-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-packet-classifier-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<parent>
<groupId>io.mosip.registrationprocessor</groupId>
<artifactId>pre-processor</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
</parent>
<artifactId>registration-processor-packet-validator-stage</artifactId>
<version>1.1.5.5</version>
<version>1.1.5.5-p1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
Loading

0 comments on commit 0e0a444

Please sign in to comment.