Skip to content

Commit 107743b

Browse files
refactor: consolidate Dependabot dependency groups and clean up pom.xml references
- Consolidate 3 Dependabot entries into 2 (single gradle + github-actions) - Merge gradle directories (/, /java-8, /android) into one entry - Remove maven ecosystem entry (no pom.xml exists) - Add dependency groups: microsoft-graph, android-build-tools, all-actions - Add Gradle dependency submission job to gradle-build.yml - Remove pom.xml references from build.gradle and release-please-config.json Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 2c65ac0 commit 107743b

4 files changed

Lines changed: 27 additions & 39 deletions

File tree

.github/dependabot.yml

Lines changed: 10 additions & 32 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: weekly
910
time: "09:00" # 9am UTC
@@ -12,51 +13,28 @@ updates:
1213
kiota-dependencies:
1314
patterns:
1415
- "*kiota*"
15-
junit-dependencies:
16-
patterns:
17-
- "*junit*"
18-
open-telemetry:
16+
microsoft-graph:
1917
patterns:
20-
- "*opentelemetry*"
21-
22-
- package-ecosystem: gradle
23-
directory: "/android"
24-
schedule:
25-
interval: weekly
26-
time: "10:00" # 10am UTC. Scheduled after core java dependencies to prevent duplicate PRs
27-
open-pull-requests-limit: 10
28-
groups:
29-
kiota-dependencies:
30-
patterns:
31-
- "*kiota*"
18+
- "*microsoft-graph*"
3219
junit-dependencies:
3320
patterns:
3421
- "*junit*"
3522
open-telemetry:
3623
patterns:
3724
- "*opentelemetry*"
38-
- package-ecosystem: maven
39-
directory: "/"
40-
schedule:
41-
interval: weekly
42-
open-pull-requests-limit: 10
43-
groups:
44-
kiota-dependencies:
25+
android-build-tools:
4526
patterns:
46-
- "*kiota*"
47-
junit-dependencies:
48-
patterns:
49-
- "*junit*"
50-
open-telemetry:
51-
patterns:
52-
- "*opentelemetry*"
27+
- "*android*"
28+
- "*gradle-enterprise*"
29+
- "*gradle-util*"
30+
- "*gradle-versions*"
5331
- package-ecosystem: github-actions
5432
directory: "/"
5533
schedule:
5634
interval: weekly
5735
open-pull-requests-limit: 10
5836
groups:
59-
github-actions-dependencies:
37+
all-actions:
6038
patterns:
61-
- "actions/*"
39+
- "*"
6240

.github/workflows/gradle-build.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,19 @@ jobs:
8383
else
8484
exit 1
8585
fi
86+
87+
dependency-submission:
88+
runs-on: ubuntu-latest
89+
if: github.event_name == 'push'
90+
permissions:
91+
contents: write
92+
steps:
93+
- uses: actions/checkout@v6
94+
- name: Set up JDK
95+
uses: actions/setup-java@v5
96+
with:
97+
java-version: 21
98+
distribution: 'temurin'
99+
cache: gradle
100+
- name: Generate and submit dependency graph
101+
uses: gradle/actions/dependency-submission@v4

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ java {
2424
sourceSets {
2525
main {
2626
java {
27-
exclude 'pom.xml'
2827
}
2928
}
3029
}

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/beta/info/Constants.java",
20-
{
21-
"type": "xml",
22-
"path": "pom.xml",
23-
"xpath": "//project/version"
24-
}
19+
"src/main/java/com/microsoft/graph/beta/info/Constants.java"
2520
]
2621
}
2722
},

0 commit comments

Comments
 (0)