Skip to content

Commit dd89571

Browse files
refactor: consolidate Dependabot dependency groups and remove placeholder pom.xml
- Consolidate Dependabot from 4 entries to 2 (single gradle entry + github-actions) - Merge /android directory into main gradle entry using directories key - Remove maven ecosystem entry (replaced by Gradle dependency submission) - Add android-build-tools and all-actions dependency groups - Add dependency-submission job to gradle-build workflow - Delete placeholder pom.xml and remove references from build.gradle and release-please-config.json Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 2162b4e commit dd89571

5 files changed

Lines changed: 28 additions & 97 deletions

File tree

.github/dependabot.yml

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ updates:
44
directories:
55
- "/"
66
- "/java-8"
7+
- "/android"
78
schedule:
89
interval: daily
910
time: "09:00" # 9am UTC
@@ -18,39 +19,18 @@ updates:
1819
open-telemetry:
1920
patterns:
2021
- "*opentelemetry*"
21-
- package-ecosystem: gradle
22-
directory: "/android"
23-
schedule:
24-
interval: daily
25-
time: "10:00" # 10am UTC. After core dependencies are updated to prevent duplicates.
26-
open-pull-requests-limit: 10
27-
groups:
28-
kiota-dependencies:
29-
patterns:
30-
- "*kiota*"
31-
junit-dependencies:
22+
android-build-tools:
3223
patterns:
33-
- "*junit*"
34-
open-telemetry:
35-
patterns:
36-
- "*opentelemetry*"
37-
- package-ecosystem: maven
24+
- "*android*"
25+
- "*gradle-enterprise*"
26+
- "*gradle-util*"
27+
- "*gradle-versions*"
28+
- package-ecosystem: github-actions
3829
directory: "/"
3930
schedule:
4031
interval: daily
4132
open-pull-requests-limit: 10
4233
groups:
43-
kiota-dependencies:
44-
patterns:
45-
- "*kiota*"
46-
junit-dependencies:
47-
patterns:
48-
- "*junit*"
49-
open-telemetry:
34+
all-actions:
5035
patterns:
51-
- "*opentelemetry*"
52-
- package-ecosystem: github-actions
53-
directory: "/"
54-
schedule:
55-
interval: daily
56-
open-pull-requests-limit: 10
36+
- "*"

.github/workflows/gradle-build.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Java CI with Gradle
22

33
on:
4+
push:
5+
branches: [main]
46
pull_request:
57
branches: [main, support/2.x.x]
68
workflow_dispatch:
@@ -38,3 +40,19 @@ jobs:
3840
gradle.properties
3941
**/gradle/**
4042
Scripts/**
43+
44+
dependency-submission:
45+
runs-on: ubuntu-latest
46+
if: github.event_name == 'push'
47+
permissions:
48+
contents: write
49+
steps:
50+
- uses: actions/checkout@v6
51+
- name: Set up JDK
52+
uses: actions/setup-java@v5
53+
with:
54+
java-version: 21
55+
distribution: 'temurin'
56+
cache: gradle
57+
- name: Generate and submit dependency graph
58+
uses: gradle/actions/dependency-submission@v4

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jacocoTestReport {
6060
sourceSets {
6161
main {
6262
java {
63-
exclude 'pom.xml'
6463
}
6564
}
6665
}

pom.xml

Lines changed: 0 additions & 61 deletions
This file was deleted.

release-please-config.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
"extra-files": [
1717
"gradle.properties",
1818
"README.md",
19-
"src/main/java/com/microsoft/graph/core/CoreConstants.java",
20-
{
21-
"type": "xml",
22-
"path": "pom.xml",
23-
"xpath": "//project/version"
24-
}
19+
"src/main/java/com/microsoft/graph/core/CoreConstants.java"
2520
]
2621
}
2722
},

0 commit comments

Comments
 (0)