From bd6c0bf1b9cbd4fc9cb88835cb739c424487ed5e Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Wed, 20 May 2026 15:47:19 -0700
Subject: [PATCH] refactor: consolidate Dependabot dependency groups and remove
 placeholder pom.xml

- Consolidate 4 Dependabot entries into 2 (single gradle + github-actions)
- Merge gradle directories (/, /java-8, /android) into one entry
- Remove maven ecosystem entry (pom.xml was only a placeholder)
- Add dependency groups: microsoft-graph, android-build-tools, all-actions
- Add Gradle dependency submission job to gradle-build.yml
- Delete placeholder pom.xml and clean up references

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/dependabot.yml             | 41 ++++++++-----------------
 .github/workflows/gradle-build.yml | 16 ++++++++++
 build.gradle                       |  1 -
 pom.xml                            | 48 ------------------------------
 release-please-config.json         |  7 +----
 5 files changed, 29 insertions(+), 84 deletions(-)
 delete mode 100644 pom.xml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 739066ae921..21d1754bab6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,6 +4,7 @@ updates:
   directories:
     - "/"
     - "/java-8"
+    - "/android"
   schedule:
     interval: daily
     time: "09:00" # 9am UTC
@@ -12,45 +13,27 @@ updates:
     kiota-dependencies:
       patterns:
         - "*kiota*"
-    junit-dependencies:
-      patterns:
-        - "*junit*"
-    open-telemetry:
-      patterns:
-        - "*opentelemetry*"
-- package-ecosystem: gradle
-  directory: "/android"
-  schedule:
-    interval: daily
-    time: "10:00" # 10am UTC. After core projects are updated to prevent duplicate PRs
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
+    microsoft-graph:
       patterns:
-        - "*kiota*"
+        - "*microsoft-graph*"
     junit-dependencies:
       patterns:
         - "*junit*"
     open-telemetry:
       patterns:
         - "*opentelemetry*"
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
-      patterns:
-        - "*kiota*"
-    junit-dependencies:
-      patterns:
-        - "*junit*"
-    open-telemetry:
+    android-build-tools:
       patterns:
-        - "*opentelemetry*"
+        - "*android*"
+        - "*gradle-enterprise*"
+        - "*gradle-util*"
+        - "*gradle-versions*"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    all-actions:
+      patterns:
+        - "*"
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index a987efba2b0..7c360567009 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -81,3 +81,19 @@ jobs:
             exit 1
           fi
 
+  dependency-submission:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          cache: gradle
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4
+
diff --git a/build.gradle b/build.gradle
index a17cd6e3beb..a37a6b63d81 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ java {
 sourceSets {
     main {
         java {
-            exclude 'pom.xml'
         }
     }
 }
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index af36635e65b..00000000000
--- a/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<project>
-    <!--
-        This package file is a place holder to enable the dependency graph https://github.com/microsoftgraph/msgraph-sdk-java/network/dependencies
-        as the dependency graph is not compatible with gradle https://docs.github.com/en/free-pro-team@latest/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
-        build.gradle is the source of truth
-    -->
-    <modelVersion>6.0.0</modelVersion>
-
-    <groupId>com.microsoft.graph</groupId>
-    <artifactId>microsoft-graph</artifactId>
-    <version>6.64.0</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.13.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.graph</groupId>
-            <artifactId>microsoft-graph-core</artifactId>
-            <version>3.6.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>6.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>5.2.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/release-please-config.json b/release-please-config.json
index a7132b77fb9..2a557568066 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -16,12 +16,7 @@
       "extra-files": [
         "gradle.properties",
         "README.md",
-        "src/main/java/com/microsoft/graph/info/Constants.java",
-        {
-          "type": "xml",
-          "path": "pom.xml",
-          "xpath": "//project/version"
-        }
+        "src/main/java/com/microsoft/graph/info/Constants.java"
       ]
     }
   },