Merge pull request #1514 from microsoftgraph/dev

Release 3.1.3

Author: ramsessanchez

.github/dependabot.yml

@@ -18,53 +18,8 @@ updates:
     kiota-dependencies:
       patterns:
         - "*kiota*"
-- package-ecosystem: gradle
-  directory: "/samples/deviceCodeSample"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: gradle
-  directory: "/samples/interactiveBrowserSample"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
-      patterns:
-        - "*kiota*"
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: gradle
-  directory: "/"
-  target-branch: v3/longTermBranch
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
-      patterns:
-        - "*kiota*"
-- package-ecosystem: gradle
-  directory: "/android"
-  target-branch: v3/longTermBranch
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
-      patterns:
-        - "*kiota*"
 - package-ecosystem: maven
   directory: "/"
-  target-branch: v3/longTermBranch
   schedule:
     interval: daily
   open-pull-requests-limit: 10
@@ -74,7 +29,6 @@ updates:
         - "*kiota*"
 - package-ecosystem: github-actions
   directory: "/"
-  target-branch: v3/longTermBranch
   schedule:
     interval: daily
   open-pull-requests-limit: 10

.github/policies/msgraph-sdk-java-core-branch-protection.yml

@@ -85,9 +85,9 @@ configuration:
     # Restrict who can dismiss pull request reviews. boolean
     restrictsReviewDismissals: false
 
-  - branchNamePattern: v3/longTermBranch
-    # This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
-    # v3/longTermBranch
+  - branchNamePattern: support/2.x.x
+    # This branch pattern applies to the following branches as of 2/14/2024 12:24
+    # support/2.x.x
 
     # Specifies whether this branch can be deleted. boolean
     allowsDeletions: false
@@ -111,15 +111,14 @@ configuration:
     requiresLinearHistory: false
     # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
     requiredStatusChecks:
-    - Analyze (java)
-    - Build
-    - build
     - license/cla
+    - Build
     - lint-api-level
+    - Analyze (java)
+    - build
     # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
     requiresStrictStatusChecks: true
     # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
     restrictsReviewDismissals: false
-

.github/workflows/api-level-lint.yml

@@ -3,15 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level"
 on:
   workflow_dispatch:
   push:
-    branches:
-      - dev
-      - master
-      - v3/longTermBranch
+    branches: [dev, master, support/2.x.x]
   pull_request:
-    branches:
-      - dev
-      - master
-      - v3/longTermBranch
+    branches: [dev, master, support/2.x.x]
 
 jobs:
   lint-api-level:

.github/workflows/auto-merge-dependabot.yml

@@ -2,7 +2,7 @@ name: Auto-merge dependabot updates
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ dev ]
 
 permissions:
   pull-requests: write

.github/workflows/build-and-publish.yml

@@ -2,7 +2,7 @@ name: Build and Publish
 
 on:
   push:
-    branches: [ dev , master, v3/longTermBranch ]
+    branches: [dev, master, support/2.x.x]
     paths-ignore:
       - '.gradle/wrapper'
       - '.gitignore'
@@ -15,7 +15,7 @@ env:
 
 jobs:
   maven_Preview:
-    if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/v3/longTermBranch'}}
+    if: ${{ github.ref == 'refs/heads/dev' }}
     environment: 
       name: maven_central_snapshot
     runs-on: ubuntu-latest
@@ -96,6 +96,8 @@ jobs:
   create_Tag:
     needs: maven_Release
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     env:
       RELEASE_TAG: ""
     steps:

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: ["dev", "master", "v3/longTermBranch"]
+    branches: [dev, master, support/2.x.x]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: ["dev", "v3/longTermBranch"]
+    branches: [dev, support/2.x.x]
   schedule:
     - cron: '0 1 * * 4'
   workflow_dispatch:

.github/workflows/conflicting-pr-label.yml

@@ -7,10 +7,10 @@ name: PullRequestConflicting
 on:
   workflow_dispatch:
   push:
-    branches: [ master, dev ]
+    branches: [master, dev, support/2.x.x]
   pull_request:
     types: [synchronize]
-    branches: [ master, dev ]
+    branches: [master, dev, support/2.x.x]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

.github/workflows/git-release.yml

@@ -9,10 +9,12 @@ on:
 jobs:
   Git_Release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
       - name: Download Build Artifact
-        uses: dawidd6/action-download-artifact@v3.0.0
+        uses: dawidd6/action-download-artifact@v3.1.0
         with:
           workflow: build-and-publish.yml
           workflow_conclusion: success

.github/workflows/gradle-build.yml

@@ -2,7 +2,7 @@ name: Java CI with Gradle
 
 on:
   pull_request:
-    branches: [ dev, master, v3/longTermBranch ] 
+    branches: [dev, master, support/2.x.x]
     paths-ignore:
       - '.gradle/wrapper'
       - '.gitignore'