From 60d7e9bd073d4a748d593f5c25fa9459cf4c9583 Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 13:55:30 -0800 Subject: [PATCH 01/13] Remove version_client_java_files. --- eng/versioning/version_client_java_files.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 eng/versioning/version_client_java_files.txt diff --git a/eng/versioning/version_client_java_files.txt b/eng/versioning/version_client_java_files.txt deleted file mode 100644 index 9f2721aa11ba..000000000000 --- a/eng/versioning/version_client_java_files.txt +++ /dev/null @@ -1,6 +0,0 @@ -# This is necessary because there are java files with a hard coded version in them that need to -# get updated when versions get updated. Once https://github.com/Azure/azure-sdk-for-java/issues/3141 -# has been fixed this file and the update logic in update_versions.py should no longer be necessary. - -# The file format here should be the relative path from the root of the azure-sdk-for-java -sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClientConstants.java From 39cb0be02c01477c6a5360dd885f7e28fa242e94 Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 13:57:54 -0800 Subject: [PATCH 02/13] Update current-version to GA for Event Hubs. --- eng/versioning/version_client.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index fc6972cf85f2..c4b6db9d8fbe 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -6,7 +6,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-ai-textanalytics;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core;1.1.0;1.2.0 -com.azure:azure-core-amqp;1.0.0-beta.9;1.0.0-beta.9 +com.azure:azure-core-amqp;1.0.0-beta.9;1.0.0 com.azure:azure-core-http-netty;1.1.0;1.2.0 com.azure:azure-core-http-okhttp;1.0.0;1.1.0 com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8 @@ -16,8 +16,8 @@ com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-data-appconfiguration;1.0.0-beta.7;1.0.0-beta.8 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-identity;1.0.1;1.1.0-beta.1 -com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.0-beta.7 -com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.0-beta.5 +com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.0 +com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.0 com.azure:azure-security-keyvault-certificates;4.0.0-beta.7;4.0.0-beta.8 com.azure:azure-security-keyvault-keys;4.0.1;4.1.0-beta.1 com.azure:azure-security-keyvault-secrets;4.0.1;4.1.0-beta.1 From 7f5833e3a7f5cdb72fea66d49a1df696b9a2aa4f Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:00:54 -0800 Subject: [PATCH 03/13] Update Event Hubs client libraries to GA version. --- eng/jacoco-test-coverage/pom.xml | 6 +++--- eng/spotbugs-aggregate-report/pom.xml | 6 +++--- sdk/core/azure-core-amqp/pom.xml | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index e2c8ebc0bd95..bd850a4c8e38 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -49,7 +49,7 @@ com.azure azure-core-amqp - 1.0.0-beta.9 + 1.0.0 com.azure @@ -105,12 +105,12 @@ com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0-beta.5 + 1.0.0 com.azure diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 8d076005a4d0..67bb350f0bd3 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -163,7 +163,7 @@ com.azure azure-core-amqp - 1.0.0-beta.9 + 1.0.0 com.azure @@ -193,12 +193,12 @@ com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0-beta.5 + 1.0.0 com.azure diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 42349e192fd1..65f9eaee189f 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-amqp - 1.0.0-beta.9 + 1.0.0 jar Microsoft Azure Java Core AMQP Library diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index 25cf73d6e7e9..fdb68413916b 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -17,7 +17,7 @@ com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0-beta.5 + 1.0.0 Microsoft Azure client library for storing checkpoints in Storage Blobs Library for using storing checkpoints in Storage Blobs @@ -40,7 +40,7 @@ com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 com.azure diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index aec594991d04..c195a178f0dc 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -14,7 +14,7 @@ com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 Microsoft Azure client library for Event Hubs Libraries built on Microsoft Azure Event Hubs From a4446e21b363a7d770f93eb39c9d0950f8992ba2 Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:29:08 -0800 Subject: [PATCH 04/13] Update README files with versions. --- sdk/core/azure-core-amqp/README.md | 2 +- .../azure-core-tracing-opencensus/src/samples/PublishEvents.md | 2 +- .../src/samples/PublishEventsTracingSample.md | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/README.md | 2 +- sdk/eventhubs/azure-messaging-eventhubs/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md index 624111403d75..dd096c048614 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 - 1.0.0-beta.9 + 1.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md index eec7b18b78ce..ba02b6e89e96 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md @@ -14,7 +14,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md index 38e67bf1463e..d2af4f657814 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md @@ -23,7 +23,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md index 7eccac0f2e3d..4a2096dcf802 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md @@ -30,7 +30,7 @@ All client libraries, by default, use the Tomcat-native Boring SSL library to en com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0-beta.5 + 1.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md index d2717b46f3b6..7e32050ae909 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md @@ -60,7 +60,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs - 5.0.0-beta.7 + 5.0.0 ``` [//]: # ({x-version-update-end}) From 887f8ade4f11e8c17e535251b7db4892ce88451b Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 13:36:06 -0800 Subject: [PATCH 05/13] Updating azure-core-amqp CHANGELOG --- sdk/core/azure-core-amqp/CHANGELOG.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md index b703afecf31b..ef187deff7e8 100644 --- a/sdk/core/azure-core-amqp/CHANGELOG.md +++ b/sdk/core/azure-core-amqp/CHANGELOG.md @@ -1,7 +1,7 @@ # Release History -## Version 1.0.0-beta.9 (2020-01-07) -- Add links on batch send operation in eventhubs +## 1.0.0 (2020-01-07) +- Client library name and version are no longer hard coded in connection properties. - Update qpid-proton-j-extensions dependency - Shorten tracing span names @@ -28,12 +28,12 @@ - Added `AmqpEndpointStateUtil`. - Closed ReactorReceiver on errors or closures in link. -## Version 1.0.0-preview.7 (2019-11-04) +## 1.0.0-preview.7 (2019-11-04) -## Version 1.0.0-preview.6 (2019-10-10) +## 1.0.0-preview.6 (2019-10-10) - Added more error messages for checking null. -## Version 1.0.0-preview.5 (2019-10-07) +## 1.0.0-preview.5 (2019-10-07) - Getters and setters were updated to use Java Bean notation. - Added `MessageSerializer` to azure-core-amqp. - Moved Reactor handlers into azure-core-amqp. @@ -45,17 +45,17 @@ - Added `PROTON_IO` in ErrorCondition. - Added `ProxyConfiguration` for API `createConnectionHandler`. -## Version 1.0.0-preview.4 (2019-09-09) +## 1.0.0-preview.4 (2019-09-09) - Support tracing for azure-core-amqp. -## Version 1.0.0-preview.3 (2019-08-05) +## 1.0.0-preview.3 (2019-08-05) - Retry implements Cloneable. - Rename `Retry` to `RetryPolicy`. - `RetryOptions` implements Cloneable. -## Version 1.0.0-preview.2 (2019-07-02) +## 1.0.0-preview.2 (2019-07-02) -## Version 1.0.0-preview.1 (2019-06-28) +## 1.0.0-preview.1 (2019-06-28) This package's [documentation](https://github.com/Azure/azure-sdk-for-java/blob/azure-core-amqp_1.0.0-preview.1/core/azure-core-amqp/README.md) From 7e03e3e10a3744f7fcf3fe34cc7a0670ce1b9cdf Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 13:50:46 -0800 Subject: [PATCH 06/13] Update Event Hubs changelog. --- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index 29e813cd0b8e..ef6893f3c581 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -1,6 +1,11 @@ # Release History -## 5.0.0-beta.7 (Unreleased) +## 5.0.0 (2020-01-07) +- Add support for different error handling cases in EventProcessor. +- Recreate connection in client on transient errors. +- Add tracing links when sending a batch of events. +- Tracing link names are shortened when sending events. +- EventPosition.fromOffset(long) is no longer inclusive. ## 5.0.0-beta.6 (2019-12-02) - Artifact name changed from `preview` to `beta`. @@ -23,10 +28,10 @@ be declared at the time of receiving events and not when the client is created. - `EventHubProducerAsyncClient` and `EventHubProduderClient` for sending events. - `EventHubConsumerAsyncClient` and `EventHubConsumerClient` for receiving events. - Moved `InMemoryPartitionManager` from main package to samples and renamed to `InMemoryEventProcessorStore` -- The `EventProcessorStore`, previously `PartitionManager`, has updated APIs to include `fullyQualifiedNamespace` of +- The `EventProcessorStore`, previously `PartitionManager`, has updated APIs to include `fullyQualifiedNamespace` of the Event Hub. - Updates to `EventProcessor` to allow functional callbacks for processing events, errors etc. - + ## 5.0.0-preview.4 (2019-10-08) - Proxy support for Event Hubs sync and async clients. - `EventHubConsumer` and `EventHubAsyncConsumer` now provides last enqueued event information. From 8abb22705cf4b8af0d0d8c78b513082276f35556 Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:23:34 -0800 Subject: [PATCH 07/13] Do a minor version bump to fix -preview sorting. --- eng/versioning/version_client.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index c4b6db9d8fbe..8ea70d20f863 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -6,7 +6,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-ai-textanalytics;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core;1.1.0;1.2.0 -com.azure:azure-core-amqp;1.0.0-beta.9;1.0.0 +com.azure:azure-core-amqp;1.0.0-beta.9;1.0.1 com.azure:azure-core-http-netty;1.1.0;1.2.0 com.azure:azure-core-http-okhttp;1.0.0;1.1.0 com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8 @@ -16,8 +16,8 @@ com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-data-appconfiguration;1.0.0-beta.7;1.0.0-beta.8 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-identity;1.0.1;1.1.0-beta.1 -com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.0 -com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.0 +com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.1 +com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.1 com.azure:azure-security-keyvault-certificates;4.0.0-beta.7;4.0.0-beta.8 com.azure:azure-security-keyvault-keys;4.0.1;4.1.0-beta.1 com.azure:azure-security-keyvault-secrets;4.0.1;4.1.0-beta.1 From ebcee09fae5763733772f5688eceba93d5fc0dcb Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:24:50 -0800 Subject: [PATCH 08/13] Fix error in update_version script since files.txt is removed. --- eng/versioning/update_versions.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/eng/versioning/update_versions.py b/eng/versioning/update_versions.py index 15a6669b91e4..ec4fa0e12040 100644 --- a/eng/versioning/update_versions.py +++ b/eng/versioning/update_versions.py @@ -148,26 +148,6 @@ def update_versions_all(update_type, build_type, target_file, skip_readme): if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom.') and file_name.endswith('.xml')): update_versions(version_map, file_path) - # This is a temporary stop gap to deal with versions hard coded in java files. - # Everything within the begin/end tags below can be deleted once - # https://github.com/Azure/azure-sdk-for-java/issues/3141 has been fixed. - # version_*_java_files.txt - # BEGIN:Versions_in_java_files - if not target_file and BuildType.none != build_type: - # the good thing here is that the java files only contain library versions, not - # external versions - version_java_file = os.path.normpath('eng/versioning/version_' + build_type.name + '_java_files.txt') - with open(version_java_file) as f: - for raw_line in f: - java_file_to_update = raw_line.strip() - if not java_file_to_update or java_file_to_update.startswith('#'): - continue - if os.path.isfile(java_file_to_update): - update_versions(version_map, java_file_to_update) - else: - raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), java_file_to_update) - # END:Versions_in_java_files - def main(): parser = argparse.ArgumentParser(description='Replace version numbers in poms and READMEs.') parser.add_argument('--update-type', '--ut', type=UpdateType, choices=list(UpdateType)) From 57a970d8ca2659035f563627e2ebff8d6098e25d Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:24:59 -0800 Subject: [PATCH 09/13] Run update-versions. --- eng/jacoco-test-coverage/pom.xml | 6 +++--- eng/spotbugs-aggregate-report/pom.xml | 6 +++--- sdk/core/azure-core-amqp/README.md | 2 +- sdk/core/azure-core-amqp/pom.xml | 2 +- .../src/samples/PublishEvents.md | 2 +- .../src/samples/PublishEventsTracingSample.md | 2 +- .../README.md | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/README.md | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index bd850a4c8e38..f417db20676a 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -49,7 +49,7 @@ com.azure azure-core-amqp - 1.0.0 + 1.0.1 com.azure @@ -105,12 +105,12 @@ com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0 + 1.0.1 com.azure diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 67bb350f0bd3..2bb865f80d0e 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -163,7 +163,7 @@ com.azure azure-core-amqp - 1.0.0 + 1.0.1 com.azure @@ -193,12 +193,12 @@ com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0 + 1.0.1 com.azure diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md index dd096c048614..76ebaeac91bc 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 - 1.0.0 + 1.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 65f9eaee189f..eac637c3f540 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-amqp - 1.0.0 + 1.0.1 jar Microsoft Azure Java Core AMQP Library diff --git a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md index ba02b6e89e96..0aa1922558a4 100644 --- a/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md +++ b/sdk/core/azure-core-tracing-opencensus/src/samples/PublishEvents.md @@ -14,7 +14,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md index d2af4f657814..e7243cc6b068 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/PublishEventsTracingSample.md @@ -23,7 +23,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and ** com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md index 4a2096dcf802..5f0394f62c4b 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/README.md @@ -30,7 +30,7 @@ All client libraries, by default, use the Tomcat-native Boring SSL library to en com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0 + 1.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index fdb68413916b..496c96601eb1 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -17,7 +17,7 @@ com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.0.0 + 1.0.1 Microsoft Azure client library for storing checkpoints in Storage Blobs Library for using storing checkpoints in Storage Blobs @@ -40,7 +40,7 @@ com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 com.azure diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md index 7e32050ae909..1ff5c4dbcf39 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/README.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md @@ -60,7 +60,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index c195a178f0dc..372018fdaee2 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -14,7 +14,7 @@ com.azure azure-messaging-eventhubs - 5.0.0 + 5.0.1 Microsoft Azure client library for Event Hubs Libraries built on Microsoft Azure Event Hubs From 972a541869bd12ebe3a29df235abed1c9dc5a55a Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 14:48:28 -0800 Subject: [PATCH 10/13] Update issue text and skip file if it does not exist. --- eng/versioning/update_versions.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/eng/versioning/update_versions.py b/eng/versioning/update_versions.py index ec4fa0e12040..68f5b389a05a 100644 --- a/eng/versioning/update_versions.py +++ b/eng/versioning/update_versions.py @@ -148,6 +148,30 @@ def update_versions_all(update_type, build_type, target_file, skip_readme): if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom.') and file_name.endswith('.xml')): update_versions(version_map, file_path) + # This is a temporary stop gap to deal with versions hard coded in java files. + # Everything within the begin/end tags below can be deleted once + # https://github.com/Azure/azure-sdk-for-java/issues/7106 has been fixed. + # version_*_java_files.txt + # BEGIN:Versions_in_java_files + if not target_file and BuildType.none != build_type: + # the good thing here is that the java files only contain library versions, not + # external versions + version_java_file = os.path.normpath('eng/versioning/version_' + build_type.name + '_java_files.txt') + + if os.path.exists(version_java_file): + with open(version_java_file) as f: + for raw_line in f: + java_file_to_update = raw_line.strip() + if not java_file_to_update or java_file_to_update.startswith('#'): + continue + if os.path.isfile(java_file_to_update): + update_versions(version_map, java_file_to_update) + else: + raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), java_file_to_update) + else: + print(version_java_file + ' does not exist. Skipping.') + # END:Versions_in_java_files + def main(): parser = argparse.ArgumentParser(description='Replace version numbers in poms and READMEs.') parser.add_argument('--update-type', '--ut', type=UpdateType, choices=list(UpdateType)) From 11c473beb4512f72e360a9b61c07d2f1611b61ab Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 15:15:49 -0800 Subject: [PATCH 11/13] Fix dependency versions for azure-core-amqp. --- eng/versioning/version_client.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 8ea70d20f863..ed28c3e4654f 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -6,7 +6,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-ai-textanalytics;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core;1.1.0;1.2.0 -com.azure:azure-core-amqp;1.0.0-beta.9;1.0.1 +com.azure:azure-core-amqp;1.0.0-beta.8;1.0.1 com.azure:azure-core-http-netty;1.1.0;1.2.0 com.azure:azure-core-http-okhttp;1.0.0;1.1.0 com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8 @@ -35,4 +35,5 @@ com.azure:azure-storage-queue;12.2.0-beta.1;12.2.0-beta.2 # Format; # unreleased_:;dependency-version unreleased_com.azure:azure-core;1.2.0 +unreleased_com.azure:azure-core-amqp;1.0.1 unreleased_com.azure:azure-core-test;1.1.0-beta.2 From 66efe4fddfd211da0a219ad5f626e90a330e507a Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 15:16:04 -0800 Subject: [PATCH 12/13] Update azure-messaging-eventhubs to use correct pom. --- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 372018fdaee2..ba370acb3b1a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -42,7 +42,7 @@ com.azure azure-core-amqp - 1.0.0-beta.9 + 1.0.1 From f779305a8a6adf4343e237301069459c0f185260 Mon Sep 17 00:00:00 2001 From: Connie Date: Fri, 3 Jan 2020 15:20:04 -0800 Subject: [PATCH 13/13] Update changelog versions. --- sdk/core/azure-core-amqp/CHANGELOG.md | 2 +- .../CHANGELOG.md | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md index ef187deff7e8..14f7ad7a1365 100644 --- a/sdk/core/azure-core-amqp/CHANGELOG.md +++ b/sdk/core/azure-core-amqp/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0 (2020-01-07) +## 1.0.1 (2020-01-07) - Client library name and version are no longer hard coded in connection properties. - Update qpid-proton-j-extensions dependency - Shorten tracing span names diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md index c9a5c68526f3..56d05dd8004a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0-beta.5 (Unreleased) +## 1.0.1 (2020-01-07) ## 1.0.0-beta.4 (2019-12-02) - Artifact name changed from `preview` to `beta`. @@ -23,7 +23,7 @@ our efforts can be found in the [Azure SDK Design Guidelines for Java](https://a - Reactive streams support using [Project Reactor](https://projectreactor.io/). - Receive messages from all partitions of an Azure Event Hub using `EventProcessor`. -- Provide an instance of `BlobCheckpointStore` to your Event Processor. `BlobCheckpointStore` uses Azure Blob Storage to +- Provide an instance of `BlobCheckpointStore` to your Event Processor. `BlobCheckpointStore` uses Azure Blob Storage to store checkpoints and balance partition load among all instances of Event Processors. - Store checkpoint and partition ownership details in [Azure Storage Blobs](https://azure.microsoft.com/en-us/services/storage/blobs/). diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index ef6893f3c581..0364f66df4b7 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 5.0.0 (2020-01-07) +## 5.0.1 (2020-01-07) - Add support for different error handling cases in EventProcessor. - Recreate connection in client on transient errors. - Add tracing links when sending a batch of events.