diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index f1aa902f81d..3f1c43bf98b 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -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) diff --git a/pom.xml b/pom.xml index 128c476520e..ea54dab968a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip registration - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT pom MOSIP Registration Parent POM diff --git a/registration-processor/core-processor/pom.xml b/registration-processor/core-processor/pom.xml index 216a28f04b2..286e7622c10 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT core-processor core-processor @@ -17,11 +17,11 @@ registration-processor-demo-dedupe-stage registration-processor-bio-dedupe-stage registration-processor-uin-generator-stage - registration-processor-abis - registration-processor-manual-verification-stage - registration-processor-reprocessor-stage + + registration-processor-manual-verification-stage + registration-processor-reprocessor-stage registration-processor-abis-handler-stage registration-processor-abis-middleware-stage registration-processor-biometric-authentication-stage - \ No newline at end of file + 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 3ac2151af71..4c489b8edbb 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-abis-handler-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 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 91a2703e718..b4d6b978be0 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-abis-middleware-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-abis/pom.xml b/registration-processor/core-processor/registration-processor-abis/pom.xml index 379441d2e2a..16c36c40bf1 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-abis - 1.1.5.5 + 1.1.5.5-p1-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 3f2a5dc90ae..e10f38becc6 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-bio-dedupe-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 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 bf93d0a8246..a58ec9f9f76 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-biometric-authentication-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 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 4473def0d7b..6fa2760c25a 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-demo-dedupe-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml b/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml index 454358cd2b4..4b1a47a079c 100644 --- a/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-manual-verification-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 diff --git a/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml b/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml index ee021ab7734..5212e97ee9e 100644 --- a/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-reprocessor-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-reprocessor-stage 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 7a8c7916423..cbff81a8a8f 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-uin-generator-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/init/pom.xml b/registration-processor/init/pom.xml index e1f4b43d311..b63691370f7 100644 --- a/registration-processor/init/pom.xml +++ b/registration-processor/init/pom.xml @@ -6,7 +6,7 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT init @@ -14,6 +14,6 @@ registration-processor-packet-receiver-stage - registration-processor-registration-status-service + registration-processor-registration-status-service 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 df73e669e47..80f8ed09d1e 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-packet-receiver-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-packet-receiver-stage 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 18b03f02d36..7f006548b8c 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-registration-status-service - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-registration-status-service diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index 34c4186aae0..b6f21b3e45a 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -5,12 +5,12 @@ io.mosip registration - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT io.mosip.registrationprocessor registration-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT pom registration-processor @@ -107,10 +107,10 @@ 0.1.55 - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT 1.1.5.5 1.1.5.5 - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT 1.1.5.5 1.1.5.5 1.1.5.5 @@ -310,15 +310,15 @@ - registration-processor-core + registration-processor-rest-client - registration-processor-packet-manager + registration-processor-common-camel-bridge - registration-processor-bio-dedupe-service-impl - registration-processor-info-storage-service + registration-processor-registration-status-service-impl - registration-processor-message-sender-impl + init pre-processor core-processor diff --git a/registration-processor/post-processor/pom.xml b/registration-processor/post-processor/pom.xml index 2a0de01bcc4..f209d35b147 100644 --- a/registration-processor/post-processor/pom.xml +++ b/registration-processor/post-processor/pom.xml @@ -6,9 +6,9 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT post-processor post-processor @@ -17,6 +17,6 @@ registration-processor-message-sender-stage registration-processor-printing-stage - registration-processor-registration-transaction-service + 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 7ff36644b41..52786374083 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-message-sender-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/post-processor/registration-processor-printing-stage/pom.xml b/registration-processor/post-processor/registration-processor-printing-stage/pom.xml index 34eb59c5e00..ead6d504fa0 100644 --- a/registration-processor/post-processor/registration-processor-printing-stage/pom.xml +++ b/registration-processor/post-processor/registration-processor-printing-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor post-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-printing-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/pre-processor/pom.xml b/registration-processor/pre-processor/pom.xml index 651f02a45db..fb5b3211e8c 100644 --- a/registration-processor/pre-processor/pom.xml +++ b/registration-processor/pre-processor/pom.xml @@ -7,22 +7,22 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT pre-processor pre-processor UTF-8 - registration-processor-packet-validator-stage + registration-processor-packet-validator-stage registration-processor-osi-validator-stage registration-processor-packet-uploader-stage registration-processor-external-stage - registration-processor-external-integration-service + registration-processor-quality-checker-stage registration-processor-securezone-notification-stage - registration-processor-packet-classifier-stage + registration-processor-packet-classifier-stage diff --git a/registration-processor/pre-processor/registration-processor-external-stage/pom.xml b/registration-processor/pre-processor/registration-processor-external-stage/pom.xml index 4e70cb1f460..be6110e769c 100644 --- a/registration-processor/pre-processor/registration-processor-external-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-external-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-external-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml index 920c243caf4..856d9875fbe 100644 --- a/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-osi-validator-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 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 64bac1817c1..f4a4dbac2f8 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-packet-classifier-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 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 9d2cf59fbdf..e3564ee9874 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT - 1.1.5.5 + 1.1.5.5-p1-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 515d27f22a0..f13db29c435 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-packet-validator-stage - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml b/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml index 47ebb74f89d..44881975db7 100644 --- a/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-quality-checker-stage - 1.1.5.5 + 1.1.5.5-p1-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 75977399619..c8bdab15350 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT 4.0.0 - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-securezone-notification-stage diff --git a/registration-processor/registration-processor-common-camel-bridge/pom.xml b/registration-processor/registration-processor-common-camel-bridge/pom.xml index a1ee5ce051f..7f83ad30293 100644 --- a/registration-processor/registration-processor-common-camel-bridge/pom.xml +++ b/registration-processor/registration-processor-common-camel-bridge/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-common-camel-bridge - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT jar 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 180356dad28..014c5289af3 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.1.5.5 + 1.1.5.5-p1-SNAPSHOT registration-processor-registration-status-service-impl - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-rest-client/pom.xml b/registration-processor/registration-processor-rest-client/pom.xml index a6e5ac11b6b..683d98ec7aa 100644 --- a/registration-processor/registration-processor-rest-client/pom.xml +++ b/registration-processor/registration-processor-rest-client/pom.xml @@ -14,7 +14,7 @@ registration-processor-rest-client registration-processor-rest-client - 1.1.5.5 + 1.1.5.5-p1-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-rest-client/src/main/java/io/mosip/registration/processor/rest/client/utils/RestApiClient.java b/registration-processor/registration-processor-rest-client/src/main/java/io/mosip/registration/processor/rest/client/utils/RestApiClient.java index f862a7e20b3..6aab0a64d77 100644 --- a/registration-processor/registration-processor-rest-client/src/main/java/io/mosip/registration/processor/rest/client/utils/RestApiClient.java +++ b/registration-processor/registration-processor-rest-client/src/main/java/io/mosip/registration/processor/rest/client/utils/RestApiClient.java @@ -5,28 +5,22 @@ import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; -import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Iterator; import javax.annotation.PostConstruct; -import javax.net.ssl.SSLContext; -import io.mosip.registration.processor.core.tracing.ContextualData; -import io.mosip.registration.processor.core.tracing.TracingConstant; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; -import org.apache.http.ssl.TrustStrategy; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.core.env.Environment; import org.springframework.http.HttpEntity; @@ -49,6 +43,8 @@ import io.mosip.kernel.core.util.TokenHandlerUtil; import io.mosip.registration.processor.core.constant.LoggerFileConstant; import io.mosip.registration.processor.core.logger.RegProcessorLogger; +import io.mosip.registration.processor.core.tracing.ContextualData; +import io.mosip.registration.processor.core.tracing.TracingConstant; import io.mosip.registration.processor.rest.client.audit.dto.Metadata; import io.mosip.registration.processor.rest.client.audit.dto.PasswordRequest; import io.mosip.registration.processor.rest.client.audit.dto.SecretKeyRequest; @@ -62,6 +58,12 @@ */ @Component public class RestApiClient { + + @Value("${registration.processor.httpclient.connections.max.per.host:20}") + private int maxConnectionPerRoute; + + @Value("${registration.processor.httpclient.connections.max:100}") + private int totalMaxConnection; /** The logger. */ private final Logger logger = RegProcessorLogger.getLogger(RestApiClient.class); @@ -225,18 +227,11 @@ public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgor Arrays.asList(environment.getActiveProfiles()).toString()); return new RestTemplate(); } else { - TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true; - - SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom() - .loadTrustMaterial(null, acceptingTrustStrategy).build(); - - SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext); - - CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build(); - + HttpClientBuilder httpClientBuilder = HttpClients.custom() + .setMaxConnPerRoute(maxConnectionPerRoute) + .setMaxConnTotal(totalMaxConnection).disableCookieManagement(); HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(); - - requestFactory.setHttpClient(httpClient); + requestFactory.setHttpClient(httpClientBuilder.build()); return new RestTemplate(requestFactory); }