Skip to content

Commit

Permalink
Storage jan22 patch merge (#26522)
Browse files Browse the repository at this point in the history
* Updated storage dependency version

* Updated readmes

* Updated changelogs
  • Loading branch information
rickle-msft authored Jan 15, 2022
1 parent 65f896b commit f71bc54
Show file tree
Hide file tree
Showing 42 changed files with 148 additions and 48 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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-changefeed</artifactId>
<version>12.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-storage-blob-changefeed;current} -->
<version>12.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-storage-blob-changefeed;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -308,7 +308,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-nio</artifactId>
<version>12.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
<version>12.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
20 changes: 10 additions & 10 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.16
com.azure:azure-spring-data-cosmos;3.16.0;3.17.0
com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
com.azure:azure-storage-blob;12.14.2;12.15.0-beta.3
com.azure:azure-storage-blob-batch;12.11.2;12.12.0-beta.3
com.azure:azure-storage-blob-changefeed;12.0.0-beta.13;12.0.0-beta.14
com.azure:azure-storage-blob-cryptography;12.14.2;12.15.0-beta.3
com.azure:azure-storage-blob-nio;12.0.0-beta.13;12.0.0-beta.14
com.azure:azure-storage-common;12.14.1;12.15.0-beta.3
com.azure:azure-storage-file-share;12.11.2;12.12.0-beta.3
com.azure:azure-storage-file-datalake;12.7.2;12.8.0-beta.3
com.azure:azure-storage-internal-avro;12.1.2;12.2.0-beta.3
com.azure:azure-storage-blob;12.14.3;12.15.0-beta.3
com.azure:azure-storage-blob-batch;12.11.3;12.12.0-beta.3
com.azure:azure-storage-blob-changefeed;12.0.0-beta.14;12.0.0-beta.15
com.azure:azure-storage-blob-cryptography;12.14.3;12.15.0-beta.3
com.azure:azure-storage-blob-nio;12.0.0-beta.14;12.0.0-beta.15
com.azure:azure-storage-common;12.14.2;12.15.0-beta.3
com.azure:azure-storage-file-share;12.11.3;12.12.0-beta.3
com.azure:azure-storage-file-datalake;12.7.3;12.8.0-beta.3
com.azure:azure-storage-internal-avro;12.1.3;12.2.0-beta.3
com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-storage-queue;12.11.2;12.12.0-beta.3
com.azure:azure-storage-queue;12.11.3;12.12.0-beta.3
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.4;1.0.0-beta.5
com.azure:azure-verticals-agrifood-farming;1.0.0-beta.2;1.0.0-beta.3
Expand Down
4 changes: 2 additions & 2 deletions sdk/boms/azure-spring-boot-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<azure.msal.version>1.11.0</azure.msal.version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
<azure.servicebus.jms.version>0.0.9</azure.servicebus.jms.version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
<azure.spring.data.cosmos.version>3.16.0</azure.spring.data.cosmos.version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
<azure.storage.blob.version>12.14.2</azure.storage.blob.version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<azure.storage.fileshare.version>12.11.2</azure.storage.fileshare.version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<azure.storage.blob.version>12.14.3</azure.storage.blob.version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<azure.storage.fileshare.version>12.11.3</azure.storage.fileshare.version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
</properties>

<issueManagement>
Expand Down
2 changes: 1 addition & 1 deletion sdk/boms/azure-spring-cloud-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<azure.identity.version>1.4.3</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<azure.servicebus.version>7.5.1</azure.servicebus.version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;dependency} -->
<azure.spring.cloud.version>${project.version}</azure.spring.cloud.version>
<azure.storage.queue.version>12.11.2</azure.storage.queue.version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<azure.storage.queue.version>12.11.3</azure.storage.queue.version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<azure.resourcemanager.version>2.10.0</azure.resourcemanager.version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
<azure.spring.appconfigure.version>2.3.0</azure.spring.appconfigure.version>
<azure.spring.appconfigure.starter.version>2.3.0</azure.spring.appconfigure.starter.version>
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 @@ -72,7 +72,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/deviceupdate/azure-iot-deviceupdate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
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.11.2</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<version>12.11.3</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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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.11.2</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.11.3</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 @@ -122,7 +122,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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 @@ -81,7 +81,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.11.2</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.11.3</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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/azure-spring-boot-starter-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.11.2</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.11.3</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/azure-spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.14.3</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.11.2</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<version>12.11.3</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
<optional>true</optional>
</dependency>

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

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

<!-- Added this dependency to include necessary annotations used by reactor core.
Expand Down
10 changes: 10 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,16 @@

### Other Changes

## 12.11.3 (2022-01-14)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.22.0` to version `1.24.1`.
- Upgraded `azure-core-http-netty` from `1.11.2` to version `1.11.6`.
- Upgraded `azure-storage-blob` from `12.14.2` to version `12.14.3`.

## 12.12.0-beta.2 (2021-12-07)

### Features Added
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.11.2</version>
<version>12.11.3</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
12 changes: 11 additions & 1 deletion sdk/storage/azure-storage-blob-changefeed/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 12.0.0-beta.14 (Unreleased)
## 12.0.0-beta.15 (Unreleased)

### Features Added

Expand All @@ -10,6 +10,16 @@

### Other Changes

## 12.0.0-beta.14 (2022-01-14)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.23.0` to version `1.24.1`.
- Upgraded `azure-core-http-netty` from `1.11.3` to version `1.11.6`.
- Upgraded `azure-storage-blob` from `12.15.0-beta.2` to version `12.14.3`.

## 12.0.0-beta.13 (2021-12-07)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-changefeed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ process change events that occur in your Blob Storage account at a low cost.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-changefeed</artifactId>
<version>12.0.0-beta.12</version>
<version>12.0.0-beta.14</version>
</dependency>
```
[//]: # ({x-version-update-end})
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 @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-changefeed</artifactId>
<version>12.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-storage-blob-changefeed;current} -->
<version>12.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-storage-blob-changefeed;current} -->

<name>Microsoft Azure client library for Blob Storage changefeed</name>
<description>This module contains client library for Microsoft Azure Blob Storage changefeed.</description>
Expand Down
10 changes: 10 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,16 @@

### Other Changes

## 12.14.3 (2022-01-14)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.22.0` to version `1.24.1`.
- Upgraded `azure-core-http-netty` from `1.11.2` to version `1.11.6`.
- Upgraded `azure-storage-blob` from `12.14.2` to version `12.14.3`.

## 12.15.0-beta.2 (2021-12-07)

### Features Added
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.14.2</version>
<version>12.14.3</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
12 changes: 11 additions & 1 deletion sdk/storage/azure-storage-blob-nio/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 12.0.0-beta.14 (Unreleased)
## 12.0.0-beta.15 (Unreleased)

### Features Added

Expand All @@ -10,6 +10,16 @@

### Other Changes

## 12.0.0-beta.14 (2022-01-14)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.23.0` to version `1.24.1`.
- Upgraded `azure-core-http-netty` from `1.11.3` to version `1.11.6`.
- Upgraded `azure-storage-blob` from `12.15.0-beta.2` to version `12.14.3`.

## 12.0.0-beta.13 (2021-12-07)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-nio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This package allows you to interact with Azure Blob Storage through the standard
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-nio</artifactId>
<version>12.0.0-beta.12</version>
<version>12.0.0-beta.14</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob-nio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-nio</artifactId>
<version>12.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
<version>12.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-storage-blob-nio;current} -->
<name>Microsoft Azure implementation of NIO on top of Azure Blob Storage</name>
<description>This module contains an implementation of Java's NIO interface on top of Azure Blob Storage.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
Expand Down
11 changes: 11 additions & 0 deletions sdk/storage/azure-storage-blob/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@

### Other Changes

## 12.14.3 (2022-01-14)

### Other Changes

#### Dependency Updates

- Upgraded `azure-core` from `1.22.0` to version `1.24.1`.
- Upgraded `azure-core-http-netty` from `1.11.2` to version `1.11.6`.
- Upgraded `azure-storage-common` from `12.14.1` to version `12.14.2`.
- Upgraded `azure-storage-internal-avro` from `12.1.2` to version `12.1.3`.

## 12.15.0-beta.2 (2021-12-07)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/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</artifactId>
<version>12.14.2</version>
<version>12.14.3</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Loading

0 comments on commit f71bc54

Please sign in to comment.