Skip to content

Commit

Permalink
Porting changes from patch release branch (Azure#28224)
Browse files Browse the repository at this point in the history
  • Loading branch information
rickle-msft authored Apr 12, 2022
1 parent 889ea0f commit b052441
Show file tree
Hide file tree
Showing 50 changed files with 141 additions and 71 deletions.
2 changes: 1 addition & 1 deletion common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.16.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.17.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -313,7 +313,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-nio</artifactId>
<version>12.0.0-beta.18</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
<version>12.0.0-beta.19</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -323,7 +323,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
<version>12.9.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
<version>12.10.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
18 changes: 9 additions & 9 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,17 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-sdk-template;1.1.1234;1.2.1-beta.16
com.azure:azure-spring-data-cosmos;3.19.0;3.19.1
com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
com.azure:azure-storage-blob;12.15.0;12.16.0-beta.1
com.azure:azure-storage-blob-batch;12.12.0;12.13.0-beta.1
com.azure:azure-storage-blob;12.16.0;12.17.0-beta.1
com.azure:azure-storage-blob-batch;12.12.1;12.13.0-beta.1
com.azure:azure-storage-blob-changefeed;12.0.0-beta.16;12.0.0-beta.17
com.azure:azure-storage-blob-cryptography;12.15.0;12.16.0-beta.1
com.azure:azure-storage-blob-nio;12.0.0-beta.17;12.0.0-beta.18
com.azure:azure-storage-common;12.15.0;12.16.0-beta.1
com.azure:azure-storage-file-share;12.12.0;12.13.0-beta.1
com.azure:azure-storage-file-datalake;12.8.0;12.9.0-beta.1
com.azure:azure-storage-internal-avro;12.2.0;12.3.0-beta.1
com.azure:azure-storage-blob-cryptography;12.15.1;12.16.0-beta.1
com.azure:azure-storage-blob-nio;12.0.0-beta.18;12.0.0-beta.19
com.azure:azure-storage-common;12.15.1;12.16.0-beta.1
com.azure:azure-storage-file-share;12.12.1;12.13.0-beta.1
com.azure:azure-storage-file-datalake;12.9.0;12.10.0-beta.1
com.azure:azure-storage-internal-avro;12.2.1;12.3.0-beta.1
com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-storage-queue;12.12.0;12.13.0-beta.1
com.azure:azure-storage-queue;12.12.1;12.13.0-beta.1
com.azure:azure-template-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-media-videoanalyzer-edge;1.0.0-beta.5;1.0.0-beta.6
com.azure:azure-verticals-agrifood-farming;1.0.0-beta.2;1.0.0-beta.3
Expand Down
2 changes: 1 addition & 1 deletion sdk/aot/azure-aot-graalvm-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/datafactory/azure-resourcemanager-datafactory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventgrid/azure-messaging-eventgrid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/quantum/azure-quantum-jobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->

<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<exclusions>
<exclusion>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/azure-resourcemanager-compute/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<exclusions>
<exclusion>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
6 changes: 3 additions & 3 deletions sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<optional>true</optional>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions sdk/spring/spring-cloud-azure-actuator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,19 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<optional>true</optional>
</dependency>
<!-- For Testing -->
Expand Down
6 changes: 3 additions & 3 deletions sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,19 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<optional>true</optional>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/spring-cloud-azure-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -74,7 +74,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
<exclusions>
<exclusion>
Expand Down
6 changes: 3 additions & 3 deletions sdk/spring/spring-cloud-azure-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.16.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-messaging-azure-storage-queue/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.12.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
</dependency>

<dependency>
Expand Down
8 changes: 8 additions & 0 deletions sdk/storage/azure-storage-blob-batch/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@

### Other Changes

## 12.12.1 (2022-04-07)

### Other Changes
#### Dependency Updates
- Upgraded `azure-core` from `1.26.0` to version `1.27.0`.
- Upgraded `azure-core-http-netty` from `1.11.8` to version `1.11.9`.
- Upgraded `azure-storage-blob` from `12.15.0` to version `12.16.0`.

## 12.12.0 (2022-03-09)

### Other Changes
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-batch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-batch</artifactId>
<version>12.12.0</version>
<version>12.12.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.16.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.17.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>

<!-- Added this dependency to include necessary annotations used by reactor core.
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-changefeed/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.16.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.17.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>

<!-- Added this dependency to include necessary annotations used by reactor core.
Expand Down
8 changes: 8 additions & 0 deletions sdk/storage/azure-storage-blob-cryptography/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@

### Other Changes

## 12.15.1 (2022-04-07)

### Other Changes
#### Dependency Updates
- Upgraded `azure-core` from `1.26.0` to version `1.27.0`.
- Upgraded `azure-core-http-netty` from `1.11.8` to version `1.11.9`.
- Upgraded `azure-storage-blob` from `12.15.0` to version `12.16.0`.

## 12.15.0 (2022-03-09)

### Other Changes
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-cryptography/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-cryptography</artifactId>
<version>12.15.0</version>
<version>12.15.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-cryptography/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.16.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.17.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
Loading

0 comments on commit b052441

Please sign in to comment.