clean up workflows

Author: ramsessanchez

.github/dependabot.yml

@@ -39,7 +39,6 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  target-branch: feature/6.0
   groups:
     kiota-dependencies:
       patterns:
@@ -49,7 +48,6 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  target-branch: feature/6.0
   groups:
     kiota-dependencies:
       patterns:
@@ -59,7 +57,6 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  target-branch: feature/6.0
   groups:
     kiota-dependencies:
       patterns:
@@ -69,4 +66,3 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  target-branch: feature/6.0

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

@@ -46,40 +46,3 @@ configuration:
     # Restrict who can dismiss pull request reviews. boolean
     restrictsReviewDismissals: false
 
-  - branchNamePattern: feature/6.0
-    # This branch pattern applies to the following branches as of 06/12/2023 10:31:15:
-    # feature/6.0
-
-    # Specifies whether this branch can be deleted. boolean
-    allowsDeletions: false
-    # Specifies whether forced pushes are allowed on this branch. boolean
-    allowsForcePushes: false
-    # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
-    dismissStaleReviews: true
-    # Specifies whether admins can overwrite branch protection. boolean
-    isAdminEnforced: false
-    # Indicates whether "Require a pull request before merging" is enabled. boolean
-    requiresPullRequestBeforeMerging: true
-    # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
-    requiredApprovingReviewsCount: 1
-    # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
-    requireCodeOwnersReview: true
-    # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
-    requiresCommitSignatures: false
-    # Are conversations required to be resolved before merging? boolean
-    requiresConversationResolution: true
-    # Are merge commits prohibited from being pushed to this branch. boolean
-    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)
-    - lint-api-level
-    - license/cla
-    - 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,13 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level"
 on:
   workflow_dispatch:
   push:
-    branches:
-      - dev
-      - feature/6.0
+    branches: [ dev ]
   pull_request:
-    branches:
-      - dev
-      - feature/6.0
+    branches: [ dev ]
 
 jobs:
   lint-api-level:

.github/workflows/codeql-analysis.yml

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

.github/workflows/gradle-build.yml

@@ -2,9 +2,9 @@ name: Gradle Build and Compare Package
 
 on:
   push:
-    branches: [ dev, feature/6.0 ]
+    branches: [ dev ]
   pull_request:
-    branches: [ dev, feature/6.0 ]
+    branches: [ dev ]
     paths-ignore:
       - '.gradle/wrapper'
       - '.gitignore'
@@ -21,8 +21,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 18
-          distribution: 'adopt'
+          java-version: 20
+          distribution: 'temurin'
           cache: gradle
       - name: Detect Secrets
         uses: RobertFischer/[email protected]
@@ -41,7 +41,7 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: kiota-drop
+          name: drop
           path: |
             **/libs/*
             build/generated-pom.xml
@@ -58,30 +58,30 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     env: 
-      CURRENT_PKG_DIFF: ./artifacts/current-kiota/build/libs/msgraph-sdk-java.jar 
-      PRIOR_PKG_DIFF: ./artifacts/previous-kiota/build/libs/msgraph-sdk-java.jar
+      CURRENT_PKG_DIFF: ./artifacts/current/build/libs/msgraph-sdk-java.jar
+      PRIOR_PKG_DIFF: ./artifacts/previous/build/libs/msgraph-sdk-java.jar
     steps: 
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 18
-          distribution: 'adopt'
+          java-version: 20
+          distribution: 'temurin'
           cache: gradle
       - name: Download Current Build
         uses: actions/download-artifact@v4
         with: 
-          name: kiota-drop
-          path: artifacts/current-kiota/
+          name: drop
+          path: artifacts/current/
       - name: Download Last Successful Build
         uses: dawidd6/[email protected]
         with: 
           workflow: preview-and-release.yml
           workflow_conclusion: success
-          branch: feature/6.0
+          branch: dev
           event: push
-          name: kiota-drop
-          path: artifacts/previous-kiota/
+          name: drop
+          path: artifacts/previous/
       - name: Run PKG Diff 
         continue-on-error: true
         run: |

.github/workflows/preview-and-release.yml

@@ -2,7 +2,7 @@ name: Maven Preview/Release and Github Release
 
 on:
   push:
-    branches: [ "dev", "feature/6.0" ]
+    branches: [ dev ]
     paths-ignore:
      - '.gradle/wrapper'
      - '.gitignore'
@@ -17,7 +17,7 @@ env:
 
 jobs:
   maven_Preview:
-    if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/feature/6.0' }}
+    if: ${{ github.ref == 'refs/heads/dev' }}
     environment: 
       name: maven_central_snapshot
     runs-on: ubuntu-latest
@@ -26,8 +26,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 18
-          distribution: 'adopt'
+          java-version: 20
+          distribution: 'temurin'
           cache: gradle
       - name: Easy detect-secrets
         uses: RobertFischer/[email protected]
@@ -46,22 +46,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Publish
-        run: ./gradlew $PREVIEW_TASK 
-      - name: Upload Build Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: drop
-          path: |
-            **/libs/*
-            build/generated-pom.xml
-            build/generated-pom.xml.asc
-            build.gradle
-            gradlew
-            gradlew.bat
-            settings.gradle
-            gradle.properties
-            **/gradle/**
-            Scripts/**
+        run: ./gradlew $PREVIEW_TASK
 
   maven_Release:
     if: ${{ github.ref == 'refs/heads/dev' }}
@@ -73,8 +58,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 18
-          distribution: 'adopt'
+          java-version: 20
+          distribution: 'temurin'
           cache: gradle
       - name: Easy detect-secrets
         uses: RobertFischer/[email protected]