From f0798f67fbfd1059b70d64a2b0437e74e84050ab Mon Sep 17 00:00:00 2001
From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com>
Date: Wed, 2 Jun 2021 10:50:06 -0700
Subject: [PATCH 1/2] post release update core-amqp to 2.0.6
---
common/smoke-tests/pom.xml | 2 +-
eng/versioning/version_client.txt | 2 +-
sdk/core/azure-core-amqp/CHANGELOG.md | 6 ++++++
sdk/core/azure-core-amqp/README.md | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
index c900d38dc034e..d512e9a1fca57 100644
--- a/common/smoke-tests/pom.xml
+++ b/common/smoke-tests/pom.xml
@@ -112,7 +112,7 @@
com.azure
azure-core-amqp
- 2.0.5
+ 2.0.6
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 7242e482492db..12d59c8fc4904 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -58,7 +58,7 @@ com.azure:azure-communication-identity;1.1.0;1.2.0-beta.1
com.azure:azure-communication-phonenumbers;1.0.1;1.1.0-beta.1
com.azure:azure-containers-containerregistry;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-core;1.16.0;1.17.0-beta.1
-com.azure:azure-core-amqp;2.0.5;2.1.0-beta.1
+com.azure:azure-core-amqp;2.0.6;2.1.0-beta.1
com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core-experimental;1.0.0-beta.13;1.0.0-beta.14
com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md
index e82bf2c947989..95f3244eaa113 100644
--- a/sdk/core/azure-core-amqp/CHANGELOG.md
+++ b/sdk/core/azure-core-amqp/CHANGELOG.md
@@ -1,5 +1,11 @@
# Release History
+## 2.1.0-beta.1 (Unreleased)
+
+## 2.0.6 (2021-05-24)
+### Bug Fixes
+- Fixed a bug that caused amqp connection not to retry when network error happened.
+
## 2.0.5 (2021-05-07)
### Dependency Updates
diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md
index 605e6b3f3e3e3..8551b3b020e40 100644
--- a/sdk/core/azure-core-amqp/README.md
+++ b/sdk/core/azure-core-amqp/README.md
@@ -16,7 +16,7 @@ own AMQP client library that abstracts from the underlying transport library's i
com.azure
azure-core-amqp
- 2.0.5
+ 2.0.6
```
[//]: # ({x-version-update-end})
From 6d1959c1011869f5bf55757c29fb3d6e5164fea4 Mon Sep 17 00:00:00 2001
From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com>
Date: Wed, 2 Jun 2021 10:51:36 -0700
Subject: [PATCH 2/2] Post release servicebus 7.2.2
---
eng/versioning/version_client.txt | 2 +-
sdk/resourcemanager/azure-resourcemanager-samples/pom.xml | 2 +-
sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md | 8 ++++++++
sdk/servicebus/azure-messaging-servicebus/README.md | 2 +-
sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml | 2 +-
.../pom.xml | 2 +-
sdk/spring/azure-spring-integration-servicebus/pom.xml | 2 +-
7 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 12d59c8fc4904..ec590c33448bf 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -93,7 +93,7 @@ com.azure:azure-messaging-eventhubs;5.7.1;5.8.0-beta.1
com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.7.0;1.8.0-beta.1
com.azure:azure-messaging-eventhubs-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-eventhubs-track2-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-messaging-servicebus;7.2.1;7.3.0-beta.3
+com.azure:azure-messaging-servicebus;7.2.2;7.3.0-beta.3
com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-webpubsub;1.0.0-beta.2;1.0.0-beta.3
diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
index 96811ab6347ed..10e5419d3793d 100644
--- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
@@ -113,7 +113,7 @@
com.azure
azure-messaging-servicebus
- 7.2.1
+ 7.2.2
io.fabric8
diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
index a007894d18023..db94b1b6e7262 100644
--- a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
+++ b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
@@ -2,6 +2,14 @@
## 7.3.0-beta.3 (Unreleased)
+## 7.2.2 (2021-05-26)
+### Fixed
+- Fixed some connection retry issues when network errors happen.
+- Fixed an issue that caused `ServiceBusSenderClient` to keep running after it's already closed.
+
+### Dependency Updates
+- Upgraded `azure-core-amqp` dependency to `2.0.6`.
+
## 7.2.1 (2021-05-12)
### Fixed
- Fixed an issue: When 'ServiceBusProcessorClient:maxConcurrentCalls' is set, this will result in SDK cache more
diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md
index 614d8d37f3d1f..b2c7e0878003f 100644
--- a/sdk/servicebus/azure-messaging-servicebus/README.md
+++ b/sdk/servicebus/azure-messaging-servicebus/README.md
@@ -37,7 +37,7 @@ To quickly create the needed Service Bus resources in Azure and to receive a con
com.azure
azure-messaging-servicebus
- 7.2.1
+ 7.2.2
```
[//]: # ({x-version-update-end})
diff --git a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
index 246a4806b47c9..07928baca132a 100644
--- a/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
+++ b/sdk/spring/azure-spring-cloud-starter-servicebus/pom.xml
@@ -29,7 +29,7 @@
com.azure
azure-messaging-servicebus
- 7.2.1
+ 7.2.2
diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml
index 0d4fc042aaa6b..1b213244d7a9e 100644
--- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml
+++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml
@@ -40,7 +40,7 @@
com.azure
azure-messaging-servicebus
- 7.2.1
+ 7.2.2
+ 7.2.2
com.azure.spring