Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feature/storage/Pat…
Browse files Browse the repository at this point in the history 
…chReleaseJan22
  • Loading branch information
@rickle-msft
rickle-msft committed Jan 12, 2022
2 parents 9f272b2 + 3e469fe commit 3df426d
Show file tree
Hide file tree
Showing 11,229 changed files with 2,789,542 additions and 110,658 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
574 changes: 561 additions & 13 deletions .github/CODEOWNERS
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ If applicable, add screenshots to help explain your problem.
- App Server/Environment: [e.g. Tomcat, WildFly, Azure Function, Apache Spark, Databricks, IDE plugin or anything special]
- Frameworks: [e.g. Spring Boot, Micronaut, Quarkus, etc]

If you suspect a dependency version mismatch (e.g. you see `NoClassDefFoundError`, `NoSuchMethodError` or similar), please provide
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:
- verbose dependency tree (`mvn dependency:tree -Dverbose`)

- exception message, full stack trace, and any available logs

**Additional context**
Add any other context about the problem here.

Expand Down
3 changes: 2 additions & 1 deletion .vscode/cspell.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"*.x509",
"*.certificate",
"*.crt",
".vscode/cspell.json"
".vscode/cspell.json",
"eng/code-quality-reports/src/main/resources"
],
"words": ["azsdk", "pwsh"],
"overrides": [
Expand Down
27 changes: 9 additions & 18 deletions common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
<artifactId>azure-perf-test-parent</artifactId>
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-perf-test-parent;current} -->
<relativePath>../../sdk/parents/azure-perf-test-parent</relativePath>
</parent>

<groupId>com.azure</groupId>
Expand Down Expand Up @@ -38,29 +38,20 @@

<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.2.2</version> <!-- {x-version-update;com.github.spotbugs:spotbugs-maven-plugin;external_dependency} -->
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

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

<include>io.projectreactor:reactor-core:[3.4.10]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.13]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -73,7 +64,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.13.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand All @@ -83,7 +74,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.6</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
</dependencies>
</project>
22 changes: 11 additions & 11 deletions common/smoke-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,67 +88,67 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.22.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.24.1</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.6</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opentelemetry</artifactId>
<version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
<version>1.0.0-beta.19</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.7.5</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.8</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.3.3</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.3.7</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.20.1</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
<version>4.24.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<version>1.4.3</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.3.4</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<version>4.3.5</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.10.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<version>5.10.3</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.10.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.10.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
Expand Down
Loading

0 comments on commit 3df426d

Please sign in to comment.