From a0854586740993b64f907ed024160ed74d156d36 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 4 Aug 2020 12:56:00 +0800 Subject: [PATCH] Update external versions (#13749) * Update external_dependencies' version. Only patch version in this PR. * Update version by update_version.py. * Put version tag and version in the same line. * Update version by update_version.py. * Not downgrade version for netty-xxx-static * Update module name from gson to com.google.gson. Co-authored-by: Rujun Chen --- common/smoke-tests/pom.xml | 4 ++-- eng/code-quality-reports/pom.xml | 2 +- eng/versioning/external_dependencies.txt | 12 ++++++------ .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-spring-cloud-feature-management/pom.xml | 2 +- .../pom.xml | 2 +- sdk/batch/microsoft-azure-batch/pom.xml | 2 +- sdk/core/azure-core-serializer-json-gson/pom.xml | 4 ++-- .../src/main/java/module-info.java | 2 +- sdk/core/azure-core/pom.xml | 13 +++++-------- sdk/cosmos/azure-cosmos-benchmark/pom.xml | 4 ++-- sdk/cosmos/azure-cosmos-encryption/pom.xml | 6 +++--- sdk/cosmos/azure-cosmos/pom.xml | 6 +++--- sdk/cosmos/azure-spring-data-cosmos/pom.xml | 2 +- sdk/e2e/pom.xml | 6 +++--- sdk/eventgrid/microsoft-azure-eventgrid/pom.xml | 2 +- sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml | 6 +++--- .../microsoft-azure-eventhubs-extensions/pom.xml | 4 ++-- sdk/eventhubs/microsoft-azure-eventhubs/pom.xml | 6 +++--- sdk/identity/azure-identity/pom.xml | 4 ++-- .../microsoft-azure-keyvault-cryptography/pom.xml | 2 +- .../microsoft-azure-keyvault-extensions/pom.xml | 2 +- sdk/keyvault/microsoft-azure-keyvault-test/pom.xml | 2 +- .../microsoft-azure-keyvault-webkey/pom.xml | 2 +- sdk/keyvault/microsoft-azure-keyvault/pom.xml | 2 +- .../microsoft-azure-loganalytics/pom.xml | 2 +- sdk/mediaservices/microsoft-azure-media/pom.xml | 2 +- sdk/servicebus/microsoft-azure-servicebus/pom.xml | 4 ++-- sdk/spring/azure-spring-boot/pom.xml | 4 ++-- sdk/spring/azure-spring-cloud-context/pom.xml | 2 +- sdk/spring/azure-spring-cloud-telemetry/pom.xml | 2 +- sdk/storage/microsoft-azure-storage-blob/pom.xml | 4 ++-- 33 files changed, 60 insertions(+), 63 deletions(-) diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml index 151325e2b6ab4..feb9d8c2c9a1e 100644 --- a/common/smoke-tests/pom.xml +++ b/common/smoke-tests/pom.xml @@ -83,7 +83,7 @@ junit junit - 4.13-beta-3 + 4.13 test @@ -150,7 +150,7 @@ org.slf4j slf4j-simple - 1.7.25 + 1.7.30 diff --git a/eng/code-quality-reports/pom.xml b/eng/code-quality-reports/pom.xml index d5440ad3be7e6..7e370de28b1ca 100755 --- a/eng/code-quality-reports/pom.xml +++ b/eng/code-quality-reports/pom.xml @@ -48,7 +48,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 90167db5fbc73..f4dfbf14cdccc 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -10,7 +10,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.10.1 com.fasterxml.jackson.module:jackson-module-parameter-names;2.10.0 com.github.spotbugs:spotbugs;4.0.0-beta3 com.github.spotbugs:spotbugs-maven-plugin;3.1.12.2 -com.google.code.gson:gson;2.8.5 +com.google.code.gson:gson;2.8.6 com.google.guava:guava;24.1.1-jre com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0 com.microsoft.azure:azure-annotations;1.7.0 @@ -68,8 +68,8 @@ org.json:json;20140107 org.linguafranca.pwdb:KeePassJava2;2.1.4 org.powermock:powermock-api-mockito2;2.0.2 org.powermock:powermock-module-junit4;2.0.2 -org.slf4j:slf4j-api;1.7.28 -org.slf4j:slf4j-simple;1.7.25 +org.slf4j:slf4j-api;1.7.30 +org.slf4j:slf4j-simple;1.7.30 ## Spring boot dependency versions org.springframework.boot:spring-boot-starter-actuator;2.3.0.RELEASE @@ -123,12 +123,12 @@ com.microsoft.azure:azure-mgmt-storage;1.3.0 com.microsoft.azure:azure-storage;8.0.0 com.microsoft.azure:msal4j;1.6.1 com.microsoft.azure:msal4j-persistence-extension;0.2.0 -com.sun.activation:jakarta.activation;1.2.1 +com.sun.activation:jakarta.activation;1.2.2 io.opentelemetry:opentelemetry-api;0.6.0 io.opentelemetry:opentelemetry-sdk;0.6.0 io.grpc:grpc-context;1.30.0 io.projectreactor:reactor-test;3.3.8.RELEASE -junit:junit;4.13-beta-3 +junit:junit;4.13 org.apache.maven:maven-compat;3.6.2 org.apache.maven:maven-embedder;3.6.2 org.apache.maven.wagon:wagon-http;3.3.4 @@ -178,7 +178,7 @@ commons-validator:commons-validator;1.6 io.dropwizard.metrics:metrics-core;4.0.5 io.dropwizard.metrics:metrics-graphite;4.0.5 io.dropwizard.metrics:metrics-jvm;4.0.5 -io.reactivex.rxjava2:rxjava;2.2.4 +io.reactivex.rxjava2:rxjava;2.2.19 net.java.dev.jna:jna-platform;5.4.0 net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.4 net.jonathangiles.tools:whitelistgenerator-maven-plugin;1.0.2 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml index e584bdd53e698..2725a4757acde 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml @@ -44,7 +44,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 87485c3245e41..1c2c3962a7372 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml index fc4ad089c73ed..76cf992c1d977 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml @@ -44,7 +44,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml b/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml index 5e045accb447b..3ed88c151c2a6 100644 --- a/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml +++ b/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml @@ -53,7 +53,7 @@ junit junit test - 4.13-beta-3 + 4.13 diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index 00381ecdff89f..384a06be5e212 100644 --- a/sdk/batch/microsoft-azure-batch/pom.xml +++ b/sdk/batch/microsoft-azure-batch/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index 9d91d56ce7234..e9bdd7408e661 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -64,7 +64,7 @@ com.google.code.gson gson - 2.8.5 + 2.8.6 @@ -109,7 +109,7 @@ - com.google.code.gson:gson:[2.8.5] + com.google.code.gson:gson:[2.8.6] diff --git a/sdk/core/azure-core-serializer-json-gson/src/main/java/module-info.java b/sdk/core/azure-core-serializer-json-gson/src/main/java/module-info.java index 4b3cafc57d6b4..2343263a4298c 100644 --- a/sdk/core/azure-core-serializer-json-gson/src/main/java/module-info.java +++ b/sdk/core/azure-core-serializer-json-gson/src/main/java/module-info.java @@ -3,7 +3,7 @@ module com.azure.core.serializer.json.gson { requires transitive com.azure.core; - requires transitive gson; + requires transitive com.google.gson; exports com.azure.core.serializer.json.gson; diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index ffa1a316ceede..21b7108e7ee39 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -68,7 +68,7 @@ org.slf4j slf4j-api - 1.7.28 + 1.7.30 + io.netty:netty-tcnative-boringssl-static:[2.0.31.Final] io.projectreactor:reactor-core:[3.3.8.RELEASE] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.10.1] - - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.10.1] - - org.slf4j:slf4j-api:[1.7.28] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.10.1] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.10.1] + org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 4d66bc5364ef8..6480568040f44 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -112,7 +112,7 @@ Licensed under the MIT License. org.slf4j slf4j-api - 1.7.28 + 1.7.30 @@ -225,7 +225,7 @@ Licensed under the MIT License. com.beust:jcommander:[1.58] io.dropwizard.metrics:metrics-core:[4.1.0] - org.slf4j:slf4j-api:[1.7.28] + org.slf4j:slf4j-api:[1.7.30] com.google.guava:guava:[25.0-jre] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 31c026b8a3a49..c22d47bca5e85 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -125,7 +125,7 @@ Licensed under the MIT License. io.reactivex.rxjava2 rxjava - 2.2.4 + 2.2.19 test @@ -210,8 +210,8 @@ Licensed under the MIT License. io.netty:netty-transport-native-epoll:[4.1.51.Final] io.projectreactor:reactor-core:[3.3.8.RELEASE] io.projectreactor.netty:reactor-netty:[0.9.10.RELEASE] - org.slf4j:slf4j-api:[1.7.28] - org.slf4j:slf4j-api:[1.7.28] + org.slf4j:slf4j-api:[1.7.30] + org.slf4j:slf4j-api:[1.7.30] org.bouncycastle:bcprov-jdk15on:[1.60] diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index e35f0bd4d0b06..bd5b6f0aadce7 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -137,7 +137,7 @@ Licensed under the MIT License. org.slf4j slf4j-api - 1.7.28 + 1.7.30 @@ -218,7 +218,7 @@ Licensed under the MIT License. io.reactivex.rxjava2 rxjava - 2.2.4 + 2.2.19 test @@ -287,7 +287,7 @@ Licensed under the MIT License. io.netty:netty-transport-native-epoll:[4.1.51.Final] io.projectreactor:reactor-core:[3.3.8.RELEASE] io.projectreactor.netty:reactor-netty:[0.9.10.RELEASE] - org.slf4j:slf4j-api:[1.7.28] + org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index 7a24eb8470097..bce6288d28caa 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -153,7 +153,7 @@ org.slf4j slf4j-simple - 1.7.25 + 1.7.30 test + 1.7.30 com.microsoft.azure @@ -70,7 +70,7 @@ junit junit - 4.13-beta-3 + 4.13 test @@ -91,7 +91,7 @@ - org.slf4j:slf4j-api:[1.7.28] + org.slf4j:slf4j-api:[1.7.30] com.microsoft.azure:azure-mgmt-graph-rbac:[1.3.0] diff --git a/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml index 4863f99d3365e..068b42ace62db 100644 --- a/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml +++ b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml @@ -52,7 +52,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml index 85c920554fdf9..ef2707bbb27fa 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml @@ -45,19 +45,19 @@ com.google.code.gson gson - 2.8.5 + 2.8.6 junit junit - 4.13-beta-3 + 4.13 test org.slf4j slf4j-simple - 1.7.25 + 1.7.30 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml index ce73244aad48e..b0fd3b5deb32f 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml @@ -51,13 +51,13 @@ junit junit - 4.13-beta-3 + 4.13 test org.slf4j slf4j-simple - 1.7.25 + 1.7.30 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml index c8bbb53d00fb7..a5a4014a3310a 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml @@ -45,7 +45,7 @@ org.slf4j slf4j-api - 1.7.28 + 1.7.30 @@ -64,13 +64,13 @@ junit junit - 4.13-beta-3 + 4.13 test org.slf4j slf4j-simple - 1.7.25 + 1.7.30 test diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 5e2590f995e43..186ef9c3c5dd6 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -59,7 +59,7 @@ junit junit - 4.13-beta-3 + 4.13 test @@ -101,7 +101,7 @@ com.google.code.gson gson - 2.8.5 + 2.8.6 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml index d55c8365ba2ae..2fc1ed899ae59 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml @@ -84,7 +84,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml index 9c08df22e7251..b2db29ca655ad 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml @@ -117,7 +117,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml index cc060313b224c..f5cc11d231329 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml @@ -34,7 +34,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml index e37c3ea97acbd..69729285462a0 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml @@ -74,7 +74,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/keyvault/microsoft-azure-keyvault/pom.xml b/sdk/keyvault/microsoft-azure-keyvault/pom.xml index 09c2e728c58fb..c21e318502914 100644 --- a/sdk/keyvault/microsoft-azure-keyvault/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault/pom.xml @@ -142,7 +142,7 @@ the MIT License. See License.txt in the project root for license information. -- junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml index 3b0ffa86d91fa..92c23766586b5 100644 --- a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml +++ b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml @@ -59,7 +59,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml index fb3e707e65dbe..84a760ccaa7c0 100644 --- a/sdk/mediaservices/microsoft-azure-media/pom.xml +++ b/sdk/mediaservices/microsoft-azure-media/pom.xml @@ -141,7 +141,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/servicebus/microsoft-azure-servicebus/pom.xml b/sdk/servicebus/microsoft-azure-servicebus/pom.xml index 9fea98c36e0a3..073d5ed95f849 100644 --- a/sdk/servicebus/microsoft-azure-servicebus/pom.xml +++ b/sdk/servicebus/microsoft-azure-servicebus/pom.xml @@ -68,7 +68,7 @@ org.slf4j slf4j-api - 1.7.28 + 1.7.30 org.asynchttpclient @@ -84,7 +84,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index 6b1329b864fe9..cd9a1805bd73b 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -34,7 +34,7 @@ org.slf4j slf4j-api - 1.7.28 + 1.7.30 @@ -275,7 +275,7 @@ javax.servlet:javax.servlet-api:[4.0.1] javax.annotation:javax.annotation-api:[1.3.2] javax.validation:validation-api:[2.0.1.Final] - org.slf4j:slf4j-api:[1.7.28] + org.slf4j:slf4j-api:[1.7.30] org.hibernate.validator:hibernate-validator:[6.0.17.Final] org.springframework:spring-web:[5.2.6.RELEASE] org.springframework:spring-jms:[5.2.6.RELEASE] diff --git a/sdk/spring/azure-spring-cloud-context/pom.xml b/sdk/spring/azure-spring-cloud-context/pom.xml index 5bb4cba121dd1..e7ac1b00432a7 100644 --- a/sdk/spring/azure-spring-cloud-context/pom.xml +++ b/sdk/spring/azure-spring-cloud-context/pom.xml @@ -71,7 +71,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/spring/azure-spring-cloud-telemetry/pom.xml b/sdk/spring/azure-spring-cloud-telemetry/pom.xml index fa9b309d73c91..4c866c8e44930 100644 --- a/sdk/spring/azure-spring-cloud-telemetry/pom.xml +++ b/sdk/spring/azure-spring-cloud-telemetry/pom.xml @@ -47,7 +47,7 @@ junit junit - 4.13-beta-3 + 4.13 test diff --git a/sdk/storage/microsoft-azure-storage-blob/pom.xml b/sdk/storage/microsoft-azure-storage-blob/pom.xml index 0a62fb807835e..f6393fe6a35cb 100644 --- a/sdk/storage/microsoft-azure-storage-blob/pom.xml +++ b/sdk/storage/microsoft-azure-storage-blob/pom.xml @@ -56,7 +56,7 @@ org.slf4j slf4j-api - 1.7.28 + 1.7.30 @@ -69,7 +69,7 @@ junit junit - 4.13-beta-3 + 4.13 test