diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml index a35abcd875f..f293846990f 100644 --- a/authentication/authentication-authtypelockfilter-impl/pom.xml +++ b/authentication/authentication-authtypelockfilter-impl/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -9,215 +10,33 @@ 1.2.1-java21-SNAPSHOT authentication-authtypelockfilter-impl authentication-authtypelockfilter-impl - ID Authentication Filter Implementation for Auth Type Lock validation + ID Authentication Filter Implementation for Auth Type Lock + validation https://github.com/mosip/commons jar - - UTF-8 + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + - - 21 - 21 - 3.8.0 - - - 3.0.2 - 3.1.0 - - - 3.2.0 - 2.3 - - - 5.0.5.RELEASE - - - 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 - - - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.7 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 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 - - - 21 - 21 - 3.8.0 - - - 3.0.2 - 3.1.0 - - - 3.2.0 - 2.3 - - - 5.0.5.RELEASE - - - 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 - - - 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 - - - org.projectlombok lombok - compile + provided io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -242,17 +61,17 @@ io.mosip.authentication authentication-core - ${authentication-core.version} + ${authentication.core.version} io.mosip.authentication authentication-filter-api - ${authentication-filter-api.version} + ${authentication.filter.api.version} io.mosip.authentication authentication-common - ${authentication-common.version} + ${authentication.common.version} com.fasterxml.jackson.core @@ -267,7 +86,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} org.springframework.boot @@ -286,7 +105,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -339,7 +158,7 @@ io.mosip.kernel kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} + ${kernel.openid.bridge.api.version} com.fasterxml.jackson.core @@ -348,149 +167,148 @@ - + - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - 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 - - + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + maven-deploy-plugin + ${maven.deploy.plugin.version} + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.plugin.version} + 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-source-plugin + true + ${maven.source.plugin.version} + + + attach-sources + + jar-no-fork + + + + - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - - - 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 - - - - - - - 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 - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + attach-javadocs + + jar + + + + + 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.id.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 + + + \ No newline at end of file diff --git a/authentication/authentication-common/pom.xml b/authentication/authentication-common/pom.xml index a6c3c3d7d32..6aac1b875ff 100644 --- a/authentication/authentication-common/pom.xml +++ b/authentication/authentication-common/pom.xml @@ -1,7 +1,8 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 io.mosip.authentication @@ -11,19 +12,34 @@ 1.2.1-java21-SNAPSHOT authentication-common authentication-common - - UTF-8 - + + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + + + org.projectlombok + lombok + provided + io.mosip.authentication authentication-core - ${authentication-core.version} + ${authentication.core.version} io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -40,12 +56,12 @@ io.mosip.authentication authentication-filter-api - ${authentication-filter-api.version} + ${authentication.filter.api.version} io.mosip.kernel kernel-dataaccess-hibernate - ${kernel-dataaccess-hibernate.version} + ${kernel.dataaccess.hibernate.version} com.jayway.jsonpath @@ -58,12 +74,12 @@ io.mosip.kernel kernel-pinvalidator - ${kernel-pinvalidator.version} + ${kernel.pinvalidator.version} io.mosip.idrepository id-repository-core - ${id-repository-core.version} + ${id.repository.core.version} org.springframework.boot @@ -80,7 +96,7 @@ kernel-auth-adapter - + org.springframework.boot @@ -96,13 +112,13 @@ org.springframework.kafka spring-kafka - 2.5.8.RELEASE + io.mosip.kernel kernel-templatemanager-velocity - ${kernel-templatemanager-velocity.version} + ${kernel.templatemanager.velocity.version} javax.servlet @@ -115,42 +131,39 @@ - - javax.xml.parsers - jaxp-api - 1.4.5 - - - org.tensorflow - tensorflow - 1.15.0 - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpmime - 4.5.9 - - - - org.apache.commons - commons-lang3 - - - - org.mockito - mockito-core - test + javax.xml.parsers + jaxp-api + ${javax.xml.parsers.api.version} + + + org.tensorflow + tensorflow + ${org.tensorflow.version} + + + org.apache.httpcomponents + httpclient - net.bytebuddy - byte-buddy - compile - + org.apache.httpcomponents + httpmime + ${org.apache.httpcomponents.httpmime.version} + + + org.apache.commons + commons-lang3 + + + org.mockito + mockito-core + test + + + net.bytebuddy + byte-buddy + compile + org.powermock powermock-api-mockito2 @@ -164,7 +177,7 @@ io.mosip.kernel kernel-keymanager-service - ${kernel-keymanager-service.version} + ${kernel.keymanager.service.version} org.springframework.boot @@ -186,7 +199,7 @@ io.mosip.kernel kernel-biosdk-provider - ${kernel-biosdk-provider.version} + ${kernel.biosdk.provider.version} io.mosip.kernel @@ -201,7 +214,7 @@ io.mosip.kernel kernel-cbeffutil-api - ${kernel-cbeffutil-api.version} + ${kernel.cbeffutil.api.version} io.mosip.kernel @@ -222,12 +235,12 @@ io.mosip.kernel kernel-websubclient-api - ${kernel-websubclient-api.version} + ${kernel.websubclient.api.version} org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} org.springframework.boot @@ -242,7 +255,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -261,4 +274,4 @@ spring-batch-infrastructure - + \ No newline at end of file diff --git a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/DataEncryptKeystore.java b/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/DataEncryptKeystore.java deleted file mode 100644 index 6d9bcbf2f25..00000000000 --- a/authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/entity/DataEncryptKeystore.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.mosip.authentication.common.service.entity; - -import java.time.LocalDateTime; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - -import lombok.Data; - -/** - * @author Manoj SP - * - */ -@Entity -@Data -@Table(schema = "ida", name = "data_encrypt_keystore") -public class DataEncryptKeystore { - - @Id - private Integer id; - @Column(name = "key") - private String key; - @Column(name = "key_status") - private String keyStatus; - @Column(name = "cr_dtimes") - private LocalDateTime crDTimes; - @Column(name = "upd_by") - private String updBy; - @Column(name = "upd_dtimes") - private LocalDateTime updDTimes; -} diff --git a/authentication/authentication-core/pom.xml b/authentication/authentication-core/pom.xml index e927baa3a8a..3a0e7d43b9a 100644 --- a/authentication/authentication-core/pom.xml +++ b/authentication/authentication-core/pom.xml @@ -16,12 +16,29 @@ authentication-core Maven project of MOSIP ID-Authentication Core + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + + + org.projectlombok + lombok + provided + io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -35,8 +52,6 @@ - - commons-codec @@ -61,7 +76,6 @@ org.springframework.boot spring-boot-starter-cache - com.machinezoo.sourceafis @@ -74,11 +88,10 @@ - io.mosip.idrepository id-repository-core - ${id-repository-core.version} + ${id.repository.core.version} io.mosip.kernel @@ -99,7 +112,7 @@ io.mosip.kernel kernel-biosdk-provider - ${kernel-biosdk-provider.version} + ${kernel.biosdk.provider.version} io.mosip.kernel @@ -114,7 +127,7 @@ io.mosip.kernel kernel-demographics-api - ${kernel-demoapi.version} + ${kernel.demoapi.version} com.fasterxml.jackson.core @@ -135,12 +148,12 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -159,13 +172,13 @@ jackson-databind - com.fasterxml.jackson.module - jackson-module-afterburner + com.fasterxml.jackson.module + jackson-module-afterburner io.mosip.kernel kernel-biometrics-api - ${kernel-biometrics-api.version} + ${kernel.biometrics.api.version} io.mosip.kernel @@ -178,4 +191,4 @@ - + \ No newline at end of file diff --git a/authentication/authentication-filter-api/pom.xml b/authentication/authentication-filter-api/pom.xml index 659ae716c67..df976375316 100644 --- a/authentication/authentication-filter-api/pom.xml +++ b/authentication/authentication-filter-api/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -13,201 +14,18 @@ https://github.com/mosip/commons jar - - UTF-8 - - - 21 - 21 - 3.8.0 - - - 3.0.2 - 3.1.0 - - - 3.2.0 - 2.3 - - - 5.0.5.RELEASE - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 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 - - - 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 - 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 - - - 21 - 21 - 3.8.0 - - - 3.0.2 - 3.1.0 - - - 3.2.0 - 2.3 - - - - 5.0.5.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 - - - 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 - - - + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + org.projectlombok @@ -217,7 +35,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -234,7 +52,7 @@ io.mosip.authentication authentication-core - ${authentication-core.version} + ${authentication.core.version} org.springframework.boot @@ -249,12 +67,12 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -269,149 +87,147 @@ - + - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - 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 - - - - 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 - - - - + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + maven-deploy-plugin + ${maven.deploy.plugin.version} + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.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 + + + + 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.id.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 + + + \ No newline at end of file diff --git a/authentication/authentication-hotlistfilter-impl/pom.xml b/authentication/authentication-hotlistfilter-impl/pom.xml index 80d5fe2aa35..50f11d4cd47 100644 --- a/authentication/authentication-hotlistfilter-impl/pom.xml +++ b/authentication/authentication-hotlistfilter-impl/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -13,213 +14,18 @@ https://github.com/mosip/commons jar - - UTF-8 + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + - - 21 - 21 - 3.8.0 - - - 3.0.2 - 3.1.0 - - - 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 - - - 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 - 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 - - - 3.0.2 - 3.1.0 - - - 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 - - - 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 - - - org.projectlombok @@ -229,7 +35,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -254,17 +60,17 @@ io.mosip.authentication authentication-core - ${authentication-core.version} + ${authentication.core.version} io.mosip.authentication authentication-filter-api - ${authentication-filter-api.version} + ${authentication.filter.api.version} io.mosip.authentication authentication-common - ${authentication-common.version} + ${authentication.common.version} com.fasterxml.jackson.core @@ -279,7 +85,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -307,7 +113,6 @@ - com.fasterxml.jackson.dataformat jackson-dataformat-xml @@ -329,7 +134,7 @@ io.mosip.kernel kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} + ${kernel.openid.bridge.api.version} com.fasterxml.jackson.core @@ -348,149 +153,147 @@ - + - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - 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 - - - - + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + maven-deploy-plugin + ${maven.deploy.plugin.version} + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.plugin.version} + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - - - 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 - - - - - - - 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 - - - - + + 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 + + + + 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.id.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 + + + \ No newline at end of file diff --git a/authentication/authentication-internal-service/pom.xml b/authentication/authentication-internal-service/pom.xml index 2fc29c3aa91..a6b24b6229a 100644 --- a/authentication/authentication-internal-service/pom.xml +++ b/authentication/authentication-internal-service/pom.xml @@ -12,14 +12,29 @@ 1.2.1-java21-SNAPSHOT authentication-internal-service authentication-internal-service - - UTF-8 - + + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + + + org.projectlombok + lombok + compile + io.mosip.authentication authentication-common - ${authentication-common.version} + ${authentication.common.version} com.fasterxml.jackson.core @@ -34,12 +49,12 @@ io.mosip.authentication authentication-authtypelockfilter-impl - ${authentication-authtypelockfilter-impl.version} + ${authentication.authtypelockfilter.impl.version} io.mosip.authentication authentication-hotlistfilter-impl - ${authentication-hotlistfilter-impl.version} + ${authentication.hotlistfilter.impl.version} org.springframework.boot @@ -73,34 +88,17 @@ io.mosip.kernel kernel-dataaccess-hibernate - ${kernel-dataaccess-hibernate.version} + ${kernel.dataaccess.hibernate.version} org.postgresql postgresql - org.powermock powermock-api-mockito2 test - org.powermock powermock-module-junit4 @@ -114,10 +112,6 @@ io.micrometer micrometer-registry-prometheus - - org.projectlombok - lombok - org.springframework.boot spring-boot-starter-security @@ -129,7 +123,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -146,7 +140,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -171,7 +165,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} org.springframework.boot @@ -208,7 +202,7 @@ io.mosip.kernel kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} + ${kernel.openid.bridge.api.version} com.fasterxml.jackson.core @@ -227,13 +221,13 @@ - + org.springframework.boot spring-boot-maven-plugin - 3.2.3 + ${spring.boot.maven.plugin.version} true ZIP @@ -265,22 +259,22 @@ io.mosip.kernel kernel-auth-adapter - 1.2.0 + ${kernel.auth.adapter.version} io.mosip.authentication authentication-childauthfilter-impl - 1.2.0 + ${io.mosip.authentication.childauthfilter.impl} io.mosip.biosdk biosdk-client - 1.2.0 + ${io.mosip.biosdk.biosdk.client.version} io.mosip.demosdk demosdk-client - 1.2.0 + ${io.mosip.demosdk.client.version} @@ -288,7 +282,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + ${spring.boot.maven.plugin.version} true ZIP @@ -310,7 +304,8 @@ --server.port=8090 - --server.servlet.context-path=/app/generic + + --server.servlet.context-path=/app/generic @@ -331,7 +326,7 @@ org.springdoc springdoc-openapi-maven-plugin - 0.2 + ${springdoc.openapi.maven.plugin} integration-test @@ -341,7 +336,8 @@ - http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Internal%20Service + + http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Internal%20Service ${name}-openapi.json ${project.build.directory} @@ -352,4 +348,4 @@ - + \ No newline at end of file diff --git a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java index 21aa49d3c81..f271e360af0 100644 --- a/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java +++ b/authentication/authentication-internal-service/src/main/java/io/mosip/authentication/internal/service/InternalAuthenticationApplication.java @@ -4,6 +4,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; @@ -142,12 +144,17 @@ io.mosip.kernel.signature.dto.AuthorizedRolesDTO.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class, PrivateKeyDecryptorHelper.class, PasswordAuthServiceImpl.class, PasswordComparator.class }) -@ComponentScan(basePackages = { "io.mosip.authentication.internal.service.*", "${mosip.auth.adapter.impl.basepackage}", +@ComponentScan(basePackages = {"io.mosip.authentication.internal.service.*", "${mosip.auth.adapter.impl.basepackage}", "io.mosip.kernel.core.logger.config", - "io.mosip.authentication.common.service.config" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { - "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" })) -@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository.*", - "io.mosip.kernel.keymanagerservice.repository.*" }) + "io.mosip.authentication.common.service.config" }, excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = { + "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }), + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { HibernateDaoConfig.class, + SecurityAutoConfiguration.class }) }) +@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository", + "io.mosip.kernel.keymanagerservice.repository" }) +@EntityScan(basePackages = { "io.mosip.authentication.common.service.entity", + "io.mosip.kernel.keymanagerservice.entity" }) public class InternalAuthenticationApplication { /** diff --git a/authentication/authentication-otp-service/pom.xml b/authentication/authentication-otp-service/pom.xml index 5b15af6305f..e408d574f60 100644 --- a/authentication/authentication-otp-service/pom.xml +++ b/authentication/authentication-otp-service/pom.xml @@ -15,11 +15,24 @@ UTF-8 + + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + io.mosip.authentication authentication-common - ${authentication-common.version} + ${authentication.common.version} com.fasterxml.jackson.core @@ -49,7 +62,7 @@ io.mosip.kernel kernel-dataaccess-hibernate - ${kernel-dataaccess-hibernate.version} + ${kernel.dataaccess.hibernate.version} @@ -65,9 +78,9 @@ micrometer-registry-prometheus - org.mockito - mockito-core - test + org.mockito + mockito-core + test org.objenesis @@ -78,7 +91,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -95,7 +108,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} org.springframework.boot @@ -114,7 +127,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -157,7 +170,7 @@ io.mosip.kernel kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} + ${kernel.openid.bridge.api.version} com.fasterxml.jackson.core @@ -176,13 +189,13 @@ - + org.springframework.boot spring-boot-maven-plugin - 3.2.3 + ${spring.boot.maven.plugin.version} true ZIP @@ -206,22 +219,22 @@ io.mosip.kernel kernel-auth-adapter - 1.2.0 + ${kernel.auth.adapter.version} io.mosip.authentication authentication-childauthfilter-impl - 1.2.0 + ${io.mosip.authentication.childauthfilter.impl} io.mosip.biosdk biosdk-client - 1.2.0 + ${io.mosip.biosdk.client.version} io.mosip.demosdk demosdk-client - 1.2.0 + ${io.mosip.demosdk.client.version} @@ -229,7 +242,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + ${spring.boot.maven.plugin.version} true ZIP @@ -251,7 +264,8 @@ --server.port=8090 - --server.servlet.context-path=/app/generic + + --server.servlet.context-path=/app/generic @@ -272,7 +286,7 @@ org.springdoc springdoc-openapi-maven-plugin - 0.2 + ${springdoc.openapi.maven.plugin} integration-test @@ -282,7 +296,8 @@ - http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20OTP%20Service + + http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20OTP%20Service ${name}-openapi.json ${project.build.directory} @@ -293,4 +308,4 @@ - + \ No newline at end of file diff --git a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java index 09e87a79cb0..f3d005d0339 100644 --- a/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java +++ b/authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; @@ -91,7 +93,7 @@ * * @author Dinesh Karuppiah */ -@SpringBootApplication(exclude = { HibernateDaoConfig.class }) +@SpringBootApplication @Import(value = {IdValidationUtil.class, IDAMappingConfig.class, KeyBindedTokenAuthServiceImpl.class, KeyManager.class, AuthContextClazzRefProvider.class, RestRequestFactory.class, IdInfoFetcherImpl.class, OTPManager.class, MasterDataManager.class, MatchInputBuilder.class, @@ -114,11 +116,17 @@ IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class, PrivateKeyDecryptorHelper.class, PasswordAuthServiceImpl.class, PasswordComparator.class, AuthenticationErrorEventingPublisher.class, KafkaProducerConfig.class }) + @ComponentScan(basePackages = { "io.mosip.authentication.otp.service.*", - "io.mosip.kernel.core.logger.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { - "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" })) -@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository.*", - "io.mosip.kernel.keymanagerservice.repository.*" }) + "io.mosip.kernel.core.logger.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = { + "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }), + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { HibernateDaoConfig.class, + SecurityAutoConfiguration.class }) }) +@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository", + "io.mosip.kernel.keymanagerservice.repository" }) +@EntityScan(basePackages = { "io.mosip.authentication.common.service.entity", + "io.mosip.kernel.keymanagerservice.entity" }) public class OtpApplication { /** @@ -129,5 +137,4 @@ public class OtpApplication { public static void main(String[] args) { SpringApplication.run(OtpApplication.class, args); } - -} +} \ No newline at end of file diff --git a/authentication/authentication-service/pom.xml b/authentication/authentication-service/pom.xml index 07bc6951652..3ba29063630 100644 --- a/authentication/authentication-service/pom.xml +++ b/authentication/authentication-service/pom.xml @@ -1,413 +1,427 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.mosip.authentication - authentication-parent - 1.2.1-java21-SNAPSHOT - - 1.2.1-java21-SNAPSHOT + + io.mosip.authentication + authentication-parent + 1.2.1-java21-SNAPSHOT + + 1.2.1-java21-SNAPSHOT - authentication-service - jar + authentication-service + jar - authentication-service - Maven project of MOSIP ID-Authentication Service + authentication-service + Maven project of MOSIP ID-Authentication Service - - - io.mosip.authentication - authentication-core - ${authentication-core.version} - - - com.fasterxml.jackson.core - jackson-core - - - - - io.mosip.authentication - authentication-common - ${authentication-common.version} - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - - - io.mosip.authentication - authentication-authtypelockfilter-impl - ${authentication-authtypelockfilter-impl.version} - - - io.mosip.authentication - authentication-hotlistfilter-impl - ${authentication-hotlistfilter-impl.version} - - - io.mosip.kernel - kernel-pinvalidator - ${kernel-pinvalidator.version} - + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + - - io.mosip.kernel - kernel-templatemanager-velocity - ${kernel-templatemanager-velocity.version} - - - javax.servlet - servlet-api - - - dom4j - dom4j - - - - - io.mosip.kernel - kernel-dataaccess-hibernate - ${kernel-dataaccess-hibernate.version} - - - io.mosip.kernel - kernel-idgenerator-tokenid - ${kernel-idgenerator-tokenid.version} - - - org.postgresql - postgresql - - - org.springframework.boot - spring-boot-starter-web - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.mockito - mockito-core - - - - - org.mockito - mockito-core - test - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.cloud - spring-cloud-starter-config - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - - - org.springframework.boot - spring-boot-starter-actuator - - - com.fasterxml.jackson.core - jackson-databind - - - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - io.mosip.kernel - kernel-websubclient-api - ${kernel-websubclient-api.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc.version} - - - io.mosip.kernel - kernel-core - ${kernel-core.version} - - - org.springframework.boot - - spring-boot-starter-security - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - - - org.springframework.boot - spring-boot-starter-webflux - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - - - io.mosip.kernel - kernel-logger-logback - ${kernel-logger-logback.version} - - - org.springframework.boot - - spring-boot-starter-security - - - - com.fasterxml.jackson.core - jackson-databind - - - - - io.mosip.biometric.util - biometrics-util - ${kernel-biometrics-util} - - - com.fasterxml.jackson.core - jackson-databind - - - - + + + io.mosip.authentication + authentication-core + ${authentication.core.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + io.mosip.authentication + authentication-common + ${authentication.common.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + + + io.mosip.authentication + authentication-authtypelockfilter-impl + ${authentication.authtypelockfilter.impl.version} + + + io.mosip.authentication + authentication-hotlistfilter-impl + ${authentication.hotlistfilter.impl.version} + + + io.mosip.kernel + kernel-pinvalidator + ${kernel.pinvalidator.version} + + + + io.mosip.kernel + kernel-templatemanager-velocity + ${kernel.templatemanager.velocity.version} + + + javax.servlet + servlet-api + + + dom4j + dom4j + + + + + io.mosip.kernel + kernel-dataaccess-hibernate + ${kernel.dataaccess.hibernate.version} + + + io.mosip.kernel + kernel-idgenerator-tokenid + ${kernel.idgenerator.tokenid.version} + + + org.postgresql + postgresql + + + org.springframework.boot + spring-boot-starter-web + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mockito + mockito-core + + + + + org.mockito + mockito-core + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.cloud + spring-cloud-starter-config + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + + + org.springframework.boot + spring-boot-starter-actuator + + + com.fasterxml.jackson.core + jackson-databind + + + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + io.mosip.kernel + kernel-websubclient-api + ${kernel.websubclient.api.version} + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.openapi.starter.webmvc.ui.version} + + + io.mosip.kernel + kernel-core + ${kernel.core.version} + + + org.springframework.boot + + spring-boot-starter-security + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + org.springframework.boot + spring-boot-starter-webflux + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + + + io.mosip.kernel + kernel-logger-logback + ${kernel.logger.logback.version} + + + org.springframework.boot + + spring-boot-starter-security + + + + com.fasterxml.jackson.core + jackson-databind + + + + + io.mosip.biometric.util + biometrics-util + ${kernel.biometrics.util.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + org.openpnp opencv - 4.5.3-4 - - + ${org.openpnp.opencv.version} + + info.weboftrust ld-signatures-java - 1.0.0 + ${info.weboftrust.ld.signatures.java.version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + + + io.mosip.kernel + kernel-openid-bridge-api + ${kernel.openid.bridge.api.version} com.fasterxml.jackson.core jackson-databind - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - - - io.mosip.kernel - kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 3.2.3 - - true - ZIP - - - - - build-info - repackage - - - - - - - - - openapi-doc-generate-profile - - - io.mosip.kernel - kernel-auth-adapter - 1.2.0 - - - io.mosip.authentication - authentication-childauthfilter-impl - 1.2.0 - - - io.mosip.biosdk - biosdk-client - 1.2.0 - - - io.mosip.demosdk - demosdk-client - 1.2.0 - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - ZIP - 1000 - 180 - - - - pre-integration-test - - start - - - - src/test/resources - - - openapi-profile - - - --server.port=8090 - --server.servlet.context-path=/app/generic - - - - - post-integration-test - - stop - - - - - build-info - repackage - - - - - - org.springdoc - springdoc-openapi-maven-plugin - 0.2 - - - integration-test - - generate - - - - - http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Service + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.maven.plugin.version} + + true + ZIP + + + + + build-info + repackage + + + + + + + + + openapi-doc-generate-profile + + + io.mosip.kernel + kernel-auth-adapter + ${kernel.auth.adapter.version} + + + io.mosip.authentication + authentication-childauthfilter-impl + ${io.mosip.authentication.childauthfilter.impl} + + + io.mosip.biosdk + biosdk-client + ${io.mosip.biosdk.client.version} + + + io.mosip.demosdk + demosdk-client + ${io.mosip.demosdk.client.version} + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.maven.plugin.version} + + true + ZIP + 1000 + 180 + + + + pre-integration-test + + start + + + + src/test/resources + + + openapi-profile + + + --server.port=8090 + + --server.servlet.context-path=/app/generic + + + + + post-integration-test + + stop + + + + + build-info + repackage + + + + + + org.springdoc + springdoc-openapi-maven-plugin + ${springdoc.openapi.maven.plugin} + + + integration-test + + generate + + + + + + http://localhost:8090/app/generic/v3/api-docs/Id%20Authentication%20Service - ${name}-openapi.json - ${project.build.directory} - false - - - - - - - + ${name}-openapi.json + ${project.build.directory} + false + + + + + + + \ No newline at end of file diff --git a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java index 13d295c4bca..0442b01a0bf 100644 --- a/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java +++ b/authentication/authentication-service/src/main/java/io/mosip/authentication/service/IdAuthenticationApplication.java @@ -1,8 +1,8 @@ package io.mosip.authentication.service; -import io.mosip.authentication.common.service.util.KeyBindedTokenMatcherUtil; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; @@ -32,9 +32,9 @@ import io.mosip.authentication.common.service.impl.DemoAuthServiceImpl; import io.mosip.authentication.common.service.impl.IdInfoFetcherImpl; import io.mosip.authentication.common.service.impl.IdServiceImpl; +import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; import io.mosip.authentication.common.service.impl.OTPAuthServiceImpl; import io.mosip.authentication.common.service.impl.PasswordAuthServiceImpl; -import io.mosip.authentication.common.service.impl.KeyBindedTokenAuthServiceImpl; import io.mosip.authentication.common.service.impl.hotlist.HotlistServiceImpl; import io.mosip.authentication.common.service.impl.masterdata.MasterDataCacheUpdateServiceImpl; import io.mosip.authentication.common.service.impl.notification.NotificationServiceImpl; @@ -53,6 +53,7 @@ import io.mosip.authentication.common.service.util.BioMatcherUtil; import io.mosip.authentication.common.service.util.EnvUtil; import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil; +import io.mosip.authentication.common.service.util.KeyBindedTokenMatcherUtil; import io.mosip.authentication.common.service.validator.AuthFiltersValidator; import io.mosip.authentication.common.service.validator.AuthRequestValidator; import io.mosip.authentication.common.service.websub.IdAuthWebSubInitializer; @@ -80,6 +81,7 @@ import io.mosip.kernel.cryptomanager.util.CryptomanagerUtils; import io.mosip.kernel.dataaccess.hibernate.config.HibernateDaoConfig; import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator; +import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck; import io.mosip.kernel.keymanager.hsm.impl.KeyStoreImpl; import io.mosip.kernel.keymanagerservice.helper.KeymanagerDBHelper; import io.mosip.kernel.keymanagerservice.helper.PrivateKeyDecryptorHelper; @@ -94,8 +96,6 @@ import io.mosip.kernel.tokenidgenerator.generator.TokenIDGenerator; import io.mosip.kernel.tokenidgenerator.service.impl.TokenIDGeneratorServiceImpl; import io.mosip.kernel.zkcryptoservice.service.impl.ZKCryptoManagerServiceImpl; -import io.mosip.kernel.keymanager.hsm.health.HSMHealthCheck; - /** * Spring-boot class for ID Authentication Application. @@ -103,35 +103,42 @@ * @author Dinesh Karuppiah * @author Nagarjuna */ -@SpringBootApplication(exclude = { HibernateDaoConfig.class, SecurityAutoConfiguration.class }) +@SpringBootApplication @Import(value = { IdValidationUtil.class, IDAMappingConfig.class, KeyBindedTokenAuthServiceImpl.class, - AuthContextClazzRefProvider.class, CbeffImpl.class, - RestRequestFactory.class, AuditRequestFactory.class, AuditRequestFactory.class, NotificationManager.class, - NotificationServiceImpl.class, IdTemplateManager.class, TemplateManagerBuilderImpl.class, IdAuthExceptionHandler.class, - IdInfoFetcherImpl.class, OTPManager.class, MasterDataManager.class, IdInfoHelper.class, OTPAuthServiceImpl.class, - AuditHelper.class, KeyManager.class, PinValidatorImpl.class, AuthRequestValidator.class, AuthFacadeImpl.class, - MatchInputBuilder.class, IdServiceImpl.class, DemoAuthServiceImpl.class, BioAuthServiceImpl.class, TokenIdManager.class, - SwaggerConfig.class, BioMatcherUtil.class, BioAPIFactory.class, BioProviderImpl_V_0_8.class, BioProviderImpl_V_0_9.class, - IdAuthSecurityManager.class, RestRequestFactory.class, - AuthtypeStatusImpl.class, CryptoCore.class, PartnerServiceImpl.class, CryptomanagerServiceImpl.class, KeyGenerator.class, + AuthContextClazzRefProvider.class, CbeffImpl.class, RestRequestFactory.class, AuditRequestFactory.class, + AuditRequestFactory.class, NotificationManager.class, NotificationServiceImpl.class, IdTemplateManager.class, + TemplateManagerBuilderImpl.class, IdAuthExceptionHandler.class, IdInfoFetcherImpl.class, OTPManager.class, + MasterDataManager.class, IdInfoHelper.class, OTPAuthServiceImpl.class, AuditHelper.class, KeyManager.class, + PinValidatorImpl.class, AuthRequestValidator.class, AuthFacadeImpl.class, MatchInputBuilder.class, + IdServiceImpl.class, DemoAuthServiceImpl.class, BioAuthServiceImpl.class, TokenIdManager.class, + SwaggerConfig.class, BioMatcherUtil.class, BioAPIFactory.class, BioProviderImpl_V_0_8.class, + BioProviderImpl_V_0_9.class, IdAuthSecurityManager.class, RestRequestFactory.class, AuthtypeStatusImpl.class, + CryptoCore.class, PartnerServiceImpl.class, CryptomanagerServiceImpl.class, KeyGenerator.class, CryptomanagerUtils.class, KeymanagerServiceImpl.class, KeymanagerUtil.class, TokenIDGeneratorServiceImpl.class, - TokenIDGenerator.class, PartnerServiceManager.class, ZKCryptoManagerServiceImpl.class, SignatureServiceImpl.class, - KeyStoreImpl.class, KeymanagerDBHelper.class, IdTypeUtil.class, MasterDataCache.class, MasterDataCacheInitializer.class, - PartnerCertificateManagerServiceImpl.class, PartnerCertManagerDBHelper.class, WebSubHelper.class, - IdAuthWebSubInitializer.class, PartnerServiceEventsInitializer.class, RetryConfig.class, RetryUtil.class, - RetryListenerImpl.class, RetryAspect.class, AuthTransactionHelper.class, HotlistServiceImpl.class, + TokenIDGenerator.class, PartnerServiceManager.class, ZKCryptoManagerServiceImpl.class, + SignatureServiceImpl.class, KeyStoreImpl.class, KeymanagerDBHelper.class, IdTypeUtil.class, + MasterDataCache.class, MasterDataCacheInitializer.class, PartnerCertificateManagerServiceImpl.class, + PartnerCertManagerDBHelper.class, WebSubHelper.class, IdAuthWebSubInitializer.class, + PartnerServiceEventsInitializer.class, RetryConfig.class, RetryUtil.class, RetryListenerImpl.class, + RetryAspect.class, AuthTransactionHelper.class, HotlistServiceImpl.class, AuthTransactionStatusEventPublisher.class, MasterDataCacheUpdateServiceImpl.class, MasterDataUpdateEventInitializer.class, DemoNormalizer.class, DemoMatcherUtil.class, IdAuthFraudAnalysisEventManager.class, IdAuthFraudAnalysisEventPublisher.class, AuthFiltersValidator.class, - AuthAnonymousProfileServiceImpl.class, AuthAnonymousEventPublisher.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class, - PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, - HSMHealthCheck.class, TokenValidationHelper.class, VCSchemaProviderUtil.class, PrivateKeyDecryptorHelper.class, + AuthAnonymousProfileServiceImpl.class, AuthAnonymousEventPublisher.class, SessionKeyDecrytorHelper.class, + ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class, PartnerCACertEventServiceImpl.class, + PartnerCACertEventInitializer.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, HSMHealthCheck.class, + TokenValidationHelper.class, VCSchemaProviderUtil.class, PrivateKeyDecryptorHelper.class, PasswordAuthServiceImpl.class, PasswordComparator.class, AuthenticationErrorEventingPublisher.class }) @ComponentScan(basePackages = { "io.mosip.authentication.service.*", "io.mosip.kernel.core.logger.config", - "io.mosip.authentication.common.service.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = { - "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" })) -@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository.*", - "io.mosip.kernel.keymanagerservice.repository.*" }) + "io.mosip.authentication.common.service.config", "${mosip.auth.adapter.impl.basepackage}", "io.mosip.kernel.keymanager.hsm.impl" }, excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = { + "io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }), + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { HibernateDaoConfig.class, + SecurityAutoConfiguration.class }) }) +@EnableJpaRepositories(basePackages = { "io.mosip.authentication.common.service.repository", + "io.mosip.kernel.keymanagerservice.repository" }) +@EntityScan(basePackages = { "io.mosip.authentication.common.service.entity", + "io.mosip.kernel.keymanagerservice.entity" }) public class IdAuthenticationApplication { /** diff --git a/authentication/esignet-integration-impl/pom.xml b/authentication/esignet-integration-impl/pom.xml index 7b74b4fe149..104f09bca4d 100644 --- a/authentication/esignet-integration-impl/pom.xml +++ b/authentication/esignet-integration-impl/pom.xml @@ -15,40 +15,50 @@ e-Signet Integration Implementation Library - 21 + + 1.2.1-SNAPSHOT + 1.2.1-SNAPSHOT - + + + + + io.mosip.kernel + kernel-bom + ${kernel.bom.version} + pom + import + + + + junit junit test - - + org.projectlombok lombok - compile - - + provided + io.mosip.esignet esignet-core - 1.2.1-SNAPSHOT + ${io.mosip.esignet.core.version} provided - io.mosip.esignet esignet-integration-api - 1.2.1-SNAPSHOT + ${io.mosip.esignet.integration.api.version} provided - io.mosip.kernel kernel-keymanager-service - ${kernel-keymanager-service.version} + ${kernel.keymanager.service.version} provided lib @@ -62,7 +72,6 @@ - com.fasterxml.jackson.core jackson-annotations @@ -71,7 +80,7 @@ info.weboftrust ld-signatures-java - 1.0.0 + ${info.weboftrust.ld.signatures.java.version} - + \ No newline at end of file diff --git a/authentication/pom.xml b/authentication/pom.xml index ce9cf43cc40..1b3ffaf441e 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -21,7 +22,8 @@ scm:git:git://github.com/mosip/id-authentication.git - scm:git:ssh://github.com:mosip/id-authentication.git + + scm:git:ssh://github.com:mosip/id-authentication.git https://github.com/mosip/id-authentication HEAD @@ -35,31 +37,31 @@ - - - ossrh - CentralRepository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - - central - MavenCentral - default - https://repo1.maven.org/maven2 - - false - - + + + ossrh + CentralRepository + https://oss.sonatype.org/content/repositories/snapshots + default + + true + + + + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + danubetech-maven-public https://repo.danubetech.com/repository/maven-public/ - - - + + + ossrh @@ -85,113 +87,107 @@ ${project.version} - ${authentication.parent.version} - ${authentication.parent.version} - ${authentication.parent.version} - ${authentication.parent.version} - ${authentication.parent.version} + ${authentication.parent.version} + ${authentication.parent.version} + ${authentication.parent.version} + + ${authentication.parent.version} + + ${authentication.parent.version} + UTF-8 - - - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.0.1-B1 - 20180130 - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT - 1.2.1-java21-SNAPSHOT + 21 - 21 - 21 - 3.8.0 - 3.2.0 - 0.8.11 - 3.7.0.1746 - 2.0.9 - 2.22.0 - - - 4.13.2 - 3.4.3 - 1.9.3 - - - 5.0.5.RELEASE - 6.0.12.Final - 42.2.2 - - - 3.7 - 1.11 + ${java.version} + ${java.version} + 3.11.0 + 3.0.2 + 3.1.0 + 3.2.0 + 2.3 + 0.8.11 + 3.1.1 + 3.3.1 + 3.2.3 + 3.3.0 + 3.1.2 + 3.2.5 + 1.6.7 + 3.7.0.1746 + + 3.0.1 + + 0.2 + + 4.5.9 + 1.4.5 + 1.15.0 3.4.0 + 3.1 + 20180130 + 4.5.3-4 + 1.0.0 + 2.5.8.RELEASE - **/test/**/*.* - **/ai/**/*.*,**/jdbc/**/*.*,**/mpt/**/*.*,**/jcr/**/*.*,**/JDBC*,**/constant/**,**/config/**,**/dto/**,**io/mosip/authentication/common/service/filter/**,**io/mosip/authentication/service/filter/**,**io/mosip/authentication/otp/service/filter/**,**io/mosip/authentication/common/policy/**,**io/mosip/authentication/internal/service/filter/**,**io/mosip/authentication/kyc/service/filter/**,**io/mosip/authentication/staticpin/service/filter/**,**io/mosip/authentication/common/service/entity/**,**/service/IdAuthenticationApplication.java,**/service/**/*Entity.java,**internal/service/InternalAuthenticationApplication.java,**kyc/service/KycAuthenticationApplication.java,**spin/service/StaticPinAuthenticationApplication.java,**io/mosip/authentication/common/service/repository/**,**authentication/otp/service/OtpApplication.java,**authentication/staticpin/service/StaticPinApplication.java,**/authentication/vid/service/VidApplication.java,**/authentication/core/spi/indauth/match/** + + 2.6.0 - 3.0.2 - 3.1.0 - 3.1 + + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT + 1.2.1-java21-SNAPSHOT - 2.5.0 - + + **/test/**/*.* + + **/ai/**/*.*,**/jdbc/**/*.*,**/mpt/**/*.*,**/jcr/**/*.*,**/JDBC*,**/constant/**,**/config/**,**/dto/**,**io/mosip/authentication/common/service/filter/**,**io/mosip/authentication/service/filter/**,**io/mosip/authentication/otp/service/filter/**,**io/mosip/authentication/common/policy/**,**io/mosip/authentication/internal/service/filter/**,**io/mosip/authentication/kyc/service/filter/**,**io/mosip/authentication/staticpin/service/filter/**,**io/mosip/authentication/common/service/entity/**,**/service/IdAuthenticationApplication.java,**/service/**/*Entity.java,**internal/service/InternalAuthenticationApplication.java,**kyc/service/KycAuthenticationApplication.java,**spin/service/StaticPinAuthenticationApplication.java,**io/mosip/authentication/common/service/repository/**,**authentication/otp/service/OtpApplication.java,**authentication/staticpin/service/StaticPinApplication.java,**/authentication/vid/service/VidApplication.java,**/authentication/core/spi/indauth/match/** + io.mosip.kernel kernel-bom - 1.2.1-java21-SNAPSHOT + ${kernel.bom.version} pom import + org.junit.vintage junit-vintage-engine - - - org.projectlombok lombok - compile + provided - - - org.springframework.boot @@ -208,7 +204,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel-logger-logback.version} + ${kernel.logger.logback.version} org.springframework.boot @@ -218,7 +214,6 @@ - com.fasterxml.jackson.core jackson-databind @@ -231,11 +226,10 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} org.springframework.boot @@ -252,7 +246,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc.version} + ${springdoc.openapi.starter.webmvc.ui.version} org.springframework.boot @@ -262,7 +256,7 @@ io.mosip.kernel kernel-openid-bridge-api - ${kernel-openid-bridge-api.version} + ${kernel.openid.bridge.api.version} provided @@ -280,7 +274,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.plugin.version} attach-javadocs @@ -296,7 +290,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + ${nexus.staging.maven.plugin.version} true ossrh @@ -307,7 +301,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + ${maven.source.plugin.version} attach-sources @@ -321,7 +315,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + ${maven.gpg.plugin.version} sign-artifacts @@ -341,7 +335,7 @@ org.jacoco jacoco-maven-plugin - ${maven.jacoco.version} + ${jacoco.maven.plugin.version} **/constant/** @@ -403,7 +397,7 @@ pl.project13.maven git-commit-id-plugin - 3.0.1 + ${git.commit.id.plugin.version} get-the-git-infos @@ -415,14 +409,14 @@ true - ${project.build.outputDirectory}/service-git.properties + + ${project.build.outputDirectory}/service-git.properties ^git.build.(time|version)$ ^git.commit.id.(abbrev|full)$ full ${project.basedir}/.git - @@ -433,19 +427,19 @@ ${skipTests} false - ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit + ${argLine} --add-opens + java.xml/jdk.xml.internal=ALL-UNNAMED - - - - sonar - - - + + + sonar + + + org.sonarsource.scanner.maven sonar-maven-plugin ${maven.sonar.version} @@ -458,9 +452,8 @@ - - - - - + + + +