Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgmt, prepare release 2.6.0 #22372

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -324,87 +324,87 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appplatform</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appservice</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-authorization</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-compute</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-compute;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-compute;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerinstance</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerinstance;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerinstance;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerregistry</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerservice</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-cosmos</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-dns</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-keyvault</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-monitor</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-monitor;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-monitor;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-msi</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-network</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-sql</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-sql;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-sql;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-storage</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
</dependency>

<dependency>
Expand Down
48 changes: 24 additions & 24 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,32 +187,32 @@ com.azure.spring:azure-spring-cloud-test-servicebus-binder;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-eventhubs;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-storage;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-appconfiguration-config;1.0.0;1.0.0
com.azure.resourcemanager:azure-resourcemanager;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-appservice;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-authorization;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-cdn;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-compute;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-dns;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-monitor;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-msi;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-network;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-appservice;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-authorization;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-cdn;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-compute;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-dns;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-monitor;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-msi;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-network;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-privatedns;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-resources;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-redis;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-privatedns;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-resources;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-redis;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.1;2.0.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-search;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-servicebus;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-sql;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-storage;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.5.0;2.6.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-search;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-servicebus;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-sql;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-storage;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.5.0;2.6.0
com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.1;2.0.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-mediaservices;1.0.0;1.1.0-beta.2
com.azure.resourcemanager:azure-resourcemanager-mysql;1.0.0;1.1.0-beta.1
Expand Down
8 changes: 4 additions & 4 deletions sdk/resourcemanager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ For your convenience, we have provided a multi-service package that includes som
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -100,7 +100,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand All @@ -112,7 +112,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.9.2</version>
<version>1.10.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -312,7 +312,7 @@ For example, here is sample maven dependency for Compute package.
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-compute</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 2.6.0-beta.1 (Unreleased)
## 2.6.0 (2021-06-18)

- Updated core dependency from resources

## 2.5.0 (2021-05-28)
- Updated core dependency from resources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appplatform</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
10 changes: 5 additions & 5 deletions sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appplatform</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for App Platform Management</name>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -98,19 +98,19 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-keyvault</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-dns</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appservice</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 2.6.0-beta.1 (Unreleased)
## 2.6.0 (2021-06-18)

- Updated core dependency from resources

## 2.5.0 (2021-05-28)
- Supported the configuration of network access for `WebApp`, `FunctionApp`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appservice</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
12 changes: 6 additions & 6 deletions sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appservice</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for App Service Management</name>
Expand Down Expand Up @@ -52,27 +52,27 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-storage</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-msi</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-keyvault</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-dns</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 2.6.0-beta.1 (Unreleased)
## 2.6.0 (2021-06-18)

- Updated core dependency from resources

## 2.5.0 (2021-05-28)
- Supported key vault data related roles to `BuiltInRole`, for RBAC authorization of data access to data in `Vault`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-authorization</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-authorization</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Authorization Management</name>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<version>2.6.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
4 changes: 3 additions & 1 deletion sdk/resourcemanager/azure-resourcemanager-cdn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 2.6.0-beta.1 (Unreleased)
## 2.6.0 (2021-06-18)

- Updated core dependency from resources

## 2.5.0 (2021-05-28)
- Updated core dependency from resources
Expand Down
Loading