From fb36679d5c8cebfaa9b886f8d5aa4b464c859fed Mon Sep 17 00:00:00 2001
From: Manmohan Shaw <manmohan.shaw@okta.com>
Date: Sat, 23 Aug 2025 08:34:24 +0530
Subject: [PATCH 1/3] Add Snyk Support in CCI

OKTA-802778
---
 .circleci/config.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62be6fe..31ffe95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,6 +80,17 @@ jobs:
               --commit $CIRCLE_SHA1 \
               --build-env "circleci" \
               --suppress_output    
+  snyk-scan:
+    docker:
+      - image: cimg/openjdk:17.0.6
+    steps:
+      - checkout
+      - run: ./mvnw clean install -Pci -Dlicense.skip=true -Dmaven.test.skip.exec=true
+      - general-platform-helpers/step-run-snyk-monitor:
+          scan-all-projects: true
+          skip-unresolved: false
+          run-on-non-main: true
+          additional-arguments: "--maven-aggregate-project"
 
 workflows:
   build_and_test:
@@ -93,6 +104,18 @@ workflows:
           name: "Scan with Semgrep"
           context:
             - static-analysis
+  snyk-scan:
+    jobs: 
+      - snyk-scan:
+          name: execute-snyk
+          requires:
+            - jdk17
+          filters:
+            branches:
+              only:
+                - master
+                - main
+                - OKTA-802778
   "Malware Scanner":
     jobs:
       - reversing-labs:

From 95d99c5d8d60d325cb10a03041dd11dfc1543b74 Mon Sep 17 00:00:00 2001
From: Manmohan Shaw <manmohan.shaw@okta.com>
Date: Sat, 23 Aug 2025 08:36:31 +0530
Subject: [PATCH 2/3] Updated config.yml

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31ffe95..e341025 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,8 +108,6 @@ workflows:
     jobs: 
       - snyk-scan:
           name: execute-snyk
-          requires:
-            - jdk17
           filters:
             branches:
               only:

From 6b20543616cf9343a90b6d9cef4cae420daf8daa Mon Sep 17 00:00:00 2001
From: Manmohan Shaw <manmohan.shaw@okta.com>
Date: Mon, 25 Aug 2025 13:09:14 +0530
Subject: [PATCH 3/3] Update config.yml

---
 .circleci/config.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e341025..31c3b0e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,20 +100,23 @@ workflows:
       - jdk21
   semgrep:
     jobs:
+      - jdk17
       - platform-helpers/job-semgrep-scan:
           name: "Scan with Semgrep"
           context:
             - static-analysis
-  snyk-scan:
-    jobs: 
       - snyk-scan:
           name: execute-snyk
+          requires:
+            - jdk17
           filters:
             branches:
               only:
                 - master
                 - main
                 - OKTA-802778
+          context:
+            - static-analysis
   "Malware Scanner":
     jobs:
       - reversing-labs: