From c4b7a5abd28287793397e166f8298ca28a847d27 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Tue, 17 Dec 2019 09:49:49 -0800 Subject: [PATCH 1/2] Set core dep version to 1.1.0 --- eng/versioning/version_client.txt | 8 ++++++-- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 2 +- sdk/core/azure-core-tracing-opencensus/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-certificates/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-keys/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-secrets/pom.xml | 2 +- sdk/storage/azure-storage-blob-batch/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 2 +- sdk/storage/azure-storage-file-datalake/pom.xml | 2 +- sdk/storage/azure-storage-file-share/pom.xml | 2 +- sdk/storage/azure-storage-queue/pom.xml | 2 +- sdk/template/azure-sdk-template/pom.xml | 2 +- 17 files changed, 22 insertions(+), 18 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 2287e6a94a2e..4e74184ef1a9 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -4,7 +4,7 @@ com.azure:azure-sdk-all;1.0.0;1.0.0 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-core;1.2.0-beta.1;1.2.0-beta.1 +com.azure:azure-core;1.1.0;1.2.0-beta.1 com.azure:azure-core-amqp;1.0.0-beta.9;1.0.0-beta.9 com.azure:azure-core-http-netty;1.1.0;1.2.0-beta.1 com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1 @@ -27,4 +27,8 @@ com.azure:azure-storage-common;12.1.0;12.2.0-beta.1 com.azure:azure-storage-file-share;12.0.0;12.1.0-beta.1 com.azure:azure-storage-file-datalake;12.0.0-beta.7;12.0.0-beta.8 com.azure:azure-storage-queue;12.1.0;12.2.0-beta.1 -com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 \ No newline at end of file +com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 + +# This is a temporary fix as appconfiguration is the only library that needs +# the updated core dependency +appconfiguration_com.azure:azure-core;1.2.0-beta.1;1.2.0-beta.1 \ No newline at end of file diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index d58d7284969a..c284547089ad 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.2.0-beta.1 org.slf4j diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 663eb5716991..45501824e370 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -38,7 +38,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 diff --git a/sdk/core/azure-core-tracing-opencensus/pom.xml b/sdk/core/azure-core-tracing-opencensus/pom.xml index 2312a96f885e..851458135a78 100644 --- a/sdk/core/azure-core-tracing-opencensus/pom.xml +++ b/sdk/core/azure-core-tracing-opencensus/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 io.opencensus diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index b08e871d072a..222309473689 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 25907cddd2a7..e6bd3c425d19 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 com.azure diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 1beb626547cc..e6ca9c3ae917 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -23,7 +23,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 org.slf4j diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 94a553bdedf5..8446aa3545d4 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 97dfcfadb3cc..07c875219e47 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 07f32283c7df..17ae014949ab 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -34,7 +34,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index a4875c005fa5..285145417592 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index c63cd8296fb4..376431f24712 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index 5168b7f1b931..183c36ff56b2 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 org.slf4j diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 0c0a012962f7..3c64543d5d04 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 + 1.1.0 com.azure diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index f690b2b32f8a..b3b44ff2d7ac 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 com.azure diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 3ab247291746..d61131d1e5f9 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -31,7 +31,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.1.0 junit From 0a803b6c8d484e76cd782a7d46043a4ee9568f5a Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Tue, 17 Dec 2019 10:34:31 -0800 Subject: [PATCH 2/2] More libs needing unreleased dep core version --- eng/versioning/version_client.txt | 2 +- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-tracing-opencensus/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 4e74184ef1a9..8c25823dd000 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -31,4 +31,4 @@ com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 # This is a temporary fix as appconfiguration is the only library that needs # the updated core dependency -appconfiguration_com.azure:azure-core;1.2.0-beta.1;1.2.0-beta.1 \ No newline at end of file +unreleased_com.azure:azure-core;1.2.0-beta.1;1.2.0-beta.1 \ No newline at end of file diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index c284547089ad..b560c9da4089 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.2.0-beta.1 org.slf4j diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 42515a95cbc6..b5432a7c16b4 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.2.0-beta.1 + 1.2.0-beta.1 com.microsoft.azure diff --git a/sdk/core/azure-core-tracing-opencensus/pom.xml b/sdk/core/azure-core-tracing-opencensus/pom.xml index 851458135a78..da4ee56f6647 100644 --- a/sdk/core/azure-core-tracing-opencensus/pom.xml +++ b/sdk/core/azure-core-tracing-opencensus/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.1.0 + 1.2.0-beta.1 io.opencensus diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 222309473689..4742881c7877 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.1.0 + 1.2.0-beta.1 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index e6bd3c425d19..f4b465c4529f 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.1.0 + 1.2.0-beta.1 com.azure