From 251e7e153a65a6e267273791015fe982b44fd8b2 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:09:19 +0530 Subject: [PATCH 1/8] MOSIP- Signed-off-by: techno-467 --- .github/keys/mosipgpgkey_pub.gpg | Bin 0 -> 1270 bytes .github/keys/mosipgpgkey_sec.gpg | Bin 0 -> 2663 bytes .github/workflows/push-trigger.yml | 65 +++++++++++++++++++++++++++++ nfiq1.0/pom.xml | 15 +++++++ 4 files changed, 80 insertions(+) create mode 100644 .github/keys/mosipgpgkey_pub.gpg create mode 100644 .github/keys/mosipgpgkey_sec.gpg create mode 100644 .github/workflows/push-trigger.yml diff --git a/.github/keys/mosipgpgkey_pub.gpg b/.github/keys/mosipgpgkey_pub.gpg new file mode 100644 index 0000000000000000000000000000000000000000..4bdb1a947beaa877a93b56a2074580cdd9bf0578 GIT binary patch literal 1270 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 SkkiE(Bh1Lh;14qU=Klc8TJt&p literal 0 HcmV?d00001 diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml new file mode 100644 index 0000000..7c21407 --- /dev/null +++ b/.github/workflows/push-trigger.yml @@ -0,0 +1,65 @@ +name: Maven Package upon a push + +on: + release: + types: [published] + pull_request: + types: [opened, reopened, synchronize] + workflow_dispatch: + inputs: + message: + description: 'Message for manually triggering' + required: false + default: 'Triggered for Updates' + type: string + push: + branches: + - '!release-branch' + - 'MOSIP*' + - 'develop*' + - 'master' + - '1.*' + +jobs: + build-maven-nfiq: + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 + with: + SERVICE_LOCATION: ./nfiq1.0 + BUILD_ARTIFACT: nfiq + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + + publish_to_nexus: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-nfiq + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 + with: + SERVICE_LOCATION: ./nfiq1.0 + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + sonar_analysis: + needs: build-maven-nfiq + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + with: + SERVICE_LOCATION: ./nfiq1.0 + PROJECT_KEY: 'mosip_nfiq' + 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 }} \ No newline at end of file diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index a1bee9a..155fda2 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -9,6 +9,21 @@ NFIQ https://https://github.com/mosip/nfiq + + scm:git:git://github.com/mosip/mosip-ref-impl.git + scm:git:ssh://github.com:mosip/mosip-ref-impl.git + https://github.com/mosip/mosip-ref-impl + HEAD + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/mosip-ref-impl + + + UTF-8 21 From b97a6c0bec5eb34a72f811a8d41e339edcf11aca Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:19:54 +0530 Subject: [PATCH 2/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 155fda2..d2f5a4d 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -139,6 +139,28 @@ + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + org.apache.maven.plugins maven-jar-plugin From 203fe29ab70c30090c5f3057015905b78c9e8a60 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:22:28 +0530 Subject: [PATCH 3/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index d2f5a4d..3dedb87 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -10,9 +10,9 @@ https://https://github.com/mosip/nfiq - scm:git:git://github.com/mosip/mosip-ref-impl.git - scm:git:ssh://github.com:mosip/mosip-ref-impl.git - https://github.com/mosip/mosip-ref-impl + scm:git:git://github.com/mosip/nfiq.git + scm:git:ssh://github.com:mosip/nfiq.git + https://github.com/mosip/nfiq HEAD @@ -20,7 +20,7 @@ Mosip mosip.emailnotifier@gmail.com io.mosip - https://github.com/mosip/mosip-ref-impl + https://github.com/mosip/nfiq From b6b1ef9660d126f13a4226c5c181172dbd73f32a Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:25:52 +0530 Subject: [PATCH 4/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 3dedb87..5c3f481 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -318,28 +318,4 @@ - - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - - - - scm:git:git://github.com/mosip/nfiq.git - scm:git:ssh://github.com:mosip/nfiq.git - https://github.com/mosip/converters - HEAD - - - - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/nfiq - - - \ No newline at end of file From 6429804eea81ee28f570515b8c46dea4b510bf17 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:28:22 +0530 Subject: [PATCH 5/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 5c3f481..3b2fd92 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -9,12 +9,20 @@ NFIQ https://https://github.com/mosip/nfiq + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + scm:git:git://github.com/mosip/nfiq.git scm:git:ssh://github.com:mosip/nfiq.git https://github.com/mosip/nfiq HEAD + Mosip From d8b5ab89b8a1421bec9e07a1b990675dcf86ebc4 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:41:37 +0530 Subject: [PATCH 6/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 3b2fd92..83ef5f3 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + ${maven.gpg.plugin.version} sign-artifacts From e4ff52a943c68dec6d99452d87f7ea7e44c1868b Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 13:46:26 +0530 Subject: [PATCH 7/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 83ef5f3..7b7315c 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -5,7 +5,7 @@ io.mosip nfiq1.0 0.0.1-SNAPSHOT - kernel-bio-converter + nfiq1.0 NFIQ https://https://github.com/mosip/nfiq @@ -48,7 +48,7 @@ 3.1.1 3.3.1 3.2.0 - 3.2.3 + 1.5 3.0.2 3.1.0 2.22.0 From f93a24f79ff61aebf64c0facdc0688c1dce3df85 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 9 Aug 2024 14:13:32 +0530 Subject: [PATCH 8/8] MOSIP- Signed-off-by: techno-467 --- nfiq1.0/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nfiq1.0/pom.xml b/nfiq1.0/pom.xml index 7b7315c..7901e3a 100644 --- a/nfiq1.0/pom.xml +++ b/nfiq1.0/pom.xml @@ -48,7 +48,6 @@ 3.1.1 3.3.1 3.2.0 - 1.5 3.0.2 3.1.0 2.22.0 @@ -151,7 +150,7 @@ org.apache.maven.plugins maven-gpg-plugin - ${maven.gpg.plugin.version} + 1.5 sign-artifacts