From eb0d0348ef03389c2e203f41ab503cf2c08cc894 Mon Sep 17 00:00:00 2001
From: tanya732 <sinha.tanya26@gmail.com>
Date: Tue, 19 May 2026 09:45:41 +0530
Subject: [PATCH] chore: Update CI/CD workflows for v2

---
 .github/workflows/build-and-test.yml | 5 +++--
 .github/workflows/codeql.yml         | 6 +++---
 .github/workflows/release.yml        | 4 ++--
 .github/workflows/sca_scan.yml       | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 01fc2b7..86cccb2 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -2,9 +2,10 @@ name: auth0/auth0-java-mvc-common/build-and-test
 
 on:
   pull_request:
+    branches: ["master", "v2"]
   merge_group:
   push:
-    branches: ["master", "v1", "v2"]
+    branches: ["master"]
 
 jobs:
   gradle:
@@ -14,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+          java-version: 17
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d2d2850..fd87aef 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "v1", "v2"]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "master", "v1" ]
+    branches: [ "master", "v2" ]
   schedule:
     - cron: "30 19 * * 6"
 
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+          java-version: 17
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c87ece..1f582e1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
   rl-scanner:
     uses: ./.github/workflows/rl-secure.yml
     with:
-      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+      java-version: 17
       artifact-name: "auth0-java-mvc-common.tgz"
     secrets:
       RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
@@ -32,7 +32,7 @@ jobs:
     uses: ./.github/workflows/java-release.yml
     needs: rl-scanner
     with:
-      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+      java-version: 17
     secrets:
       ossr-username: ${{ secrets.OSSR_USERNAME }}
       ossr-token: ${{ secrets.OSSR_TOKEN }}
diff --git a/.github/workflows/sca_scan.yml b/.github/workflows/sca_scan.yml
index 5f82e75..01717f7 100644
--- a/.github/workflows/sca_scan.yml
+++ b/.github/workflows/sca_scan.yml
@@ -2,14 +2,14 @@ name: SCA
 
 on:
   push:
-    branches: ["master", "v1", "v2"]
+    branches: ["master"]
   pull_request:
-    branches: ["master", "v1", "v2"]
+    branches: ["master", "v2"]
 
 jobs:
   snyk-cli:
     uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
     with:
       additional-arguments: "--exclude=README.md"
-      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+      java-version: "17"
     secrets: inherit