From 4fc80aeaef33e5b6d4371d4c59b83a9c19b85f6e Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Mon, 15 Jul 2024 15:51:24 +0530 Subject: [PATCH 01/13] MOSIP-34469 Pulled the latest changes from develop Signed-off-by: Mohanachandran S --- apitest-commons/pom.xml | 803 ++++++++++++++++------------------------ 1 file changed, 327 insertions(+), 476 deletions(-) diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml index 7d15089b99..1152131ea4 100644 --- a/apitest-commons/pom.xml +++ b/apitest-commons/pom.xml @@ -8,7 +8,7 @@ apitest-commons Parent project of MOSIP functional tests https://github.com/mosip/mosip-functional-tests - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT @@ -19,7 +19,8 @@ scm:git:git://github.com/mosip/mosip-functional-tests.git - scm:git:ssh://github.com:mosip/mosip-functional-tests.git + + scm:git:ssh://github.com:mosip/mosip-functional-tests.git https://github.com/mosip/mosip-functional-tests HEAD @@ -33,186 +34,63 @@ - - - UTF-8 - 1.2.0.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT - 11 - 11 - 3.7.0 + 21 + 21 + 3.8.0 3.0.2 3.1.0 - 2.9 - 0.8.1 - 3.2 - 3.0.1 - 2.3 - false 3.7.0.1746 - - 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 - 6.0.12.Final - - - 1.10.19 - 1.7.4 - 2.0.0-beta.5 - - - 1.2.3 - 1.7.19 - 2.16.0 - 1.7.25 - - - 2.9.5 - 20180130 - 2.2.10 - 20180130 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 + 1.15 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.60 - 63.1 - 1.0.0 - 3.3.3 2.8.1 - 4.1.0-incubating + 63.1 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - - - - - - - - 0.8.2 - 2.2 - 3.2 - UTF-8 - 3.7.0 - 3.0.1 - - - 1.1.6 - 1.7.19 - 1.10.19 - - - 1.4.6 - - - 5.0.6.RELEASE - 5.4.2.Final - - - 2.1.1 - - - 10.13.1.1 - - - 3.4.0 - - - 1.3.5 - - - 0.3.12 - - - 0.3.0 + 6.5.2.Final 1.1.2-incubating - 1.2.0.1-B1 + 1.2.1-java21-SNAPSHOT 0.4.7 3.0.0 2.41.2 - 2.4.0 3.3.9 - 3.0.7 6.11 1.13 - apitest-commons-1.2.1-SNAPSHOT-jar-with-dependencies - + apitest-commons-1.2.1-java21-SNAPSHOT-jar-with-dependencies + + + junit + junit + test + com.opencsv opencsv 4.1 - - - - com.slack.api - slack-api-client - 1.6.1-RC1 - + + + com.slack.api + slack-api-client + 1.6.1-RC1 + com.ibm.icu icu4j - 68.1 + ${icu4j.version} org.keycloak @@ -223,10 +101,10 @@ org.javassist javassist - 3.25.0-GA - com.github.jknack handlebars @@ -235,13 +113,11 @@ org.apache.commons commons-collections4 - ${commons-collections4.version} io.jsonwebtoken jjwt - ${io.jsonwebtoken.jjwt.version} com.flipkart.zjsonpatch @@ -249,10 +125,10 @@ ${zjsonpatch.version} - com.amazonaws - aws-java-sdk - ${aws.javasdk.version} - + com.amazonaws + aws-java-sdk + ${aws.javasdk.version} + com.aventstack extentreports @@ -266,7 +142,6 @@ com.jayway.jsonpath json-path - ${json-path.version} @@ -277,7 +152,6 @@ io.rest-assured rest-assured - ${rest.assured.version} @@ -290,45 +164,38 @@ zt-zip ${zt.zip.version} - + com.fasterxml.jackson.core jackson-core - 2.12.1 - - - - com.fasterxml.jackson.core - jackson-databind - 2.12.1 - - + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core jackson-annotations - 2.12.1 com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${jackson.version} org.json json - ${json.version} com.googlecode.json-simple json-simple - 1.1.1 com.google.code.gson gson - 2.8.4 org.apache.maven.plugins @@ -338,7 +205,6 @@ com.google.guava guava - ${guava.version} @@ -354,48 +220,36 @@ javax.validation validation-api - ${javax.validation-api.version} io.swagger swagger-annotations - ${swagger.annotations.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} org.postgresql postgresql - ${postgresql.version} org.slf4j slf4j-log4j12 - 1.6.2 org.apache.logging.log4j log4j-api - 2.11.1 net.lingala.zip4j zip4j 1.3.2 - - com.ibm.icu - icu4j - ${icu4j.version} - - + org.apache.httpcomponents httpclient - 4.5.3 runtime @@ -410,19 +264,15 @@ - - commons-codec commons-codec - ${commons-codec} commons-io commons-io - ${commons-io} com.google.zxing @@ -458,36 +308,37 @@ itextpdf 5.5.13 - + - de.mkammerer - argon2-jvm - 2.9.1 - - - - com.github.mifmif - generex - 1.0.2 - + de.mkammerer + argon2-jvm + 2.9.1 + + + + com.github.mifmif + generex + 1.0.2 + javax.mail javax.mail-api 1.6.2 - - - io.mosip.kernel - kernel-core - ${kernel.version} - + io.mosip.kernel kernel-registration-packet-manager 1.1.5.3 + + + org.springframework + spring-expression + + io.mosip.kernel @@ -504,97 +355,92 @@ checker-qual 2.9.0 - + org.apache.activemq activemq-broker - 5.15.9 org.projectlombok lombok - 1.18.32 provided - - org.bouncycastle - bcprov-jdk15on - 1.70 - - - org.bouncycastle - bcpkix-jdk15on - 1.70 - - - javax.xml.bind - jaxb-api - 2.3.1 - - - io.mosip.authentication - authentication-core - 1.2.0.1-B3 - - - commons-codec - commons-codec - - - - - - io.mosip.kernel - kernel-core - 1.2.0.1-SNAPSHOT - - - org.springframework.boot - - spring-boot-starter-security - - - - commons-codec - commons-codec - - - - - io.mosip.kernel - kernel-websubclient-api - ${kernel-websubclient-api.version} - - - - io.mosip.kernel - kernel-templatemanager-velocity - 1.2.0.1-SNAPSHOT - - - - io.mosip.kernel - kernel-keymanager-service - 1.2.0.1-SNAPSHOT - lib - - - org.springframework.boot - - spring-boot-starter-security - - - - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - + + org.springframework.boot + spring-boot-starter-batch + + + org.hibernate.validator + hibernate-validator + + + org.bouncycastle + bcprov-jdk15on + 1.70 + + + org.bouncycastle + bcpkix-jdk15on + 1.70 + + + javax.xml.bind + jaxb-api + + + io.mosip.authentication + authentication-core + 1.2.0.1-B3 + + + commons-codec + commons-codec + + + + + + io.mosip.kernel + kernel-core + ${kernel.version} + + + org.springframework.boot + spring-boot-starter-security + + + commons-codec + commons-codec + + + + + io.mosip.kernel + kernel-websubclient-api + ${kernel-websubclient-api.version} + + + + io.mosip.kernel + kernel-templatemanager-velocity + 1.2.1-java21-SNAPSHOT + + + + io.mosip.kernel + kernel-keymanager-service + 1.2.1-java21-SNAPSHOT + lib + + + org.springframework.boot + spring-boot-starter-security + + + + @@ -606,7 +452,14 @@ commons-codec commons-codec - 1.15 + ${commons-codec} + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import @@ -614,14 +467,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - - @@ -642,162 +487,166 @@ maven-compiler-plugin - 3.5.1 + ${maven.compiler.version} - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} -Dfile.encoding=UTF-8 - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - none - - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - populate-git-commit-information - - revision - - - true - MM/dd/yyyy HH:mm:ss Z - 8 - true - ${project.build.outputDirectory}/git.properties - - - - - ${project.basedir}/.git - - + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + none + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + populate-git-commit-information + + revision + + + true + MM/dd/yyyy HH:mm:ss Z + 8 + true + + ${project.build.outputDirectory}/git.properties + + + + + ${project.basedir}/.git + + - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - shade - - - ${fileName} - - - - - - io.mosip.testrig.apirig.testrunner.MosipTestRunner - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - true - true - - - ${project.name} - ${project.version} - ${user.name} - ${os.name} - ${maven.build.timestamp} - ${env.BUILD_NUMBER} - ${env.BUILD_ID} - ${env.BUILD_URL} - - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.plugin.version} - - - - true - true - - - ${project.name} - ${project.version} - ${user.name} - ${os.name} - ${maven.build.timestamp} - ${env.BUILD_NUMBER} - ${env.BUILD_ID} - ${env.BUILD_URL} - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + + shade + + + ${fileName} + + + + + + + io.mosip.testrig.apirig.testrunner.MosipTestRunner + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + true + true + + + ${project.name} + ${project.version} + ${user.name} + ${os.name} + ${maven.build.timestamp} + ${env.BUILD_NUMBER} + ${env.BUILD_ID} + ${env.BUILD_URL} + + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.plugin.version} + + + + true + true + + + ${project.name} + ${project.version} + ${user.name} + ${os.name} + ${maven.build.timestamp} + ${env.BUILD_NUMBER} + ${env.BUILD_ID} + ${env.BUILD_URL} + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-antrun-plugin @@ -811,8 +660,10 @@ - - + + @@ -820,35 +671,35 @@ - - - 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 - - - - - - - - - + + + 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 + + + + + + + + + \ No newline at end of file From f3605f5edbcd430868006c41d1e7d5ef8bf7eac5 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Mon, 15 Jul 2024 16:25:13 +0530 Subject: [PATCH 02/13] MOSIP-34469 Pulled the latest changes from develop Signed-off-by: Mohanachandran S --- .github/workflows/apitest-push-trigger.yml | 6 +++--- apitest-commons/pom.xml | 22 +++++++++++----------- authentication-demo-service/pom.xml | 18 +++++++----------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/workflows/apitest-push-trigger.yml b/.github/workflows/apitest-push-trigger.yml index 1f869396a9..18210ad9f4 100644 --- a/.github/workflows/apitest-push-trigger.yml +++ b/.github/workflows/apitest-push-trigger.yml @@ -24,7 +24,7 @@ on: jobs: build-maven-apitest-commons: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: ./apitest-commons BUILD_ARTIFACT: apitest-commons @@ -38,7 +38,7 @@ jobs: publish_to_nexus: 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-apitest-commons - 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: ./apitest-commons secrets: @@ -53,7 +53,7 @@ jobs: sonar_analysis: needs: build-maven-apitest-commons 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: ./apitest-commons secrets: diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml index 1152131ea4..bb486a21c9 100644 --- a/apitest-commons/pom.xml +++ b/apitest-commons/pom.xml @@ -19,8 +19,7 @@ scm:git:git://github.com/mosip/mosip-functional-tests.git - - scm:git:ssh://github.com:mosip/mosip-functional-tests.git + scm:git:ssh://github.com:mosip/mosip-functional-tests.git https://github.com/mosip/mosip-functional-tests HEAD @@ -46,11 +45,13 @@ 3.0.2 3.1.0 3.7.0.1746 + + 1.15 1.9.2 1.7 - 2.8.1 63.1 + 2.8.1 1.11.368 @@ -103,8 +104,7 @@ javassist - com.github.jknack handlebars @@ -164,19 +164,19 @@ zt-zip ${zt.zip.version} - + com.fasterxml.jackson.core jackson-core - + com.fasterxml.jackson.core jackson-databind - + com.fasterxml.jackson.core jackson-annotations @@ -355,7 +355,7 @@ checker-qual 2.9.0 - + org.apache.activemq activemq-broker @@ -486,6 +486,7 @@ + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.version} @@ -660,8 +661,7 @@ - + diff --git a/authentication-demo-service/pom.xml b/authentication-demo-service/pom.xml index 5ec8e81438..07fa2f8055 100644 --- a/authentication-demo-service/pom.xml +++ b/authentication-demo-service/pom.xml @@ -4,7 +4,7 @@ io.mosip.testrig.authentication.demo - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT authentication-demo-service authentication-demo-service Parent project of MOSIP functional tests @@ -73,7 +73,7 @@ 0.8.2 true - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT @@ -104,16 +104,12 @@ io.mosip.authentication authentication-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT commons-codec commons-codec - - org.springdoc - springdoc-openapi-ui - @@ -129,7 +125,7 @@ io.mosip.kernel kernel-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT org.springframework.boot @@ -210,7 +206,7 @@ io.mosip.kernel kernel-templatemanager-velocity - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT org.springframework.cloud @@ -233,7 +229,7 @@ io.mosip.kernel kernel-keymanager-service - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT lib @@ -264,7 +260,7 @@ io.mosip.kernel kernel-bom - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT pom import From 012affdc03f59af3066e415cead52b9c1f1fe17e Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 16 Jul 2024 15:21:35 +0530 Subject: [PATCH 03/13] MOSIP-34469 Pulled the latest changes from develop Signed-off-by: Mohanachandran S --- apitest-commons/pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml index 1e45b43342..8e43f232b1 100644 --- a/apitest-commons/pom.xml +++ b/apitest-commons/pom.xml @@ -551,8 +551,7 @@ MM/dd/yyyy HH:mm:ss Z 8 true - - ${project.build.outputDirectory}/git.properties + ${project.build.outputDirectory}/git.properties @@ -695,8 +694,7 @@ - + From a86672967206d2d0a9a9567f56a3303c92f097fd Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 16 Jul 2024 15:25:06 +0530 Subject: [PATCH 04/13] MOSIP-34469 Pulled the latest changes from develop Signed-off-by: Mohanachandran S --- apitest-commons/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml index 8e43f232b1..8cd782cb2e 100644 --- a/apitest-commons/pom.xml +++ b/apitest-commons/pom.xml @@ -694,7 +694,7 @@ - + From 70800f874891f1e61a888368e5ddd0e2c18b6382 Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:58:33 +0530 Subject: [PATCH 05/13] [DSD-5608]Updated pom.xml (#1540) Signed-off-by: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> --- authentication-demo-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authentication-demo-service/pom.xml b/authentication-demo-service/pom.xml index 07fa2f8055..b35504f6e7 100644 --- a/authentication-demo-service/pom.xml +++ b/authentication-demo-service/pom.xml @@ -71,7 +71,7 @@ 3.0.1 2.9.2 0.8.2 - true + false 1.2.1-java21-SNAPSHOT From f104dc8a3cc3c37cb5d67730472631b9f173b74a Mon Sep 17 00:00:00 2001 From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com> Date: Fri, 2 Aug 2024 17:24:38 +0530 Subject: [PATCH 06/13] Delete pom.xml Signed-off-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com> --- pom.xml | 286 -------------------------------------------------------- 1 file changed, 286 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 306e1ddc56..0000000000 --- a/pom.xml +++ /dev/null @@ -1,286 +0,0 @@ - - - 4.0.0 - - io.mosip.testrig - mosip-functional-test - 1.2.1-SNAPSHOT - pom - mosip-function-test - Parent project of MOSIP Functional test - mosip-functional-tests - - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - - - - scm:git:git://github.com/mosip/mosip-functional-tests.git - scm:git:ssh://github.com:mosip/mosip-functional-tests.git - https://github.com/mosip/mosip-functional-tests - HEAD - - - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/mosip-functional-tests - - - - - - ossrh - CentralRepository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - - central - MavenCentral - default - https://repo1.maven.org/maven2 - - false - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - UTF-8 - - - 21 - 21 - 3.7.0.1746 - 0.8.11 - 0.8.11 - - - io.mosip.testrig.apirig.apitest.commons/** - - io.mosip.testrig.apirig.apitest.commons/** - - - - authentication-demo-service - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skipTests} - false - - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.base/java.net=ALL-UNNAMED - --add-opens=java.base/java.time=ALL-UNNAMED - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.time.format=ALL-UNNAMED - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - none - -Xdoclint:none - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - false - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - true - - - ${project.name} - ${project.version} - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - true - true - - - ${project.name} - ${project.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - - - get-the-git-infos - - revision - - validate - - - - true - git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - -parameters - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - - - - sonar - - . - src/main/java/**,src/main/resources/** - ${sonar.coverage.exclusions} - https://sonarcloud.io - true - - - false - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${maven.sonar.plugin.version} - - - verify - - sonar - - - - - - - - - From 1ee8ff290efe5bd24049e12a5ef242bb49bb0afd Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Wed, 7 Aug 2024 14:05:13 +0530 Subject: [PATCH 07/13] MOSIP-35107 - Updated the biometric details w.r.t mock mds java21 Signed-off-by: Mohanachandran S --- .../dataprovider/BiometricDataProvider.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java index 461a6e57e8..ad45768f88 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java @@ -45,11 +45,11 @@ import io.mosip.testrig.apirig.dataprovider.util.DataProviderConstants; import io.mosip.testrig.apirig.dataprovider.util.FPClassDistribution; import io.mosip.testrig.apirig.testrunner.BaseTestCase; +import io.mosip.testrig.apirig.testrunner.MosipTestRunner; import io.mosip.testrig.apirig.utils.RestClient; import io.restassured.response.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.log4j.Logger; import org.xml.sax.SAXException; import com.fasterxml.jackson.databind.JsonNode; @@ -64,7 +64,8 @@ public class BiometricDataProvider { public static HashMap portmap = new HashMap(); - private static final Logger logger = LoggerFactory.getLogger(BiometricDataProvider.class); + //private static final Logger logger = LoggerFactory.getLogger(BiometricDataProvider.class); + private static final Logger logger = Logger.getLogger(BiometricDataProvider.class); // String constants private static final String XMLNS = "xmlns"; @@ -203,7 +204,7 @@ static String buildBirIris(String irisInfo, String irisName, String jtwSign, Str .t("1").up().up().e(BIRINFO).e(INTEGRITY).t(FALSE).up().up().e(BDBINFO).e(FORMAT).e(ORGANIZATION) .t(MOSIP).up().e("Type").t("9").up().up().e(CREATIONDATE).t(today).up().e("Type").t("Iris").up() .e(SUBTYPE).t(irisName).up().e(LEVEL).t("Raw").up().e(PURPOSE).t(ENROLL).up().e(QUALITY).e(ALGORITHM) - .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t(qualityScore).up().up().up() + .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t((int) Math.round(Double.parseDouble(qualityScore)) + "").up().up().up() .e("BDB").t(getBase64EncodedStringFromBase64URL(irisInfo)).up().up(); if (jtwSign != null && payload != null) { jtwSign = Base64.getEncoder().encodeToString(jtwSign.getBytes()); @@ -235,7 +236,7 @@ static String buildBirFinger(String fingerInfo, String fingerName, String jtwSig .up().up().e(BIRINFO).e(INTEGRITY).t(FALSE).up().up().e(BDBINFO).e(FORMAT).e(ORGANIZATION).t(MOSIP).up() .e("Type").t("7").up().up().e(CREATIONDATE).t(today).up().e("Type").t("Finger").up().e(SUBTYPE) .t(fingerName).up().e(LEVEL).t("Raw").up().e(PURPOSE).t(ENROLL).up().e(QUALITY).e(ALGORITHM) - .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t(qualityScore).up().up().up() + .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t((int) Math.round(Double.parseDouble(qualityScore)) + "").up().up().up() .e(bdbKey).t(getBase64EncodedStringFromBase64URL(fingerInfo)).up().up(); if (jtwSign != null && payload != null) { jtwSign = Base64.getEncoder().encodeToString(jtwSign.getBytes()); @@ -257,7 +258,7 @@ static String buildBirFace(String faceInfo, String jtwSign, String payload, Stri .t("1").up().up().e(BIRINFO).e(INTEGRITY).t(FALSE).up().up().e(BDBINFO).e(FORMAT).e(ORGANIZATION) .t(MOSIP).up().e("Type").t("8").up().up().e(CREATIONDATE).t(today).up().e("Type").t("Face").up() .e(SUBTYPE).t("").up().e(LEVEL).t("Raw").up().e(PURPOSE).t(ENROLL).up().e(QUALITY).e(ALGORITHM) - .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t(qualityScore).up().up().up() + .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t((int) Math.round(Double.parseDouble(qualityScore)) + "").up().up().up() .e("BDB").t(getBase64EncodedStringFromBase64URL(faceInfo)).up().up(); if (jtwSign != null && payload != null) { jtwSign = Base64.getEncoder().encodeToString(jtwSign.getBytes()); @@ -280,7 +281,7 @@ static String buildBirExceptionPhoto(String faceInfo, String jtwSign, String pay .t("1").up().up().e(BIRINFO).e(INTEGRITY).t(FALSE).up().up().e(BDBINFO).e(FORMAT).e(ORGANIZATION) .t(MOSIP).up().e("Type").t("8").up().up().e(CREATIONDATE).t(today).up().e("Type").t("ExceptionPhoto") .up().e(SUBTYPE).t("").up().e(LEVEL).t("Raw").up().e(PURPOSE).t(ENROLL).up().e(QUALITY).e(ALGORITHM) - .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t(qualityScore).up().up().up() + .e(ORGANIZATION).t("HMAC").up().e("Type").t(SHA_256).up().up().e(SCORE).t((int) Math.round(Double.parseDouble(qualityScore)) + "").up().up().up() .e("BDB").t(faceInfo).up().up(); if (jtwSign != null && payload != null) { jtwSign = Base64.getEncoder().encodeToString(jtwSign.getBytes()); @@ -373,7 +374,7 @@ public static MDSRCaptureModel regenBiometricViaMDS(ResidentModel resident, Stri logger.error("Exception occured during startSBI " + contextKey, e); } if (port != 0) { - logger.info(contextKey, "Found the port " + contextKey + " port number is: " + port); + logger.info(contextKey + ", Found the port " + contextKey + " port number is: " + port); break; } @@ -394,7 +395,7 @@ public static MDSRCaptureModel regenBiometricViaMDS(ResidentModel resident, Stri HashMap portAsPerKey = BiometricDataProvider.portmap; setMDSscore(portAsPerKey.get("port_"), "Biometric Device", qualityScore); - logger.info(contextKey, "mds score is changed to : " + qualityScore); + logger.info(contextKey + ", mds score is changed to : " + qualityScore); // biodata = resident.getBiometric(); // This condition will address those scenarios where we are not passing any biometrics From 5de1ecd17f82d080e652e5768988ea6a4642bce5 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Wed, 7 Aug 2024 16:53:19 +0530 Subject: [PATCH 08/13] MOSIP-35107 - Updated the biometric details w.r.t mock mds java21 Signed-off-by: Mohanachandran S --- .../testrig/apirig/dataprovider/BiometricDataProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java index ad45768f88..adaca9effb 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java @@ -135,7 +135,7 @@ public static String toBase64Url(String input) { public static Boolean generateBiometricTestData(String mdsMode) throws Exception { ResidentModel resident = new ResidentModel(); String cbeff = null; - MDSRCaptureModel capture = BiometricDataProvider.regenBiometricViaMDS(resident, mdsMode, "70"); + MDSRCaptureModel capture = BiometricDataProvider.regenBiometricViaMDS(resident, mdsMode, 70); if (capture == null) { logger.error("Failed to generate biometric via mds"); return false; @@ -306,7 +306,7 @@ public static List getModalitiesByType(List bioExcepti return lst; } - public static void setMDSscore(long port, String type, String qualityScore) { + public static void setMDSscore(long port, String type, int qualityScore) { try { String requestBody = "{\"type\":\"" + type + "\",\"qualityScore\":\"" + qualityScore @@ -345,7 +345,7 @@ public static String getKeysDirPath(String certsDir, String moduleName) { return certsTargetDir + File.separator + certsModuleName + "-IDA-" + System.getProperty("env.user")+ ".mosip.net"; } - public static MDSRCaptureModel regenBiometricViaMDS(ResidentModel resident, String mdsMode, String qualityScore) + public static MDSRCaptureModel regenBiometricViaMDS(ResidentModel resident, String mdsMode, int qualityScore) throws Exception { BiometricDataModel biodata = null; MDSRCaptureModel capture = null; From e2d4feecb7165e5abbf91d1b16e45063f4cd30a4 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 10 Sep 2024 12:53:10 +0530 Subject: [PATCH 09/13] Reverted as per develop Signed-off-by: Mohanachandran S --- authentication-demo-service/pom.xml | 612 ++++++++++++---------------- pom.xml | 286 +++++++++++++ 2 files changed, 541 insertions(+), 357 deletions(-) create mode 100644 pom.xml diff --git a/authentication-demo-service/pom.xml b/authentication-demo-service/pom.xml index cc1db3e5d5..05769931c9 100644 --- a/authentication-demo-service/pom.xml +++ b/authentication-demo-service/pom.xml @@ -1,388 +1,286 @@ - - 4.0.0 + + + 4.0.0 - - io.mosip.testrig.authentication.demo - 1.2.1-java21-SNAPSHOT - authentication-demo-service - authentication-demo-service - Parent project of MOSIP functional tests - https://github.com/mosip/mosip-functional-tests - jar + io.mosip.testrig + mosip-functional-test + 1.2.1-SNAPSHOT + pom + mosip-function-test + Parent project of MOSIP Functional test + mosip-functional-tests - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + - - scm:git:git://github.com/mosip/mosip-functional-tests.git - scm:git:ssh://github.com:mosip/mosip-functional-tests.git - https://github.com/mosip/mosip-functional-tests - HEAD - + + scm:git:git://github.com/mosip/mosip-functional-tests.git + scm:git:ssh://github.com:mosip/mosip-functional-tests.git + https://github.com/mosip/mosip-functional-tests + HEAD + - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/mosip-functional-tests - - - - - - local-maven-repo - file:///${basedir}/lib - - - - snapshots-repo - https://oss.sonatype.org/content/repositories/snapshots - false - true - + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/mosip-functional-tests + + + - releases-repo - https://oss.sonatype.org/service/local/staging/deploy/maven2 - false - false - - + ossrh + CentralRepository + https://oss.sonatype.org/content/repositories/snapshots + default + + true + + - danubetech-maven-public - https://repo.danubetech.com/repository/maven-public/ - - - - - - 3.2.3 - 2.0.0.RELEASE - - 21 - 21 - 3.8.0 - 3.0.1 - 2.9.2 - 0.8.2 - false - - 1.2.1-java21-SNAPSHOT - - - - + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + + - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - - - commons-io - commons-io - - - javax.ws.rs - javax.ws.rs-api - 2.0 - - - org.glassfish.jersey.core - jersey-common - test - - - io.mosip.authentication - authentication-core - 1.2.1-java21-SNAPSHOT - - - commons-codec - commons-codec - - - - - commons-fileupload - commons-fileupload - + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + - - org.mockito - mockito-core - + + UTF-8 - - io.mosip.kernel - kernel-core - 1.2.1-java21-SNAPSHOT - - - org.springframework.boot - - spring-boot-starter-security - - - - commons-codec - commons-codec - - - - - io.mosip.kernel - kernel-websubclient-api - ${kernel-websubclient-api.version} - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.apache.httpcomponents - httpclient - - - commons-codec - commons-codec - - - + + 21 + 21 + 3.7.0.1746 + 0.8.11 + 0.8.11 - - - org.apache.httpcomponents - httpmime - 4.5.7 - - - org.json - json - 20180813 - - - org.apache.commons - commons-lang3 - - - org.tensorflow - tensorflow - 1.12.0 - + + io.mosip.testrig.apirig.apitest.commons/** + + io.mosip.testrig.apirig.apitest.commons/** + - - org.apache.commons - commons-io - 1.3.2 - + + authentication-demo-service + - - - commons-lang - commons-lang - 2.4 - - - org.apache.commons - commons-text - 1.6 - - - commons-codec - commons-codec - - - io.mosip.kernel - kernel-templatemanager-velocity - 1.2.1-java21-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-config - - - org.postgresql - postgresql - - - com.github.jai-imageio - jai-imageio-jpeg2000 - 1.3.0 - - - org.json - json - 20180813 - - - io.mosip.kernel - kernel-keymanager-service - 1.2.1-java21-SNAPSHOT - lib - - - org.springframework.boot - - spring-boot-starter-security - - - - - - dom4j - dom4j - 1.6.1 - - - org.junit.vintage - junit-vintage-engine - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.5.0 - - - - - - io.mosip.kernel - kernel-bom - 1.2.1-java21-SNAPSHOT - pom - import - - - - - - + + + org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - + maven-surefire-plugin - none + ${skipTests} + false + + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.time=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.time.format=ALL-UNNAMED + - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - ZIP - - - - - build-info - repackage - - - - - - + org.apache.maven.plugins - maven-gpg-plugin - 1.5 + maven-javadoc-plugin - sign-artifacts - verify - - sign + attach-javadocs + + jar - - - --pinentry-mode - loopback - - - - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/service-git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - - + + none + -Xdoclint:none + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + false + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + ${project.name} + ${project.version} + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + true + true + + + ${project.name} + ${project.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + validate + + + + true + git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} + + -parameters + ${maven.compiler.source} ${maven.compiler.target} - - org.jacoco - jacoco-maven-plugin - - - **/constant/** - **/config/** - **/dto/** - io/mosip/authentication/service/*.class - io/mosip/authentication/service/filter/** - io/mosip/demo/authentication/service/IdAuthenticationDemoApplication.class - - - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + + + + sonar + + . + src/main/java/**,src/main/resources/** + ${sonar.coverage.exclusions} + https://sonarcloud.io + true + + + false + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${maven.sonar.plugin.version} + + + verify + + sonar + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..306e1ddc56 --- /dev/null +++ b/pom.xml @@ -0,0 +1,286 @@ + + + 4.0.0 + + io.mosip.testrig + mosip-functional-test + 1.2.1-SNAPSHOT + pom + mosip-function-test + Parent project of MOSIP Functional test + mosip-functional-tests + + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + + + scm:git:git://github.com/mosip/mosip-functional-tests.git + scm:git:ssh://github.com:mosip/mosip-functional-tests.git + https://github.com/mosip/mosip-functional-tests + HEAD + + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/mosip-functional-tests + + + + + + ossrh + CentralRepository + https://oss.sonatype.org/content/repositories/snapshots + default + + true + + + + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + UTF-8 + + + 21 + 21 + 3.7.0.1746 + 0.8.11 + 0.8.11 + + + io.mosip.testrig.apirig.apitest.commons/** + + io.mosip.testrig.apirig.apitest.commons/** + + + + authentication-demo-service + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skipTests} + false + + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.time=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.time.format=ALL-UNNAMED + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + none + -Xdoclint:none + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + false + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + ${project.name} + ${project.version} + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + true + true + + + ${project.name} + ${project.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + validate + + + + true + git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + -parameters + + ${maven.compiler.source} + ${maven.compiler.target} + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + + + + sonar + + . + src/main/java/**,src/main/resources/** + ${sonar.coverage.exclusions} + https://sonarcloud.io + true + + + false + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${maven.sonar.plugin.version} + + + verify + + sonar + + + + + + + + + From 4b60d99b96097fc974bf528872a98b8454555bf6 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 10 Sep 2024 12:59:30 +0530 Subject: [PATCH 10/13] Reverted as per develop Signed-off-by: Mohanachandran S --- .../dataprovider/BiometricDataProvider.java | 1 - authentication-demo-service/pom.xml | 615 ++++++++++-------- 2 files changed, 360 insertions(+), 256 deletions(-) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java index adaca9effb..871201572c 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java @@ -64,7 +64,6 @@ public class BiometricDataProvider { public static HashMap portmap = new HashMap(); - //private static final Logger logger = LoggerFactory.getLogger(BiometricDataProvider.class); private static final Logger logger = Logger.getLogger(BiometricDataProvider.class); // String constants diff --git a/authentication-demo-service/pom.xml b/authentication-demo-service/pom.xml index 05769931c9..89e048b3be 100644 --- a/authentication-demo-service/pom.xml +++ b/authentication-demo-service/pom.xml @@ -1,286 +1,391 @@ - - - 4.0.0 + + 4.0.0 - io.mosip.testrig - mosip-functional-test - 1.2.1-SNAPSHOT - pom - mosip-function-test - Parent project of MOSIP Functional test - mosip-functional-tests + + io.mosip.testrig.authentication.demo + 1.2.1-SNAPSHOT + authentication-demo-service + authentication-demo-service + Parent project of MOSIP functional tests + https://github.com/mosip/mosip-functional-tests + jar - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + - - scm:git:git://github.com/mosip/mosip-functional-tests.git - scm:git:ssh://github.com:mosip/mosip-functional-tests.git - https://github.com/mosip/mosip-functional-tests - HEAD - + + scm:git:git://github.com/mosip/mosip-functional-tests.git + scm:git:ssh://github.com:mosip/mosip-functional-tests.git + https://github.com/mosip/mosip-functional-tests + HEAD + - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/mosip-functional-tests - - + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/mosip-functional-tests + + + + + + local-maven-repo + file:///${basedir}/lib + + + + snapshots-repo + https://oss.sonatype.org/content/repositories/snapshots + false + true + - - - ossrh - CentralRepository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - central - MavenCentral - default - https://repo1.maven.org/maven2 - - false - - - + releases-repo + https://oss.sonatype.org/service/local/staging/deploy/maven2 + false + false + - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + danubetech-maven-public + https://repo.danubetech.com/repository/maven-public/ + + - - UTF-8 + + + 3.2.3 + 2.0.0.RELEASE + + 21 + 21 + 3.8.0 + 3.0.1 + 2.9.2 + 0.8.2 + + 1.2.1-SNAPSHOT + + - - 21 - 21 - 3.7.0.1746 - 0.8.11 - 0.8.11 + - - io.mosip.testrig.apirig.apitest.commons/** - - io.mosip.testrig.apirig.apitest.commons/** - + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + + + commons-io + commons-io + + + javax.ws.rs + javax.ws.rs-api + 2.0 + + + org.glassfish.jersey.core + jersey-common + test + + + io.mosip.authentication + authentication-core + 1.2.1-SNAPSHOT + + + commons-codec + commons-codec + + + org.springdoc + springdoc-openapi-ui + + + + + commons-fileupload + commons-fileupload + - - authentication-demo-service - + + org.mockito + mockito-core + - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skipTests} - false - - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.base/java.net=ALL-UNNAMED - --add-opens=java.base/java.time=ALL-UNNAMED - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.time.format=ALL-UNNAMED - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - none - -Xdoclint:none - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - false - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - true - - - ${project.name} - ${project.version} - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - true - true - - - ${project.name} - ${project.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - + + io.mosip.kernel + kernel-core + 1.2.1-SNAPSHOT + + + org.springframework.boot + + spring-boot-starter-security + + + + commons-codec + commons-codec + + + + + io.mosip.kernel + kernel-websubclient-api + ${kernel-websubclient-api.version} + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.apache.httpcomponents + httpclient + + + commons-codec + commons-codec + + + + + + + org.apache.httpcomponents + httpmime + 4.5.7 + + + org.json + json + 20180813 + + + org.apache.commons + commons-lang3 + + + org.tensorflow + tensorflow + 1.12.0 + + + + org.apache.commons + commons-io + 1.3.2 + + + + + commons-lang + commons-lang + 2.4 + + + org.apache.commons + commons-text + 1.6 + + + commons-codec + commons-codec + + + io.mosip.kernel + kernel-templatemanager-velocity + 1.2.1-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-config + + + org.postgresql + postgresql + + + com.github.jai-imageio + jai-imageio-jpeg2000 + 1.3.0 + + + org.json + json + 20180813 + + + io.mosip.kernel + kernel-keymanager-service + 1.2.1-SNAPSHOT + lib + + + org.springframework.boot + + spring-boot-starter-security + + + + + + dom4j + dom4j + 1.6.1 + + + org.junit.vintage + junit-vintage-engine + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.5.0 + + + + + + io.mosip.kernel + kernel-bom + 1.2.1-SNAPSHOT + pom + import + + + + + + org.apache.maven.plugins - maven-gpg-plugin + maven-javadoc-plugin - sign-artifacts - verify + attach-javadocs - sign + jar - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - - - get-the-git-infos - - revision - - validate - true - git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - + none - + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + ZIP + + + + + build-info + repackage + + + + + + + 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}/service-git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + org.apache.maven.plugins maven-compiler-plugin + ${maven.compiler.version} - - -parameters - ${maven.compiler.source} ${maven.compiler.target} - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - - - - sonar - - . - src/main/java/**,src/main/resources/** - ${sonar.coverage.exclusions} - https://sonarcloud.io - true - - - false - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${maven.sonar.plugin.version} - - - verify - - sonar - - - - - - - - + + org.jacoco + jacoco-maven-plugin + + + **/constant/** + **/config/** + **/dto/** + io/mosip/authentication/service/*.class + io/mosip/authentication/service/filter/** + io/mosip/demo/authentication/service/IdAuthenticationDemoApplication.class + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + \ No newline at end of file From de66d51439502801ed62cb1c6f2f1d62bacf4fc8 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 10 Sep 2024 17:32:11 +0530 Subject: [PATCH 11/13] MOSIP-35671 - migrating to java21 Signed-off-by: Mohanachandran S --- .../main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java index d1b8b6660d..bfc1b2800b 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java @@ -17,6 +17,7 @@ import java.io.OutputStreamWriter; import java.io.StringReader; import java.lang.reflect.Type; +import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; import java.net.URISyntaxException; @@ -5724,7 +5725,7 @@ public static String generateHbsForPrereg(boolean isItUpdate) { org.json.JSONObject responseJson = new org.json.JSONObject(response.asString()); org.json.JSONObject schemaData = (org.json.JSONObject) responseJson.get(GlobalConstants.RESPONSE); - Double schemaVersion = (Double) schemaData.get(GlobalConstants.ID_VERSION); + Double schemaVersion = ((BigDecimal) schemaData.get(GlobalConstants.ID_VERSION)).doubleValue(); logger.info(schemaVersion); String schemaJsonData = schemaData.getString(GlobalConstants.SCHEMA_JSON); From 42433ad07c8dcd92c4d89c4a62cea14da35e4220 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Tue, 10 Sep 2024 17:45:30 +0530 Subject: [PATCH 12/13] MOSIP-35671 - migrating to java21 Signed-off-by: Mohanachandran S --- .github/workflows/apitest-push-trigger.yml | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/apitest-push-trigger.yml b/.github/workflows/apitest-push-trigger.yml index c3f27d1a17..d705909de1 100644 --- a/.github/workflows/apitest-push-trigger.yml +++ b/.github/workflows/apitest-push-trigger.yml @@ -56,6 +56,33 @@ jobs: uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: ./apitest-commons + 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-authentication-demo-service: + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 + with: + SERVICE_LOCATION: ./authentication-demo-service + BUILD_ARTIFACT: authentication-demo-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 }} + + sonar_analysis-authentication-demo-service: + needs: build-maven-authentication-demo-service + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + with: + SERVICE_LOCATION: ./authentication-demo-service secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} ORG_KEY: ${{ secrets.ORG_KEY }} From bd02d8583471e12158911fcb7c34fd20b5e100bf Mon Sep 17 00:00:00 2001 From: Nandhukumar Date: Wed, 11 Sep 2024 15:16:23 +0530 Subject: [PATCH 13/13] MOSIP-35700 Signed-off-by: Nandhukumar --- .../testrig/apirig/utils/AdminTestUtil.java | 47 +++++-------------- .../apirig/utils/OutputValidationUtil.java | 3 +- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java index d1b8b6660d..b54d22c04e 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java @@ -1,8 +1,7 @@ package io.mosip.testrig.apirig.utils; import static io.restassured.RestAssured.given; -import de.mkammerer.argon2.Argon2; -import de.mkammerer.argon2.Argon2Factory; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -33,8 +32,6 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDate; @@ -56,6 +53,8 @@ import java.util.Set; import java.util.TimeZone; import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.ws.rs.core.MediaType; @@ -79,9 +78,7 @@ import org.testng.SkipException; import org.yaml.snakeyaml.Yaml; -import java.lang.Double; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.jknack.handlebars.Context; import com.github.jknack.handlebars.Handlebars; @@ -119,8 +116,6 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.Response; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @author Ravi Kant @@ -2737,9 +2732,8 @@ public String getAutogenIdKeyName(String testCaseName, String fieldName) { return null; int indexof = testCaseName.indexOf("_"); String autogenIdKeyName = testCaseName.substring(indexof + 1); - if ((!BaseTestCase.isTargetEnvLTS() || isOTPEnabled().equals("false")) && fieldName.equals("VID") - && (BaseTestCase.currentModule.equals("auth") || BaseTestCase.currentModule.equals("esignet") - || BaseTestCase.currentModule.equals(GlobalConstants.MIMOTO))) + if ((!BaseTestCase.isTargetEnvLTS()) && fieldName.equals("VID") + && (BaseTestCase.currentModule.equals("auth") || BaseTestCase.currentModule.equals("esignet"))) autogenIdKeyName = autogenIdKeyName + "_" + fieldName.toLowerCase(); else autogenIdKeyName = autogenIdKeyName + "_" + fieldName; @@ -3397,10 +3391,6 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) { jsonString = replaceKeywordWithValue(jsonString, "$DOB$", getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.date-of-birth.pattern")); } - if (jsonString.contains("$GETCLIENTIDFROMMIMOTOACTUATOR$")) { - jsonString = replaceKeywordWithValue(jsonString, "$GETCLIENTIDFROMMIMOTOACTUATOR$", - getValueFromMimotoActuator("overrides", "mimoto.oidc.partner.clientid")); - } if (jsonString.contains("$IDPREDIRECTURI$")) { jsonString = replaceKeywordWithValue(jsonString, "$IDPREDIRECTURI$", ApplnURI.replace(GlobalConstants.API_INTERNAL, "healthservices") + "/userprofile"); @@ -5165,7 +5155,7 @@ else if (eachRequiredProp.equals("password")) { } } } - if (selectedHandles != null) { + if (selectedHandles != null && selectedHandles.size()>=1) { setfoundHandlesInIdSchema(true); identityJson.put("selectedHandles", selectedHandles); } @@ -6538,17 +6528,16 @@ public static String getValueFromActuator(String section, String key) { } public static JSONArray mimotoActuatorResponseArray = null; - private static String otpEnabled = "true"; - - public static String isOTPEnabled() { - String value = getValueFromMimotoActuator("/mimoto-default.properties", "mosip.otp.download.enable"); - if (value != null && !(value.isBlank())) - otpEnabled = value; - return otpEnabled; - } public static String getValueFromMimotoActuator(String section, String key) { String url = ApplnURI + propsKernel.getProperty("actuatorMimotoEndpoint"); + if (!(System.getenv("useOldContextURL") == null) + && !(System.getenv("useOldContextURL").isBlank()) + && System.getenv("useOldContextURL").equalsIgnoreCase("true")) { + if (url.contains("/v1/mimoto/")) { + url = url.replace("/v1/mimoto/", "/residentmobileapp/"); + } + } String actuatorCacheKey = url + section + key; String value = actuatorValueCache.get(actuatorCacheKey); if (value != null && !value.isEmpty()) @@ -6846,16 +6835,6 @@ else if (testCaseName.startsWith("IdRepository_") && testCaseName.contains("Inva && (!isElementPresent(new JSONArray(schemaRequiredField), individualBiometrics))) { throw new SkipException(GlobalConstants.FEATURE_NOT_SUPPORTED_MESSAGE); } - } else if (BaseTestCase.currentModule.equalsIgnoreCase(GlobalConstants.MIMOTO)) { - if (isOTPEnabled().equals("false") && (testCaseDTO.getEndPoint().contains(GlobalConstants.SEND_OTP_ENDPOINT) - || testCaseDTO.getInput().contains(GlobalConstants.SEND_OTP_ENDPOINT) - || testCaseName.startsWith(GlobalConstants.MIMOTO_CREDENTIAL_STATUS))) { - throw new SkipException(GlobalConstants.OTP_FEATURE_NOT_SUPPORTED); - } else if (isOTPEnabled().equals("true") - && testCaseDTO.getEndPoint().contains(GlobalConstants.CREATE_VID_ENDPOINT)) { - throw new SkipException( - GlobalConstants.VID_GENERATED_USING_RESIDENT_API_SO_FEATURE_NOT_SUPPORTED_OR_NEEDED_MESSAGE); - } } if ((ConfigManager.isInServiceNotDeployedList(GlobalConstants.ESIGNET)) diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/OutputValidationUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/OutputValidationUtil.java index 6d9ee59985..82d3f6b839 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/OutputValidationUtil.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/OutputValidationUtil.java @@ -581,7 +581,8 @@ public static boolean doesResponseHasErrorCode(String responseString, String all public static void reportServerIssues(String responseString, TestCaseDTO testCaseDTO) throws AdminTestException { if (responseString.startsWith("") || responseString.startsWith("