From 14fda8a95f941392987f787a21210fa556255b72 Mon Sep 17 00:00:00 2001 From: shafang Date: Mon, 6 Jan 2020 11:34:50 -0800 Subject: [PATCH 1/2] update release version --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/appconfiguration/azure-data-appconfiguration/README.md | 4 ++-- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- .../azure-data-appconfiguration/src/samples/README.md | 2 +- .../src/samples/CreateConfigurationSettingTracingSample.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index ba4132fbd4e7e..f9890be2c9d6d 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -80,7 +80,7 @@ com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 532c37545d12b..1a83f4daa820e 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -13,7 +13,7 @@ com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8 com.azure:azure-core-test;1.1.0-beta.2;1.1.0 com.azure:azure-core-tracing-opencensus;1.0.0-beta.5;1.0.0-beta.6 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-data-appconfiguration;1.0.0-beta.7;1.0.1 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 diff --git a/sdk/appconfiguration/azure-data-appconfiguration/README.md b/sdk/appconfiguration/azure-data-appconfiguration/README.md index 4c4a2613da199..cca9820f33542 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/README.md +++ b/sdk/appconfiguration/azure-data-appconfiguration/README.md @@ -23,7 +23,7 @@ Use the client library for App Configuration to create and manage application co com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 ``` [//]: # ({x-version-update-end}) @@ -52,7 +52,7 @@ Netty and include OkHTTP client in your pom.xml. com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 com.azure diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index ae2de13b15fc2..0aa428df155fa 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -13,7 +13,7 @@ com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 Microsoft Azure client library for App Configuration This package contains the Microsoft Azure App Configuration client library. diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/README.md b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/README.md index 8ed4488f39770..cde109a068f8c 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/README.md +++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/README.md @@ -20,7 +20,7 @@ Maven dependency for Azure app configuration Client library. Add it to your proj com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md index ead70ae2d0b82..5c87cbe731501 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/CreateConfigurationSettingTracingSample.md @@ -23,7 +23,7 @@ Sample uses **[opentelemetry-sdk][opentelemetry_sdk]** as implementation package com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 ``` [//]: # ({x-version-update-end}) From a9bd50e93692a8512eb56670c0d150d72e8d7d1c Mon Sep 17 00:00:00 2001 From: shafang Date: Mon, 6 Jan 2020 13:12:41 -0800 Subject: [PATCH 2/2] remaining changes --- CONTRIBUTING.md | 2 +- eng/spotbugs-aggregate-report/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e11f6d85f8b13..152f0fc25560c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,7 +103,7 @@ Unreleased Dependency version – Whenever possible, libraries should be using t An example of Current vs Dependency versions: `com.azure:azure-storage-blob-batch` has dependencies on `com.azure:azure-core`, `com.azure:azure-core-http-netty` and `com.azure:azure-storage-blob`. Because `com.azure:azure-core` and `com.azure:azure-core-http-netty` are both built outside of azure-storage pipeline we should be using the released or *Dependency* versions of these when they're dependencies of another library. Similarly, libraries built as part of the same pipeline, that have interdependencies, should be using the Current version. Since `com.azure:azure-storage-blob-batch` and `com.azure:azure-storage-blob` are both built part of the azure-batch pipeline when `com.azure:azure-storage-blob` is declared as a dependency of `com.azure:azure-storage-blob-batch` it should be the *Current* version. -An example of an Unreleased Dependency version: Additive, not breaking, API changes have been made to `com.azure:azure-core`. `com.azure:azure-storage-blob` has a dependency on `com.azure:azure-core` and requires the additive API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](./eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_:;dependency-version`, in this example that would be `unreleased_com.azure:azure-core;1.2.0-beta.1` (this should match the 'current' version of core). The dependency update tags in the pom files that required this dependency would now reference `{x-version-update;unreleased_com.azure:azure-core;dependency}`. Once the updated library has been released the unreleased dependency version should be removed and the POM file update tags should be referencing the released version. +An example of an Unreleased Dependency version: Additive, not breaking, API changes have been made to `com.azure:azure-core`. `com.azure:azure-storage-blob` has a dependency on `com.azure:azure-core` and requires the additive API change that has not yet been released. An unreleased entry needs to be created in [version_client.txt](./eng/versioning/version_client.txt), under the unreleased section, with the following format: `unreleased_:;dependency-version`, in this example that would be `unreleased_com.azure:azure-core;1.2.0` (this should match the 'current' version of core). The dependency update tags in the pom files that required this dependency would now reference `{x-version-update;unreleased_com.azure:azure-core;dependency}`. Once the updated library has been released the unreleased dependency version should be removed and the POM file update tags should be referencing the released version. ### Tooling, version files and marker tags diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 96b1dce227959..c0d8eae8e2042 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -155,7 +155,7 @@ com.azure azure-data-appconfiguration - 1.0.0-beta.8 + 1.0.1 com.azure