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

Update Event Hubs and azure-core-amqp current versions and CHANGELOG to GA #7100

Merged
merged 13 commits into from
Jan 6, 2020
Merged
6 changes: 3 additions & 3 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -105,12 +105,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
6 changes: 3 additions & 3 deletions eng/spotbugs-aggregate-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -193,12 +193,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
20 changes: 0 additions & 20 deletions eng/versioning/update_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand All @@ -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.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
Expand Down
6 changes: 0 additions & 6 deletions eng/versioning/version_client_java_files.txt

This file was deleted.

18 changes: 9 additions & 9 deletions sdk/core/azure-core-amqp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.
Expand All @@ -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)

2 changes: 1 addition & 1 deletion sdk/core/azure-core-amqp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ own AMQP client library that abstracts from the underlying transport library's i
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.9</version>
<version>1.0.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure Java Core AMQP Library</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Sample uses **[opencensus-impl][opencensus_impl]** as implementation package and
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version>
<version>5.0.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** for implementation and **
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version>
<version>5.0.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ All client libraries, by default, use the Tomcat-native Boring SSL library to en
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.5</version>
<version>1.0.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->

<name>Microsoft Azure client library for storing checkpoints in Storage Blobs</name>
<description>Library for using storing checkpoints in Storage Blobs</description>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
11 changes: 8 additions & 3 deletions sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhubs/azure-messaging-eventhubs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples]
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version>
<version>5.0.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhubs/azure-messaging-eventhubs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->

<name>Microsoft Azure client library for Event Hubs</name>
<description>Libraries built on Microsoft Azure Event Hubs</description>
Expand Down