Skip to content

Commit 631b19b

Browse files
authored
Merge branch 'main' into users/merlinbot/1es-pt-auto-baselining-pr
2 parents eb0f499 + a7febfa commit 631b19b

130 files changed

Lines changed: 1853 additions & 622 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extends:
2121
parameters:
2222
pool:
2323
name: Azure-Pipelines-1ESPT-ExDShared
24+
image: ubuntu-latest
2425
os: linux
2526
sdl:
2627
sourceAnalysisPool:
@@ -42,13 +43,21 @@ extends:
4243
- checkout: self
4344
submodules: recursive
4445

45-
- task: JavaToolInstaller@0
46-
displayName: Set up Java
46+
- script: |
47+
sed -i "/mavenCentral()/d" build.gradle
48+
sed -i "/gradlePluginPortal()/d" settings.gradle
49+
sed -i "/mavenCentral()/d" settings.gradle
50+
displayName: Strip plugins and public repos for network-isolated build
51+
52+
- task: Gradle@4
53+
displayName: Build and Test SDK
4754
inputs:
48-
versionSpec: '17'
55+
gradleWrapperFile: 'gradlew'
56+
workingDirectory: '$(Build.SourcesDirectory)'
57+
tasks: 'assemble test'
58+
options: '--no-daemon -PGraphDeveloperExperiencesPublicPassword=$(ARTIFACTS_PAT)'
59+
publishJUnitResults: true
60+
testResultsFiles: '**/TEST-*.xml'
61+
javaHomeOption: 'JDKVersion'
62+
jdkVersionOption: '1.17'
4963
jdkArchitectureOption: 'x64'
50-
jdkSourceOption: 'PreInstalled'
51-
52-
- script: chmod +x gradlew && ./gradlew assemble
53-
displayName: Build SDK
54-
workingDirectory: $(Build.SourcesDirectory)

.github/dependabot.yml

Lines changed: 12 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
@@ -12,45 +13,27 @@ updates:
1213
kiota-dependencies:
1314
patterns:
1415
- "*kiota*"
15-
junit-dependencies:
16-
patterns:
17-
- "*junit*"
18-
open-telemetry:
19-
patterns:
20-
- "*opentelemetry*"
21-
- package-ecosystem: gradle
22-
directory: "/android"
23-
schedule:
24-
interval: daily
25-
time: "10:00" # 10am UTC. After core projects are updated to prevent duplicate PRs
26-
open-pull-requests-limit: 10
27-
groups:
28-
kiota-dependencies:
16+
microsoft-graph:
2917
patterns:
30-
- "*kiota*"
18+
- "*microsoft-graph*"
3119
junit-dependencies:
3220
patterns:
3321
- "*junit*"
3422
open-telemetry:
3523
patterns:
3624
- "*opentelemetry*"
37-
- package-ecosystem: maven
38-
directory: "/"
39-
schedule:
40-
interval: daily
41-
open-pull-requests-limit: 10
42-
groups:
43-
kiota-dependencies:
44-
patterns:
45-
- "*kiota*"
46-
junit-dependencies:
47-
patterns:
48-
- "*junit*"
49-
open-telemetry:
25+
android-build-tools:
5026
patterns:
51-
- "*opentelemetry*"
27+
- "*android*"
28+
- "*gradle-enterprise*"
29+
- "*gradle-util*"
30+
- "*gradle-versions*"
5231
- package-ecosystem: github-actions
5332
directory: "/"
5433
schedule:
5534
interval: daily
5635
open-pull-requests-limit: 10
36+
groups:
37+
all-actions:
38+
patterns:
39+
- "*"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
working-directory: ./android
3232
- name: Upload linting results
3333
if: failure() && steps.lint.outcome == 'failure'
34-
uses: actions/upload-artifact@v6
34+
uses: actions/upload-artifact@v7
3535
with:
3636
name: lint-report
3737
path: ./android/build/reports

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Dependabot metadata
2121
id: metadata
22-
uses: dependabot/fetch-metadata@v3.0.0
22+
uses: dependabot/fetch-metadata@v3.1.0
2323
with:
2424
github-token: "${{ secrets.GITHUB_TOKEN }}"
2525

.github/workflows/gradle-build.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
run: ./gradlew build
2828
- name: Upload Unit Test Results
2929
if: ${{ always() }}
30-
uses: actions/upload-artifact@v6
30+
uses: actions/upload-artifact@v7
3131
with:
3232
name: UnitTests
3333
path: |
3434
build/reports/tests/test/**
3535
build/test-results/**
3636
- name: Upload a Build Artifact
37-
uses: actions/upload-artifact@v6
37+
uses: actions/upload-artifact@v7
3838
with:
3939
name: drop
4040
path: |
@@ -81,3 +81,19 @@ jobs:
8181
exit 1
8282
fi
8383
84+
dependency-submission:
85+
runs-on: ubuntu-latest
86+
if: github.event_name == 'push'
87+
permissions:
88+
contents: write
89+
steps:
90+
- uses: actions/checkout@v6
91+
- name: Set up JDK
92+
uses: actions/setup-java@v5
93+
with:
94+
java-version: 21
95+
distribution: 'temurin'
96+
cache: gradle
97+
- name: Generate and submit dependency graph
98+
uses: gradle/actions/dependency-submission@v4
99+

.github/workflows/release-please-gha.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
3030

3131
- name: Release Please
32-
uses: googleapis/release-please-action@v4
32+
uses: googleapis/release-please-action@v5
3333
with:
3434
token: ${{ steps.app-token.outputs.token }}
3535
config-file: release-please-config.json
36-
manifest-file: .release-please-manifest.json
36+
manifest-file: .release-please-manifest.json

.github/workflows/validate-public-api-surface.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3636
- name: Upload patch file as artifact
3737
if: always()
38-
uses: actions/upload-artifact@v6
38+
uses: actions/upload-artifact@v7
3939
continue-on-error: true
4040
with:
4141
name: patch
4242
path: '*.patch'
4343
- name: Upload explanations file as artifact
4444
if: always()
45-
uses: actions/upload-artifact@v6
45+
uses: actions/upload-artifact@v7
4646
continue-on-error: true
4747
with:
4848
name: explanations

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "6.64.0"
2+
".": "6.65.0"
33
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [6.65.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.64.0...v6.65.0) (2026-05-19)
6+
7+
8+
### Features
9+
10+
* **generation:** update request builders and models ([#2594](https://github.com/microsoftgraph/msgraph-sdk-java/issues/2594)) ([090951c](https://github.com/microsoftgraph/msgraph-sdk-java/commit/090951c4d9e89a87a1ce777c3b9dda43cd1b2f7d))
11+
512
## [6.64.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.63.0...v6.64.0) (2026-05-05)
613

714

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
dependencies {
2121
// Include the sdk as a dependency
2222
// x-release-please-start-version
23-
implementation 'com.microsoft.graph:microsoft-graph:6.64.0'
23+
implementation 'com.microsoft.graph:microsoft-graph:6.65.0'
2424
// x-release-please-end
2525
// This dependency is only needed if you are using a TokenCredential object for authentication
2626
implementation 'com.azure:azure-identity:1.15.0'
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
3737
<groupId>com.microsoft.graph</groupId>
3838
<artifactId>microsoft-graph</artifactId>
3939
<!--x-release-please-start-version-->
40-
<version>6.64.0</version>
40+
<version>6.65.0</version>
4141
<!--x-release-please-end-->
4242
</dependency>
4343
<dependency>

0 commit comments

Comments
 (0)