Skip to content

Commit 1977cef

Browse files
authored
Merge branch 'main' into auth_flow_clientAssertion
2 parents b09954d + 9681db5 commit 1977cef

File tree

3,943 files changed

+90152
-29037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,943 files changed

+90152
-29037
lines changed

.config/guardian/.gdnbaselines

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

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@
595595
# PRLabel: %Monitor
596596
/sdk/monitor/azure-monitor-query-perf/ @srnagar @jairmyree @Azure/azure-sdk-write-monitor-data-plane @Azure/azure-java-sdk
597597

598+
# PRLabel: %Monitor
599+
/sdk/monitor/azure-monitor-query-logs/ @Azure/azure-sdk-write-monitor-query-logs
600+
598601
# PRLabel: %Monitor
599602
/sdk/monitor/azure-monitor-query-metrics/ @Azure/azure-sdk-write-monitor-query-metrics
600603

.github/copilot-instructions.md

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ The Azure SDK for Java repository contains client libraries for Azure services,
2222
- **Management Libraries**: Libraries with Maven group `com.azure.resourcemanager`
2323
- **Spring Libraries**: Libraries with Maven group `com.azure.spring`
2424

25-
## SDK Generation Guidelines
26-
27-
ACTION: Use azure-sdk-java-mcp sdk tools to generate the SDK.
28-
ACTION: Do not use pure `mvn` command to compile, build or package SDK, use `build_java_sdk` tool instead, it runs `mvn` command inside.
29-
ACTION: Use azure-sdk-java-mcp sdk tool `update_client_name` to update client name.
30-
ACTION: Only update the manual written code or class when you fix compile errors. Manual written class does not have `// Code generated by Microsoft (R) TypeSpec Code Generator.` header. Manual written functions or properties do not have `@Generated` annotation.
31-
32-
3325
## Behavior
3426

3527
- Always ensure your solutions prioritize clarity, maintainability, and testability.
@@ -121,11 +113,11 @@ When possible, refer to the Azure SDK for Java Design Guidelines for specific ex
121113
- Include tests that cover your changes
122114
- Update CHANGELOG.md with your changes
123115
- Provide a proper description of the pull request to document the changes in the PR. The description should include:
124-
- A summary of the changes made.
125-
- The reason for the changes.
126-
- Any relevant issue numbers.
127-
- Instructions on how to verify the changes.
128-
- Any additional context or information that reviewers should be aware of.
116+
- A summary of the changes made.
117+
- The reason for the changes.
118+
- Any relevant issue numbers.
119+
- Instructions on how to verify the changes.
120+
- Any additional context or information that reviewers should be aware of.
129121

130122
## Release Process
131123

@@ -163,12 +155,11 @@ There are two tools to help with SDK releases:
163155
Run `CheckPackageReleaseReadiness` to verify if the package is ready for release. This tool checks:
164156
- API review status
165157
- Change log status
166-
- Package name approval(If package is new and releasing a preview version)
158+
- Package name approval (If package is new and releasing a preview version)
167159
- Release date is set in release tracker
168160

169161
### Release SDK
170-
Run `ReleasePackage` to release the package. This tool requires package name and language as inputs. It will:
171-
- Check if the package is ready for release
162+
Run `ReleasePackage` to release the package. This tool requires package name and language as inputs. It will:- Check if the package is ready for release
172163
- Identify the release pipeline
173164
- Trigger the release pipeline.
174-
User needs to approve the release stage in the pipeline after it is triggered.
165+
User needs to approve the release stage in the pipeline after it is triggered.

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ Thumbs.db
7878
# reduced pom files should not be included
7979
dependency-reduced-pom.xml
8080
package-lock.json
81-
# But include package-lock.json for MCP tools
82-
!eng/tools/mcp/azure-sdk-java-mcp/package-lock.json
8381

8482
# VS Code
8583
.vscode/*

.vscode/mcp.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
{
22
"servers": {
3-
"azure-sdk-java-mcp": {
4-
"type": "stdio",
5-
"command": "pwsh",
6-
"args": [
7-
"${workspaceFolder}/eng/tools/mcp/azure-sdk-java-mcp/azure-sdk-java-mcp.ps1"
8-
]
9-
},
103
"azure-sdk-mcp": {
114
"type": "stdio",
125
"command": "pwsh",
136
"args": [
147
"${workspaceFolder}/eng/common/mcp/azure-sdk-mcp.ps1",
158
"-Run"
169
]
17-
},
10+
}
1811
}
19-
}
12+
}

common/perf-test-core/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<!-- Special allowance for performance libraries as they aren't shipped. -->
5757
<include>com.beust:jcommander:[1.82]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
5858

59-
<include>io.projectreactor:reactor-core:[3.7.8]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
60-
<include>io.vertx:vertx-codegen:[4.5.15]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
59+
<include>io.projectreactor:reactor-core:[3.7.9]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
60+
<include>io.vertx:vertx-codegen:[4.5.17]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
6161
</includes>
6262
</bannedDependencies>
6363
</rules>
@@ -75,27 +75,27 @@
7575
<dependency>
7676
<groupId>com.azure</groupId>
7777
<artifactId>azure-core-http-netty</artifactId>
78-
<version>1.15.13</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
78+
<version>1.16.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
7979
</dependency>
8080
<dependency>
8181
<groupId>com.azure</groupId>
8282
<artifactId>azure-core-http-okhttp</artifactId>
83-
<version>1.12.12</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
83+
<version>1.13.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
8484
</dependency>
8585
<dependency>
8686
<groupId>com.azure</groupId>
8787
<artifactId>azure-core-http-jdk-httpclient</artifactId>
88-
<version>1.0.5</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
88+
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
8989
</dependency>
9090
<dependency>
9191
<groupId>com.azure</groupId>
9292
<artifactId>azure-core-http-vertx</artifactId>
93-
<version>1.0.5</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
93+
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
9494
</dependency>
9595
<dependency>
9696
<groupId>io.vertx</groupId>
9797
<artifactId>vertx-codegen</artifactId>
98-
<version>4.5.15</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
98+
<version>4.5.17</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
9999
<scope>provided</scope>
100100
</dependency>
101101
<dependency>

eng/automation/changelog/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.azure</groupId>
7070
<artifactId>azure-core-test</artifactId>
71-
<version>1.27.0-beta.10</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
71+
<version>1.27.0-beta.11</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
7272
<scope>test</scope>
7373
</dependency>
7474
</dependencies>

0 commit comments

Comments
 (0)