From 93699b807c0c2fc85615212dbf75b134e9a48694 Mon Sep 17 00:00:00 2001 From: Sowmya Ujjappa Banakar Date: Fri, 19 Apr 2024 12:02:57 +0530 Subject: [PATCH 1/4] MOSIP-32461 intial changes of kernel modules Signed-off-by: Sowmya Ujjappa Banakar --- kernel/kernel-ref-idobjectvalidator/pom.xml | 213 +++--- .../impl/IdObjectReferenceValidator.java | 2 +- .../kernel-smsserviceprovider-msg91/pom.xml | 588 ++++++---------- .../msg91/exception/ApiExceptionHandler.java | 2 +- .../msg91/test/SmsServiceProviderTest.java | 226 +++--- kernel/kernel-virusscanner-clamav/pom.xml | 97 +-- kernel/pom.xml | 649 ++++++++---------- 7 files changed, 708 insertions(+), 1069 deletions(-) diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml index fc567704211..aa5ec4f8f86 100644 --- a/kernel/kernel-ref-idobjectvalidator/pom.xml +++ b/kernel/kernel-ref-idobjectvalidator/pom.xml @@ -1,111 +1,102 @@ - - 4.0.0 - - io.mosip.kernel - kernel-ref-parent - 1.2.1-SNAPSHOT - - - kernel-ref-idobjectvalidator - kernel-ref-idobjectvalidator - 1.2.1-SNAPSHOT - - - 1.2.1-SNAPSHOT - 11 - 11 - 3.8.0 - 2.0.8.RELEASE - 1.2.1-SNAPSHOT - - - - org.mockito - mockito-core - 3.4.6 - test - - - net.bytebuddy - byte-buddy - 1.10.13 - - - io.mosip.kernel - kernel-core - ${kernel-core.version} - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - org.springframework.cloud - spring-cloud-starter-config - ${spring-cloud-config.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.datatype.version} - - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - io.mosip.kernel - kernel-logger-logback - ${kernel-logger-logback.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.12.0 - - - com.fasterxml.jackson.core - jackson-annotations - 2.12.0 - - - com.fasterxml.jackson.core - jackson-core - 2.12.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.12.0 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - ZIP - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - + + 4.0.0 + + io.mosip.kernel + kernel-ref-parent + 1.2.1-java21-SNAPSHOT + + + kernel-ref-idobjectvalidator + kernel-ref-idobjectvalidator + 1.2.1-java21-SNAPSHOT + + + 1.2.1-java21-SNAPSHOT + + + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import + + + + + + org.mockito + mockito-core + test + + + net.bytebuddy + byte-buddy + + + io.mosip.kernel + kernel-core + ${kernel-core.version} + + + org.apache.commons + commons-collections4 + + + org.springframework.cloud + spring-cloud-starter-config + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + + + org.springframework.boot + spring-boot-starter-web + + + io.mosip.kernel + kernel-logger-logback + ${kernel-logger-logback.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + ZIP + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + diff --git a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java index fdb05e4572c..1d06e3fe523 100644 --- a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java +++ b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.commons.collections4.SetValuedMap; import org.apache.commons.collections4.multimap.HashSetValuedHashMap; diff --git a/kernel/kernel-smsserviceprovider-msg91/pom.xml b/kernel/kernel-smsserviceprovider-msg91/pom.xml index 0999b265f0c..2caee9baa7c 100644 --- a/kernel/kernel-smsserviceprovider-msg91/pom.xml +++ b/kernel/kernel-smsserviceprovider-msg91/pom.xml @@ -1,393 +1,195 @@ - - 4.0.0 -io.mosip.kernel - kernel-smsserviceprovider-msg91 - kernel-smsserviceprovider-msg91 - kernel-smsserviceprovider-msg91 - https://github.com/mosip/commons - 1.2.1-SNAPSHOT - - UTF-8 - - - 11 - 11 - 3.8.0 - 2.22.0 - - 3.0.2 - 3.1.0 - 0.8.1 - 3.7.0.1746 - 3.2.0 - 2.3 - - - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.4.RELEASE - - - 2.0.7 - 1.5.21 - 2.9.2 - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.2 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 - - - 1.2.3 - 1.7.19 - 1.7.7 - 1.7.25 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.18.8 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.66 - 63.1 - 1.0.0 - 3.3.3 - 3.1.0 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - 1.8.12 - 1.4.2 - 1.4.2 - UTF-8 - - - 11 - 11 - 3.8.0 - 2.22.0 - - 3.0.2 - 3.1.0 - 0.8.1 - 3.7.0.1746 - 3.2.0 - 2.3 - - - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.4.RELEASE - - - 2.0.7 - 1.5.21 - 2.9.2 - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.2 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 - - - 1.2.3 - 1.7.19 - 1.7.7 - 1.7.25 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.18.8 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.66 - 63.1 - 1.0.0 - 3.3.3 - 3.1.0 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - 1.8.12 - 1.4.2 - 1.4.2 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - - - - - io.mosip.kernel - kernel-core - ${kernel.core.version} - - - io.mosip.kernel - kernel-auth-adapter - ${kernel.auth.adaptor.version} - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - src/main/resources - - bootstrap.properties - - - - - - maven-deploy-plugin - 2.8.1 - - - default-deploy - deploy - - deploy - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-source-plugin - true - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - - - none - false - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - - - - - scm:git:git://github.com/mosip/commons.git - scm:git:ssh://github.com:mosip/commons.git - https://github.com/mosip/commons - HEAD - - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/commons - - - - + + 4.0.0 +io.mosip.kernel + kernel-smsserviceprovider-msg91 + kernel-smsserviceprovider-msg91 + kernel-smsserviceprovider-msg91 + https://github.com/mosip/commons + 1.2.1-java21-SNAPSHOT + + UTF-8 + + + 21 + 21 + 3.8.0 + 3.2.0 + 2.8.1 + 2.2.1 + 1.5 + 1.6.7 + 3.0.1 + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + + + + + io.mosip.kernel + kernel-core + ${kernel.core.version} + + + io.mosip.kernel + kernel-auth-adapter + ${kernel.auth.adaptor.version} + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + src/main/resources + + bootstrap.properties + + + + + + maven-deploy-plugin + ${maven.deploy.plugin.version} + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.plugin.version} + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-source-plugin + true + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + attach-javadocs + + jar + + + + + none + false + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.plugin.version} + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + + + + scm:git:git://github.com/mosip/commons.git + scm:git:ssh://github.com:mosip/commons.git + https://github.com/mosip/commons + HEAD + + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/commons + + + + diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java index 5c1e4462d04..7cbdb3647c5 100644 --- a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; diff --git a/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java index a4f769e141e..94f9373f9d2 100644 --- a/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java +++ b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java @@ -1,114 +1,114 @@ -package io.mosip.kernel.smsserviceprovider.msg91.test; - -import static org.mockito.Mockito.when; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.util.UriComponentsBuilder; - -import io.mosip.kernel.core.notification.exception.InvalidNumberException; -import io.mosip.kernel.core.notification.model.SMSResponseDto; -import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsPropertyConstant; -import io.mosip.kernel.smsserviceprovider.msg91.dto.SmsServerResponseDto; -import io.mosip.kernel.smsserviceprovider.msg91.impl.SMSServiceProviderImpl; - -@RunWith(SpringRunner.class) -@ContextConfiguration(classes = { ConfigFileApplicationContextInitializer.class, SmsServiceProviderTest.config.class, - SMSServiceProviderImpl.class }) -public class SmsServiceProviderTest { - - @Configuration - static class config { - - @Bean - public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer(); - propertySourcesPlaceholderConfigurer.setLocations(new ClassPathResource("application.properties")); - return propertySourcesPlaceholderConfigurer; - } - } - - @Autowired - SMSServiceProviderImpl service; - - @MockBean - RestTemplate restTemplate; - - @Value("${mosip.kernel.sms.api}") - String api; - - @Value("${mosip.kernel.sms.authkey}") - String authkey; - - @Value("${mosip.kernel.sms.country.code}") - String countryCode; - - @Value("${mosip.kernel.sms.sender}") - String senderId; - - @Value("${mosip.kernel.sms.route}") - String route; - - @Test - public void sendSmsTest() { - - UriComponentsBuilder sms = UriComponentsBuilder.fromHttpUrl(api) - .queryParam(SmsPropertyConstant.AUTH_KEY.getProperty(), authkey) - .queryParam(SmsPropertyConstant.SMS_MESSAGE.getProperty(), "your otp is 4646") - .queryParam(SmsPropertyConstant.ROUTE.getProperty(), route) - .queryParam(SmsPropertyConstant.SENDER_ID.getProperty(), senderId) - .queryParam(SmsPropertyConstant.RECIPIENT_NUMBER.getProperty(), "8987876473") - .queryParam(SmsPropertyConstant.COUNTRY_CODE.getProperty(), countryCode); - - SmsServerResponseDto serverResponse = new SmsServerResponseDto(); - serverResponse.setType("success"); - SMSResponseDto dto = new SMSResponseDto(); - dto.setStatus(serverResponse.getType()); - dto.setMessage("Sms Request Sent"); - - when(restTemplate.getForEntity(sms.toUriString(), String.class)) - .thenReturn(new ResponseEntity<>(serverResponse.toString(), HttpStatus.OK)); - - when(restTemplate.postForEntity(Mockito.anyString(), Mockito.eq(Mockito.any()), Object.class)) - .thenReturn(new ResponseEntity<>(serverResponse, HttpStatus.OK)); - - // assertThat(service.sendSms("8987876473", "your otp is 4646"), - // is(dto)); - - } - - @Test(expected = InvalidNumberException.class) - public void invalidContactNumberTest() { - service.sendSms("jsbchb", "hello your otp is 45373"); - } - - @Test(expected = InvalidNumberException.class) - public void contactNumberMinimumThresholdTest() { - service.sendSms("78978976", "hello your otp is 45373"); - } - - @Test(expected = InvalidNumberException.class) - public void contactNumberMaximumThresholdTest() { - service.sendSms("7897897458673484376", "hello your otp is 45373"); - } - - @Test - public void validGateWayTest() { - service.sendSms("1234567890", "hello your otp is 45373"); - } - +package io.mosip.kernel.smsserviceprovider.msg91.test; + +import static org.mockito.Mockito.when; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.core.io.ClassPathResource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import io.mosip.kernel.core.notification.exception.InvalidNumberException; +import io.mosip.kernel.core.notification.model.SMSResponseDto; +import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsPropertyConstant; +import io.mosip.kernel.smsserviceprovider.msg91.dto.SmsServerResponseDto; +import io.mosip.kernel.smsserviceprovider.msg91.impl.SMSServiceProviderImpl; + +@RunWith(SpringRunner.class) +@ContextConfiguration(classes = { ConfigDataApplicationContextInitializer.class, SmsServiceProviderTest.config.class, + SMSServiceProviderImpl.class }) +public class SmsServiceProviderTest { + + @Configuration + static class config { + + @Bean + public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer(); + propertySourcesPlaceholderConfigurer.setLocations(new ClassPathResource("application.properties")); + return propertySourcesPlaceholderConfigurer; + } + } + + @Autowired + SMSServiceProviderImpl service; + + @MockBean + RestTemplate restTemplate; + + @Value("${mosip.kernel.sms.api}") + String api; + + @Value("${mosip.kernel.sms.authkey}") + String authkey; + + @Value("${mosip.kernel.sms.country.code}") + String countryCode; + + @Value("${mosip.kernel.sms.sender}") + String senderId; + + @Value("${mosip.kernel.sms.route}") + String route; + + @Test + public void sendSmsTest() { + + UriComponentsBuilder sms = UriComponentsBuilder.fromHttpUrl(api) + .queryParam(SmsPropertyConstant.AUTH_KEY.getProperty(), authkey) + .queryParam(SmsPropertyConstant.SMS_MESSAGE.getProperty(), "your otp is 4646") + .queryParam(SmsPropertyConstant.ROUTE.getProperty(), route) + .queryParam(SmsPropertyConstant.SENDER_ID.getProperty(), senderId) + .queryParam(SmsPropertyConstant.RECIPIENT_NUMBER.getProperty(), "8987876473") + .queryParam(SmsPropertyConstant.COUNTRY_CODE.getProperty(), countryCode); + + SmsServerResponseDto serverResponse = new SmsServerResponseDto(); + serverResponse.setType("success"); + SMSResponseDto dto = new SMSResponseDto(); + dto.setStatus(serverResponse.getType()); + dto.setMessage("Sms Request Sent"); + + when(restTemplate.getForEntity(sms.toUriString(), String.class)) + .thenReturn(new ResponseEntity<>(serverResponse.toString(), HttpStatus.OK)); + + when(restTemplate.postForEntity(Mockito.anyString(), Mockito.eq(Mockito.any()), Object.class)) + .thenReturn(new ResponseEntity<>(serverResponse, HttpStatus.OK)); + + // assertThat(service.sendSms("8987876473", "your otp is 4646"), + // is(dto)); + + } + + @Test(expected = InvalidNumberException.class) + public void invalidContactNumberTest() { + service.sendSms("jsbchb", "hello your otp is 45373"); + } + + @Test(expected = InvalidNumberException.class) + public void contactNumberMinimumThresholdTest() { + service.sendSms("78978976", "hello your otp is 45373"); + } + + @Test(expected = InvalidNumberException.class) + public void contactNumberMaximumThresholdTest() { + service.sendSms("7897897458673484376", "hello your otp is 45373"); + } + + @Test + public void validGateWayTest() { + service.sendSms("1234567890", "hello your otp is 45373"); + } + } \ No newline at end of file diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml index b88ccfc931b..e27b380f6ed 100644 --- a/kernel/kernel-virusscanner-clamav/pom.xml +++ b/kernel/kernel-virusscanner-clamav/pom.xml @@ -6,26 +6,21 @@ io.mosip.kernel kernel-ref-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT kernel-virusscanner-clamav - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT - 1.2.1-SNAPSHOT - 11 - 11 - 3.8.0 3.3.0 - 0.8.5 - 3.7.0.1746 + 1.0.4 io.mosip.kernel kernel-core - ${kernel.core.version} + ${kernel-core.version} com.fasterxml.jackson.datatype @@ -37,7 +32,7 @@ xyz.capybara clamav-client - 1.0.4 + ${clamav.client.version} @@ -67,7 +62,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + ${nexus.staging.plugin.version} true @@ -89,7 +84,7 @@ org.apache.maven.plugins maven-source-plugin true - 2.2.1 + ${maven.source.plugin.version} attach-sources @@ -112,7 +107,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.plugin.version} attach-javadocs @@ -129,7 +124,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + ${maven.gpg.plugin.version} sign-artifacts @@ -149,7 +144,7 @@ pl.project13.maven git-commit-id-plugin - 3.0.1 + ${git.commit.plugin.version} get-the-git-infos @@ -171,55 +166,10 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - false - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - org.jacoco jacoco-maven-plugin - ${maven.jacoco.version} + ${maven.jacoco.plugin.version} **/constant/** @@ -244,31 +194,6 @@ - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/kernel/pom.xml b/kernel/pom.xml index 51764ebfb2b..d321b275606 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,364 +1,285 @@ - - - 4.0.0 - io.mosip.kernel - kernel-ref-parent - 1.2.1-SNAPSHOT - pom - kernel - Parent project of MOSIP Kernel Referernce Implementation components - https://github.com/mosip/mosip-ref-impl - - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - - - - scm:git:git://github.com/mosip/mosip-ref-impl.git - scm:git:ssh://github.com:mosip/mosip-ref-impl.git - https://github.com/mosip/mosip-ref-impl - HEAD - - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/mosip-ref-impl - - - - - - ossrh - Central Repository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - UTF-8 - - - 11 - 11 - 3.8.0 - 3.0.2 - 3.1.0 - 2.22.0 - 0.8.5 - 3.7.0.1746 - 3.2.0 - 2.3 - - - - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.0.RELEASE - - 2.0.7 - 1.5.20 - 2.9.2 - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.2 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.12 - 1.10.19 - 1.7.4 - 2.0.0-beta.5 - - - 1.2.3 - 1.7.19 - 1.7.7 - 1.7.25 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - - - 1.2.1-SNAPSHOT - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.16.18 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.60 - 63.1 - 1.0.0 - 3.3.3 - 2.8.1 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - - **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/** - **/dto/**,**/entity/**,**/config/** - - - - kernel-ref-idobjectvalidator - kernel-virusscanner-clamav - kernel-smsserviceprovider-msg91 - - - - - org.slf4j - jul-to-slf4j - ${jcl.to.slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${jcl.to.slf4j.version} - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - ${skipTests} - false - - ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit - - - - - org.jacoco - jacoco-maven-plugin - ${maven.jacoco.plugin.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.version} - - - attach-javadocs - - jar - - - - - true - none - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - - - - - - sonar - - . - src/main/java/**,src/main/resources/** - ${sonar.coverage.exclusions} - https://sonarcloud.io - - - false - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${maven.sonar.plugin.version} - - - verify - - sonar - - - - - - - - - + + + 4.0.0 + io.mosip.kernel + kernel-ref-parent + 1.2.1-java21-SNAPSHOT + pom + kernel + Parent project of MOSIP Kernel Referernce Implementation components + https://github.com/mosip/mosip-ref-impl + + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + + + scm:git:git://github.com/mosip/mosip-ref-impl.git + scm:git:ssh://github.com:mosip/mosip-ref-impl.git + https://github.com/mosip/mosip-ref-impl + HEAD + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/mosip-ref-impl + + + + + + ossrh + Central Repository + https://oss.sonatype.org/content/repositories/snapshots + default + + true + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + UTF-8 + + + 21 + 21 + 3.8.0 + 3.0.2 + 3.1.0 + 2.22.0 + 0.8.11 + 3.7.0.1746 + 3.2.0 + 2.3 + 2.8.1 + 2.2.1 + 1.5 + 1.6.7 + 3.0.1 + + + 1.7.25 + + 1.2.1-java21-SNAPSHOT + + **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/** + **/dto/**,**/entity/**,**/config/** + + + + kernel-ref-idobjectvalidator + kernel-virusscanner-clamav + kernel-smsserviceprovider-msg91 + + + + + org.slf4j + jul-to-slf4j + ${jcl.to.slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${jcl.to.slf4j.version} + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + ${skipTests} + false + + ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit + + + + + org.jacoco + jacoco-maven-plugin + ${maven.jacoco.plugin.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.plugin.version} + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + attach-javadocs + + jar + + + + + true + none + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.plugin.version} + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + + + + + sonar + + . + src/main/java/**,src/main/resources/** + ${sonar.coverage.exclusions} + https://sonarcloud.io + + + false + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${maven.sonar.plugin.version} + + + verify + + sonar + + + + + + + + + From cd98687e23fbb6230a1b668cf368b45be3d49d4d Mon Sep 17 00:00:00 2001 From: Sowmya Ujjappa Banakar Date: Fri, 19 Apr 2024 14:08:28 +0530 Subject: [PATCH 2/4] MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar --- kernel/kernel-ref-idobjectvalidator/pom.xml | 4 + .../kernel-smsserviceprovider-msg91/pom.xml | 7 + kernel/kernel-virusscanner-clamav/pom.xml | 429 +++++++++--------- kernel/pom.xml | 2 + 4 files changed, 230 insertions(+), 212 deletions(-) diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml index aa5ec4f8f86..cca3c7cf074 100644 --- a/kernel/kernel-ref-idobjectvalidator/pom.xml +++ b/kernel/kernel-ref-idobjectvalidator/pom.xml @@ -77,6 +77,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 + + org.junit.vintage + junit-vintage-engine + diff --git a/kernel/kernel-smsserviceprovider-msg91/pom.xml b/kernel/kernel-smsserviceprovider-msg91/pom.xml index 2caee9baa7c..b0d7c837a4a 100644 --- a/kernel/kernel-smsserviceprovider-msg91/pom.xml +++ b/kernel/kernel-smsserviceprovider-msg91/pom.xml @@ -23,6 +23,7 @@ 3.0.1 1.2.1-java21-SNAPSHOT 1.2.1-java21-SNAPSHOT + 5.10.2 @@ -36,6 +37,12 @@ kernel-auth-adapter ${kernel.auth.adaptor.version} + + org.junit.vintage + junit-vintage-engine + ${junit.vintage.version} + + diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml index e27b380f6ed..d6c09a55c9f 100644 --- a/kernel/kernel-virusscanner-clamav/pom.xml +++ b/kernel/kernel-virusscanner-clamav/pom.xml @@ -1,212 +1,217 @@ - - 4.0.0 - io.mosip.kernel - - io.mosip.kernel - kernel-ref-parent - 1.2.1-java21-SNAPSHOT - - - kernel-virusscanner-clamav - 1.2.1-java21-SNAPSHOT - - 3.3.0 - 1.0.4 - - - - - io.mosip.kernel - kernel-core - ${kernel-core.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - - - xyz.capybara - clamav-client - ${clamav.client.version} - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - - jar-with-dependencies - - false - - - - make-assembly - package - - single - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-source-plugin - true - ${maven.source.plugin.version} - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - attach-javadocs - - jar - - - - - none - src/main/java - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - ${git.commit.plugin.version} - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - - - org.jacoco - jacoco-maven-plugin - ${maven.jacoco.plugin.version} - - - **/constant/** - **/config/** - **/dto/** - io/mosip/authentication/service/*.class - io/mosip/authentication/service/filter/** - - - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - ${skipTests} - false - - ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit - - - - - - - + + 4.0.0 + io.mosip.kernel + + io.mosip.kernel + kernel-ref-parent + 1.2.1-java21-SNAPSHOT + + + kernel-virusscanner-clamav + 1.2.1-java21-SNAPSHOT + + 3.3.0 + 1.0.4 + + + + + io.mosip.kernel + kernel-core + ${kernel-core.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + + xyz.capybara + clamav-client + ${clamav.client.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.vintage.version} + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + jar-with-dependencies + + false + + + + make-assembly + package + + single + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.plugin.version} + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-source-plugin + true + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + attach-javadocs + + jar + + + + + none + src/main/java + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.plugin.version} + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + + org.jacoco + jacoco-maven-plugin + ${maven.jacoco.plugin.version} + + + **/constant/** + **/config/** + **/dto/** + io/mosip/authentication/service/*.class + io/mosip/authentication/service/filter/** + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + ${skipTests} + false + + ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit + + + + + + + diff --git a/kernel/pom.xml b/kernel/pom.xml index d321b275606..16b7ba9355a 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -80,6 +80,8 @@ 1.2.1-java21-SNAPSHOT + 5.10.2 + **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/** **/dto/**,**/entity/**,**/config/** From c6a49896fd8e5f530ecbfce4683e10af0ae1b6b9 Mon Sep 17 00:00:00 2001 From: Sowmya Ujjappa Banakar Date: Fri, 19 Apr 2024 15:21:44 +0530 Subject: [PATCH 3/4] MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar --- .github/workflows/push-trigger.yml | 502 ++++++++++---------- kernel/kernel-ref-idobjectvalidator/pom.xml | 3 + kernel/kernel-virusscanner-clamav/pom.xml | 5 +- 3 files changed, 258 insertions(+), 252 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index b082eada133..635c9b4e39f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -1,251 +1,251 @@ -name: Maven Package upon a push - -on: - release: - types: [published] - pull_request: - types: [opened, reopened, synchronize] - workflow_dispatch: - inputs: - message: - description: 'Message for manually triggering' - required: false - default: 'Triggered for Updates' - type: string - push: - branches: - - '!release-branch' - - release* - - master - - 1.* - - develop - - MOSIP* - -jobs: - build-maven-kernel: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: kernel - BUILD_ARTIFACT: kernel - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - publish_to_nexus_kernel: - if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" - needs: build-maven-kernel - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master - with: - SERVICE_LOCATION: kernel - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - sonar_analysis_kernel: - needs: build-maven-kernel - if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master - with: - SERVICE_LOCATION: kernel - PROJECT_KEY: mosip_kernel-ref-idobjectvalidator - secrets: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - ORG_KEY: ${{ secrets.ORG_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build-maven-pre-registration-booking-service: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: pre-registration-booking-service - BUILD_ARTIFACT: pre-registration-booking-service - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build-dockers-pre-registration-booking-service: - needs: build-maven-pre-registration-booking-service - strategy: - matrix: - include: - - SERVICE_LOCATION: 'pre-registration-booking-service' - SERVICE_NAME: 'pre-registration-booking-service' - BUILD_ARTIFACT: 'pre-registration-booking-service' - fail-fast: false - name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master - with: - SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} - SERVICE_NAME: ${{ matrix.SERVICE_NAME }} - BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} - secrets: - DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} - ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} - RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - publish_to_nexus_pre-registration-booking-service: - if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" - needs: build-maven-pre-registration-booking-service - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master - with: - SERVICE_LOCATION: pre-registration-booking-service - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - sonar_analysis: - needs: build-maven-pre-registration-booking-service - if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master - with: - SERVICE_LOCATION: pre-registration-booking-service - PROJECT_KEY: mosip_pre-registration-booking-service - secrets: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - ORG_KEY: ${{ secrets.ORG_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - build-maven-registration-processor-external-stage: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: registration-processor/registration-processor-external-stage - BUILD_ARTIFACT: registration-processor-external-stage - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - build-dockers-registration-processor-external-stage: - needs: build-maven-registration-processor-external-stage - strategy: - matrix: - include: - - SERVICE_LOCATION: 'registration-processor/registration-processor-external-stage' - SERVICE_NAME: 'registration-processor-external-stage' - BUILD_ARTIFACT: 'registration-processor-external-stage' - fail-fast: false - name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master - with: - SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} - SERVICE_NAME: ${{ matrix.SERVICE_NAME }} - BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} - secrets: - DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} - ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} - RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build-maven-registration-processor-external-integration-service: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: registration-processor/registration-processor-external-integration-service - BUILD_ARTIFACT: registration-processor-external-integration-service - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - build-dockers-registration-processor-external-integration-service: - needs: build-maven-registration-processor-external-integration-service - strategy: - matrix: - include: - - SERVICE_LOCATION: 'registration-processor/registration-processor-external-integration-service' - SERVICE_NAME: 'registration-processor-external-integration-service' - BUILD_ARTIFACT: 'registration-processor-external-integration-service' - fail-fast: false - name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master - with: - SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} - SERVICE_NAME: ${{ matrix.SERVICE_NAME }} - BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} - secrets: - DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} - ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} - RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build-maven-cache-provider-hazelcast: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: cache-provider-hazelcast - BUILD_ARTIFACT: cache-provider-hazelcast - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - publish_to_nexus_cache-provider-hazelcast: - if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" - needs: build-maven-cache-provider-hazelcast - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master - with: - SERVICE_LOCATION: cache-provider-hazelcast - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build-maven-authentication-ref-impl: - uses: mosip/kattu/.github/workflows/maven-build.yml@master - with: - SERVICE_LOCATION: authentication - BUILD_ARTIFACT: authentication - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - publish_to_nexus_authentication-ref-impl: - if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" - needs: build-maven-authentication-ref-impl - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master - with: - SERVICE_LOCATION: authentication - secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - sonar_analysis_authentication-ref-impl: - needs: build-maven-authentication-ref-impl - if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master - with: - SERVICE_LOCATION: authentication - PROJECT_KEY: mosip_biosdk-client - secrets: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - ORG_KEY: ${{ secrets.ORG_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} +name: Maven Package upon a push + +on: + release: + types: [published] + pull_request: + types: [opened, reopened, synchronize] + workflow_dispatch: + inputs: + message: + description: 'Message for manually triggering' + required: false + default: 'Triggered for Updates' + type: string + push: + branches: + - '!release-branch' + - release* + - master + - 1.* + - develop* + - MOSIP* + +jobs: + build-maven-kernel: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: kernel + BUILD_ARTIFACT: kernel + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + publish_to_nexus_kernel: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" + needs: build-maven-kernel + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: kernel + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + sonar_analysis_kernel: + needs: build-maven-kernel + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: kernel + PROJECT_KEY: mosip_kernel-ref-idobjectvalidator + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-pre-registration-booking-service: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: pre-registration-booking-service + BUILD_ARTIFACT: pre-registration-booking-service + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-dockers-pre-registration-booking-service: + needs: build-maven-pre-registration-booking-service + strategy: + matrix: + include: + - SERVICE_LOCATION: 'pre-registration-booking-service' + SERVICE_NAME: 'pre-registration-booking-service' + BUILD_ARTIFACT: 'pre-registration-booking-service' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + publish_to_nexus_pre-registration-booking-service: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-pre-registration-booking-service + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: pre-registration-booking-service + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + sonar_analysis: + needs: build-maven-pre-registration-booking-service + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: pre-registration-booking-service + PROJECT_KEY: mosip_pre-registration-booking-service + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-maven-registration-processor-external-stage: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: registration-processor/registration-processor-external-stage + BUILD_ARTIFACT: registration-processor-external-stage + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-dockers-registration-processor-external-stage: + needs: build-maven-registration-processor-external-stage + strategy: + matrix: + include: + - SERVICE_LOCATION: 'registration-processor/registration-processor-external-stage' + SERVICE_NAME: 'registration-processor-external-stage' + BUILD_ARTIFACT: 'registration-processor-external-stage' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-registration-processor-external-integration-service: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: registration-processor/registration-processor-external-integration-service + BUILD_ARTIFACT: registration-processor-external-integration-service + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-dockers-registration-processor-external-integration-service: + needs: build-maven-registration-processor-external-integration-service + strategy: + matrix: + include: + - SERVICE_LOCATION: 'registration-processor/registration-processor-external-integration-service' + SERVICE_NAME: 'registration-processor-external-integration-service' + BUILD_ARTIFACT: 'registration-processor-external-integration-service' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-cache-provider-hazelcast: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: cache-provider-hazelcast + BUILD_ARTIFACT: cache-provider-hazelcast + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + publish_to_nexus_cache-provider-hazelcast: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-cache-provider-hazelcast + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: cache-provider-hazelcast + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-authentication-ref-impl: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: authentication + BUILD_ARTIFACT: authentication + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + publish_to_nexus_authentication-ref-impl: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-authentication-ref-impl + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: authentication + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + sonar_analysis_authentication-ref-impl: + needs: build-maven-authentication-ref-impl + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: authentication + PROJECT_KEY: mosip_biosdk-client + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml index cca3c7cf074..57c42816397 100644 --- a/kernel/kernel-ref-idobjectvalidator/pom.xml +++ b/kernel/kernel-ref-idobjectvalidator/pom.xml @@ -12,6 +12,9 @@ 1.2.1-java21-SNAPSHOT + 21 + 21 + 3.8.0 1.2.1-java21-SNAPSHOT diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml index d6c09a55c9f..fdfef677e89 100644 --- a/kernel/kernel-virusscanner-clamav/pom.xml +++ b/kernel/kernel-virusscanner-clamav/pom.xml @@ -11,7 +11,10 @@ kernel-virusscanner-clamav 1.2.1-java21-SNAPSHOT - + + 21 + 21 + 3.8.0 3.3.0 1.0.4 From f1c1f9970d9675a81daae12f193d796e94126625 Mon Sep 17 00:00:00 2001 From: Sowmya Ujjappa Banakar Date: Fri, 19 Apr 2024 15:46:35 +0530 Subject: [PATCH 4/4] MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar --- .github/workflows/push-trigger.yml | 6 +++--- kernel/kernel-ref-idobjectvalidator/pom.xml | 3 --- kernel/kernel-virusscanner-clamav/pom.xml | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 635c9b4e39f..e05ac3fc4ec 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -23,7 +23,7 @@ on: jobs: build-maven-kernel: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: kernel BUILD_ARTIFACT: kernel @@ -36,7 +36,7 @@ jobs: publish_to_nexus_kernel: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-kernel - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: kernel secrets: @@ -49,7 +49,7 @@ jobs: sonar_analysis_kernel: needs: build-maven-kernel if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: kernel PROJECT_KEY: mosip_kernel-ref-idobjectvalidator diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml index 57c42816397..cca3c7cf074 100644 --- a/kernel/kernel-ref-idobjectvalidator/pom.xml +++ b/kernel/kernel-ref-idobjectvalidator/pom.xml @@ -12,9 +12,6 @@ 1.2.1-java21-SNAPSHOT - 21 - 21 - 3.8.0 1.2.1-java21-SNAPSHOT diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml index fdfef677e89..e3d85122ef0 100644 --- a/kernel/kernel-virusscanner-clamav/pom.xml +++ b/kernel/kernel-virusscanner-clamav/pom.xml @@ -11,10 +11,7 @@ kernel-virusscanner-clamav 1.2.1-java21-SNAPSHOT - - 21 - 21 - 3.8.0 + 3.3.0 1.0.4