Merge remote-tracking branch 'upstream/develop' into develop

Sohandey · Sep 11, 2024 · 947aa20 · 947aa20
2 parents c9b63e2 + 154d68d
commit 947aa20
Show file tree

Hide file tree

Showing 6 changed files with 377 additions and 548 deletions.
diff --git 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:
@@ -49,23 +49,22 @@ jobs:
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
-# api test commons is not migrated to java 21 so commenting out for now so that auth demo service sonar will work.
-
-#  sonar_analysis:
-#    needs: build-maven-apitest-commons
-#    if: "${{  github.event_name != 'pull_request' }}"
-#    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
-#    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 }}
 
+  sonar_analysis:
+    needs: build-maven-apitest-commons
+    if: "${{  github.event_name != 'pull_request' }}"
+    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:
@@ -91,4 +90,4 @@ jobs:
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}