Skip to content

Commit 3df426d

Browse files
rickle-msftrickle-msft
committed
Merge remote-tracking branch 'upstream/main' into feature/storage/PatchReleaseJan22
2 parents 9f272b2 + 3e469fe commit 3df426d

11,229 files changed

Lines changed: 2789542 additions & 110658 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.

‎.github/CODEOWNERS‎

Lines changed: 561 additions & 13 deletions
Large diffs are not rendered by default.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ If applicable, add screenshots to help explain your problem.
3333
- App Server/Environment: [e.g. Tomcat, WildFly, Azure Function, Apache Spark, Databricks, IDE plugin or anything special]
3434
- Frameworks: [e.g. Spring Boot, Micronaut, Quarkus, etc]
3535

36-
If you suspect a dependency version mismatch (e.g. you see `NoClassDefFoundError`, `NoSuchMethodError` or similar), please provide
36+
If you suspect a dependency version mismatch (e.g. you see `NoClassDefFoundError`, `NoSuchMethodError` or similar), please check out [Troubleshoot dependency version conflict article](https://aka.ms/azsdk/java/dependency/troubleshoot) first. If it doesn't provide solution for the problem, please provide:
3737
- verbose dependency tree (`mvn dependency:tree -Dverbose`)
38-
38+
- exception message, full stack trace, and any available logs
39+
3940
**Additional context**
4041
Add any other context about the problem here.
4142

‎.vscode/cspell.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"*.x509",
3636
"*.certificate",
3737
"*.crt",
38-
".vscode/cspell.json"
38+
".vscode/cspell.json",
39+
"eng/code-quality-reports/src/main/resources"
3940
],
4041
"words": ["azsdk", "pwsh"],
4142
"overrides": [

‎common/perf-test-core/pom.xml‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>com.azure</groupId>
8-
<artifactId>azure-client-sdk-parent</artifactId>
9-
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
10-
<relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
8+
<artifactId>azure-perf-test-parent</artifactId>
9+
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-perf-test-parent;current} -->
10+
<relativePath>../../sdk/parents/azure-perf-test-parent</relativePath>
1111
</parent>
1212

1313
<groupId>com.azure</groupId>
@@ -38,29 +38,20 @@
3838

3939
<build>
4040
<plugins>
41-
<plugin>
42-
<groupId>com.github.spotbugs</groupId>
43-
<artifactId>spotbugs-maven-plugin</artifactId>
44-
<version>4.2.2</version> <!-- {x-version-update;com.github.spotbugs:spotbugs-maven-plugin;external_dependency} -->
45-
<configuration>
46-
<failOnError>false</failOnError>
47-
</configuration>
48-
</plugin>
49-
5041
<plugin>
5142
<groupId>org.apache.maven.plugins</groupId>
5243
<artifactId>maven-enforcer-plugin</artifactId>
5344
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
5445
<configuration>
5546
<rules>
5647
<bannedDependencies>
57-
<includes>
58-
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
48+
<includes combine.children="append">
49+
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
5950

60-
<!-- special allowance for perf-test-core as it is not a shipping library: -->
51+
<!-- Special allowance for performance libraries as they aren't shipped. -->
6152
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
6253

63-
<include>io.projectreactor:reactor-core:[3.4.10]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
54+
<include>io.projectreactor:reactor-core:[3.4.13]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
6455
</includes>
6556
</bannedDependencies>
6657
</rules>
@@ -73,7 +64,7 @@
7364
<dependency>
7465
<groupId>com.fasterxml.jackson.core</groupId>
7566
<artifactId>jackson-databind</artifactId>
76-
<version>2.12.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
67+
<version>2.13.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
7768
</dependency>
7869
<dependency>
7970
<groupId>com.beust</groupId>
@@ -83,7 +74,7 @@
8374
<dependency>
8475
<groupId>com.azure</groupId>
8576
<artifactId>azure-core-http-netty</artifactId>
86-
<version>1.11.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
77+
<version>1.11.6</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
8778
</dependency>
8879
</dependencies>
8980
</project>

‎common/smoke-tests/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,67 +88,67 @@
8888
<dependency>
8989
<groupId>com.azure</groupId>
9090
<artifactId>azure-core</artifactId>
91-
<version>1.22.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
91+
<version>1.24.1</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
9292
</dependency>
9393

9494
<dependency>
9595
<groupId>com.azure</groupId>
9696
<artifactId>azure-core-http-netty</artifactId>
97-
<version>1.11.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
97+
<version>1.11.6</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
9898
</dependency>
9999

100100
<dependency>
101101
<groupId>com.azure</groupId>
102102
<artifactId>azure-core-tracing-opentelemetry</artifactId>
103-
<version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
103+
<version>1.0.0-beta.19</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
104104
</dependency>
105105

106106
<dependency>
107107
<groupId>com.azure</groupId>
108108
<artifactId>azure-core-http-okhttp</artifactId>
109-
<version>1.7.5</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
109+
<version>1.7.8</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
110110
</dependency>
111111

112112
<dependency>
113113
<groupId>com.azure</groupId>
114114
<artifactId>azure-core-amqp</artifactId>
115-
<version>2.3.3</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
115+
<version>2.3.7</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
116116
</dependency>
117117

118118
<dependency>
119119
<groupId>com.azure</groupId>
120120
<artifactId>azure-cosmos</artifactId>
121-
<version>4.20.1</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
121+
<version>4.24.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
122122
</dependency>
123123

124124
<dependency>
125125
<groupId>com.azure</groupId>
126126
<artifactId>azure-identity</artifactId>
127-
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
127+
<version>1.4.3</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
128128
</dependency>
129129

130130
<dependency>
131131
<groupId>com.azure</groupId>
132132
<artifactId>azure-security-keyvault-secrets</artifactId>
133-
<version>4.3.4</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
133+
<version>4.3.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
134134
</dependency>
135135

136136
<dependency>
137137
<groupId>com.azure</groupId>
138138
<artifactId>azure-messaging-eventhubs</artifactId>
139-
<version>5.10.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
139+
<version>5.10.3</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
140140
</dependency>
141141

142142
<dependency>
143143
<groupId>com.azure</groupId>
144144
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
145-
<version>1.10.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
145+
<version>1.10.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
146146
</dependency>
147147

148148
<dependency>
149149
<groupId>com.azure</groupId>
150150
<artifactId>azure-storage-blob</artifactId>
151-
<version>12.14.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
151+
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
152152
</dependency>
153153

154154
<dependency>

0 commit comments

Comments
 (0)