From 23f4a2931cd49ca79e8f3f5b799bdfefebacfea0 Mon Sep 17 00:00:00 2001 From: Muyao Date: Tue, 30 May 2023 17:06:14 +0800 Subject: [PATCH 01/12] update compatibility for 3.1.x --- .../AzureSpringBootVersionVerifier.java | 4 ++- .../ClassNameResolverPredicate.java | 26 +++++++++++++++++-- .../AzureCompatibilityVerifierProperties.java | 2 +- .../ClassNameResolverPredicateTest.java | 24 +++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicateTest.java diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java index f0944fd82e0a..d6bf0549a402 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java @@ -19,8 +19,9 @@ public class AzureSpringBootVersionVerifier { private static final Logger LOGGER = LoggerFactory.getLogger(AzureSpringBootVersionVerifier.class); static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"; + static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer.ValidationConfigurationCustomizer,setIgnoreRegistrationFailure,"; /** - * Versions supported by Spring Cloud Azure, for present is [2.5, 2.6]. Update this value if needed. + * Versions supported by Spring Cloud Azure, for present is [3.0, 3.1]. Update this value if needed. */ private final Map supportedVersions = new HashMap<>(); @@ -43,6 +44,7 @@ public AzureSpringBootVersionVerifier(List acceptedVersions, ClassNameRe */ private void initDefaultSupportedBootVersionCheckMeta() { supportedVersions.put("3.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0); + supportedVersions.put("3.1", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1); } /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicate.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicate.java index 3ec30e389706..bd588b22f921 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicate.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicate.java @@ -10,11 +10,33 @@ boolean resolve(String fullyQualifiedClassName) { if (fullyQualifiedClassName == null) { return false; } - - Class.forName(fullyQualifiedClassName); + if (fullyQualifiedClassName.contains(",")) { + String[] stringNames = fullyQualifiedClassName.split(","); + if (stringNames.length > 2) { + Class[] params = new Class[stringNames.length - 2]; + for (int i = 2; i < stringNames.length; i++) { + if (stringNames[i].equals("int")) { + params[i - 2] = int.class; + continue; + } + if (stringNames[i].equals("boolean")) { + params[i - 2] = boolean.class; + continue; + } + params[i - 2] = Class.forName(stringNames[i]); + } + Class.forName(stringNames[0]).getMethod(stringNames[1], params); + } else { + Class.forName(stringNames[0]).getMethod(stringNames[1]); + } + } else { + Class.forName(fullyQualifiedClassName); + } return true; } catch (ClassNotFoundException ex) { return false; + } catch (NoSuchMethodException ex) { + return false; } } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java index 3e6b19a4e088..0f1ef9b82fd0 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java @@ -18,7 +18,7 @@ public class AzureCompatibilityVerifierProperties { /** * Comma-delimited list of Spring Boot versions that are compatible with current Spring Cloud Azure's version. */ - private List compatibleBootVersions = Arrays.asList("3.0.x"); + private List compatibleBootVersions = Arrays.asList("3.0.x", "3.1.x"); public boolean isEnabled() { return this.enabled; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicateTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicateTest.java new file mode 100644 index 000000000000..3301c5f9eb10 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/ClassNameResolverPredicateTest.java @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.compatibility; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ClassNameResolverPredicateTest { + + @Test + void testResolve() { + ClassNameResolverPredicate predicate = new ClassNameResolverPredicate(); + Assertions.assertTrue(predicate.resolve("com.azure.spring.cloud.autoconfigure.implementation.compatibility.ClassNameResolverPredicateTest")); + Assertions.assertTrue(predicate.resolve("com.azure.spring.cloud.autoconfigure.implementation.compatibility.ClassNameResolverPredicateTest,testMethod")); + Assertions.assertTrue(predicate.resolve("com.azure.spring.cloud.autoconfigure.implementation.compatibility.ClassNameResolverPredicateTest,testMethod2,boolean")); + Assertions.assertTrue(predicate.resolve("com.azure.spring.cloud.autoconfigure.implementation.compatibility.ClassNameResolverPredicateTest,testMethod3,boolean,java.lang.String")); + Assertions.assertFalse(predicate.resolve("com.azure.spring.cloud.autoconfigure.implementation.compatibility.ClassNameResolverPredicateTest,testMethod4")); + } + + public void testMethod() {} + public void testMethod2(boolean b) {} + public void testMethod3(boolean b, String a) {} +} From 318995165ad0943bc58d17f4fb780fb71f038b00 Mon Sep 17 00:00:00 2001 From: Muyao Date: Tue, 30 May 2023 11:15:17 +0800 Subject: [PATCH 02/12] update redis --- .../resources/spotbugs/spotbugs-exclude.xml | 12 ++++++++++ .../redis/AzureRedisAutoConfiguration.java | 23 +++++++++++++++++-- .../AzureRedisAutoConfigurationTests.java | 20 +++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml index d94f3ad1e601..51dbd720393d 100644 --- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml +++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml @@ -2220,6 +2220,18 @@ + + + + + + + + + + + + diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java index c5152e0f2bf8..f43140b3a612 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java @@ -19,7 +19,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.data.redis.core.RedisOperations; +import org.springframework.util.ReflectionUtils; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Arrays; /** @@ -39,7 +42,8 @@ public class AzureRedisAutoConfiguration { @Primary @Bean RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, - AzureResourceManager azureResourceManager) { + AzureResourceManager azureResourceManager) throws InvocationTargetException, + IllegalAccessException { String cacheName = azureRedisProperties.getName(); String resourceGroup = azureRedisProperties.getResource().getResourceGroup(); @@ -63,7 +67,22 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, } redisProperties.setPassword(redisCache.keys().primaryKey()); - redisProperties.setSsl(useSsl); + Method setSsl = ReflectionUtils.findMethod(RedisProperties.class, "setSsl", boolean.class); + if (setSsl == null) { + Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Class targetInnerClass = null; + for (Class innerClass : innerClasses) { + if (innerClass.getSimpleName().equals("Ssl")) { + targetInnerClass = innerClass; + break; + } + } + ReflectionUtils.findMethod(targetInnerClass, "setEnabled", boolean.class) + .invoke(ssl, useSsl); + } else { + setSsl.invoke(redisProperties, useSsl); + } return redisProperties; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java index 88300b9e14f9..4ee0959d4f53 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java @@ -14,6 +14,9 @@ import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.data.redis.core.RedisOperations; +import org.springframework.util.ReflectionUtils; + +import java.lang.reflect.Method; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -107,7 +110,22 @@ void shouldConfigureWithNameAndResourceGroupAndResourceManager() { assertThat(redisProperties.getPassword()).isEqualTo(KEY); assertThat(redisProperties.getHost()).isEqualTo(HOST); assertThat(redisProperties.getPort()).isEqualTo(PORT); - assertThat(redisProperties.isSsl()).isEqualTo(IS_SSL); + Method isSsl = ReflectionUtils.findMethod(RedisProperties.class, "isSsl"); + if (isSsl == null) { + Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Class targetInnerClass = null; + for (Class innerClass : innerClasses) { + if (innerClass.getSimpleName().equals("Ssl")) { + targetInnerClass = innerClass; + break; + } + } + assertThat(ReflectionUtils.findMethod(targetInnerClass, "isEnabled") + .invoke(ssl).equals(IS_SSL)); + } else { + assertThat(isSsl.invoke(redisProperties).equals(IS_SSL)); + } }); } From 6eaa4e95e4a8a87f0a89543de1e8051872c07ad4 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 15:46:24 +0800 Subject: [PATCH 03/12] upgrade httpclient to httpclient5 --- eng/versioning/external_dependencies.txt | 2 +- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index d9716c5263bf..b34e8fa95118 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -80,7 +80,6 @@ org.apache.avro:avro;1.11.0 org.apache.avro:avro-maven-plugin;1.11.0 org.apache.commons:commons-compress;1.22 org.apache.commons:commons-lang3;3.12.0 -org.apache.httpcomponents:httpclient;4.5.14 org.apache.kafka:kafka-clients;3.3.2 org.apache.logging.log4j:log4j-api;2.19.0 org.apache.logging.log4j:log4j-core;2.19.0 @@ -401,6 +400,7 @@ com.github.tomakehurst:wiremock-jre8;2.33.2 com.github.tomakehurst:wiremock-standalone;2.24.1 jakarta.servlet:jakarta.servlet-api;6.0.0 jakarta.xml.bind:jakarta.xml.bind-api;4.0.0 +org.apache.httpcomponents.client5:httpclient5;5.2.1 org.apache.logging.log4j:log4j-slf4j2-impl;2.19.0 org.springframework.boot:spring-boot-starter-log4j2;3.0.5 org.springframework.cloud:spring-cloud-stream-test-binder;4.0.2 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index e2b65485732c..331a39f3aa2b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -310,9 +310,9 @@ - org.apache.httpcomponents - httpclient - 4.5.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 test From 2e656cf2888b2625d827001965828e2dda4419f5 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 16:07:00 +0800 Subject: [PATCH 04/12] upgrade httpclient to httpclient5 --- eng/versioning/external_dependencies.txt | 2 +- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 8 ++++---- sdk/keyvault/azure-security-test-keyvault-jca/pom.xml | 6 +++--- sdk/mediaservices/microsoft-azure-media/pom.xml | 6 +++--- sdk/resourcemanager/azure-resourcemanager-samples/pom.xml | 8 ++++---- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index b34e8fa95118..0e882480315e 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -400,7 +400,7 @@ com.github.tomakehurst:wiremock-jre8;2.33.2 com.github.tomakehurst:wiremock-standalone;2.24.1 jakarta.servlet:jakarta.servlet-api;6.0.0 jakarta.xml.bind:jakarta.xml.bind-api;4.0.0 -org.apache.httpcomponents.client5:httpclient5;5.2.1 +org.apache.httpcomponents.client5:httpclient5;5.1.4 org.apache.logging.log4j:log4j-slf4j2-impl;2.19.0 org.springframework.boot:spring-boot-starter-log4j2;3.0.5 org.springframework.cloud:spring-cloud-stream-test-binder;4.0.2 diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 1ba8cda69286..4dc487eb4f25 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -31,9 +31,9 @@ - org.apache.httpcomponents - httpclient - 4.5.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.1.4 @@ -209,7 +209,7 @@ com.fasterxml.jackson.core:jackson-databind:[2.14.2] org.conscrypt:conscrypt-openjdk-uber:[2.2.1] - org.apache.httpcomponents:httpclient:[4.5.14] + org.apache.httpcomponents.client5:httpclient5:[5.1.4] org.slf4j:slf4j-nop:[2.0.7] diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index a3eecb142a37..d9abe117e909 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -30,9 +30,9 @@ - org.apache.httpcomponents - httpclient - 4.5.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.1.4 test diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml index 273e198393a5..84b99f05e388 100644 --- a/sdk/mediaservices/microsoft-azure-media/pom.xml +++ b/sdk/mediaservices/microsoft-azure-media/pom.xml @@ -70,9 +70,9 @@ 1.2.0 - org.apache.httpcomponents - httpclient - 4.5.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.1.4 javax.xml.bind diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 029cfae197d7..6549cf608b44 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -88,9 +88,9 @@ 3.2.1 - org.apache.httpcomponents - httpclient - 4.5.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.1.4 org.slf4j @@ -190,7 +190,7 @@ - org.apache.httpcomponents:httpclient:[4.5.14] + org.apache.httpcomponents.client5:httpclient5:[5.1.4] io.fabric8:kubernetes-client:[6.2.0] com.jcraft:jsch:[0.1.55] org.slf4j:slf4j-simple:[2.0.7] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 331a39f3aa2b..285ca083714e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -312,7 +312,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.2.1 + 5.1.4 test From 1a5505fe63517ae37c4e0915ea904a688d1a2da7 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 16:39:37 +0800 Subject: [PATCH 05/12] fix pl --- eng/jacoco-test-coverage/pom.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index f4dd533eb962..65a8efe6787f 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -290,11 +290,12 @@ azure-security-keyvault-certificates 4.6.0-beta.1 - - com.azure - azure-security-keyvault-jca - 2.8.0-beta.1 - + + + + + + com.azure azure-security-keyvault-keys From 143cbbf1489e2b2fc66528be0f18fee6c8713070 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 17:08:08 +0800 Subject: [PATCH 06/12] revert --- eng/jacoco-test-coverage/pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 65a8efe6787f..f4dd533eb962 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -290,12 +290,11 @@ azure-security-keyvault-certificates 4.6.0-beta.1 - - - - - - + + com.azure + azure-security-keyvault-jca + 2.8.0-beta.1 + com.azure azure-security-keyvault-keys From 10b925c17d43bd458a4960ede408be2f6d269973 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 17:25:15 +0800 Subject: [PATCH 07/12] revert --- eng/versioning/external_dependencies.txt | 2 +- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 6 +++--- .../azure-security-test-keyvault-jca/pom.xml | 6 +++--- sdk/mediaservices/microsoft-azure-media/pom.xml | 6 +++--- .../azure-resourcemanager-samples/pom.xml | 6 +++--- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 0e882480315e..d9716c5263bf 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -80,6 +80,7 @@ org.apache.avro:avro;1.11.0 org.apache.avro:avro-maven-plugin;1.11.0 org.apache.commons:commons-compress;1.22 org.apache.commons:commons-lang3;3.12.0 +org.apache.httpcomponents:httpclient;4.5.14 org.apache.kafka:kafka-clients;3.3.2 org.apache.logging.log4j:log4j-api;2.19.0 org.apache.logging.log4j:log4j-core;2.19.0 @@ -400,7 +401,6 @@ com.github.tomakehurst:wiremock-jre8;2.33.2 com.github.tomakehurst:wiremock-standalone;2.24.1 jakarta.servlet:jakarta.servlet-api;6.0.0 jakarta.xml.bind:jakarta.xml.bind-api;4.0.0 -org.apache.httpcomponents.client5:httpclient5;5.1.4 org.apache.logging.log4j:log4j-slf4j2-impl;2.19.0 org.springframework.boot:spring-boot-starter-log4j2;3.0.5 org.springframework.cloud:spring-cloud-stream-test-binder;4.0.2 diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 4dc487eb4f25..28cf9683594c 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -31,9 +31,9 @@ - org.apache.httpcomponents.client5 - httpclient5 - 5.1.4 + org.apache.httpcomponents + httpclient + 4.5.14 diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index d9abe117e909..a3eecb142a37 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -30,9 +30,9 @@ - org.apache.httpcomponents.client5 - httpclient5 - 5.1.4 + org.apache.httpcomponents + httpclient + 4.5.14 test diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml index 84b99f05e388..273e198393a5 100644 --- a/sdk/mediaservices/microsoft-azure-media/pom.xml +++ b/sdk/mediaservices/microsoft-azure-media/pom.xml @@ -70,9 +70,9 @@ 1.2.0 - org.apache.httpcomponents.client5 - httpclient5 - 5.1.4 + org.apache.httpcomponents + httpclient + 4.5.14 javax.xml.bind diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 6549cf608b44..7e8470668719 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -88,9 +88,9 @@ 3.2.1 - org.apache.httpcomponents.client5 - httpclient5 - 5.1.4 + org.apache.httpcomponents + httpclient + 4.5.14 org.slf4j diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 285ca083714e..f6b9aae69ba0 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -309,12 +309,12 @@ - - org.apache.httpcomponents.client5 - httpclient5 - 5.1.4 - test - + + + + + + From e14e52770e90014e0f31b9a68f771e56e4dcec52 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 17:25:48 +0800 Subject: [PATCH 08/12] remove http for sample --- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index f6b9aae69ba0..5e54a3485af8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -308,14 +308,6 @@ test - - - - - - - - com.mysql From 60f91606005c3caf8059acfca29f2146221f60d2 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 17:35:15 +0800 Subject: [PATCH 09/12] fix --- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 2 +- sdk/resourcemanager/azure-resourcemanager-samples/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 28cf9683594c..1ba8cda69286 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -209,7 +209,7 @@ com.fasterxml.jackson.core:jackson-databind:[2.14.2] org.conscrypt:conscrypt-openjdk-uber:[2.2.1] - org.apache.httpcomponents.client5:httpclient5:[5.1.4] + org.apache.httpcomponents:httpclient:[4.5.14] org.slf4j:slf4j-nop:[2.0.7] diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 7e8470668719..029cfae197d7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -190,7 +190,7 @@ - org.apache.httpcomponents.client5:httpclient5:[5.1.4] + org.apache.httpcomponents:httpclient:[4.5.14] io.fabric8:kubernetes-client:[6.2.0] com.jcraft:jsch:[0.1.55] org.slf4j:slf4j-simple:[2.0.7] From f7b68ff004c5e7b8808dfc8ac608a722e11e7df6 Mon Sep 17 00:00:00 2001 From: Muyao Date: Mon, 26 Jun 2023 22:26:40 +0800 Subject: [PATCH 10/12] fix pl --- .../src/main/resources/revapi/revapi.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index 7dba51f8db79..44e04fe22349 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/eng/code-quality-reports/src/main/resources/revapi/revapi.json @@ -303,6 +303,17 @@ "code" : "java.method.removed", "old" : "method void com.mysql.cj.protocol.ServerSession::setOldStatusFlags(int)", "justification" : "Fix method removed." + }, + { + "code" : "java.field.removed", + "old" : "field com.mysql.cj.conf.PropertyKey.ociConfigProfile", + "justification" : "Fix field removed." + }, + { + "regex": true, + "code" : "java.method.addedToInterface", + "new" : "method (void|int) com.mysql.cj.protocol.ServerSession::(getOldStatusFlags()|setOldStatusFlags(int))", + "justification" : "Method was added to an interface." } ] } From 575976bc393943bdd897b2ad370b2be752375219 Mon Sep 17 00:00:00 2001 From: Muyao Date: Tue, 27 Jun 2023 08:18:04 +0800 Subject: [PATCH 11/12] fix pl --- eng/code-quality-reports/src/main/resources/revapi/revapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index 44e04fe22349..776df9d9d97e 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/eng/code-quality-reports/src/main/resources/revapi/revapi.json @@ -312,7 +312,7 @@ { "regex": true, "code" : "java.method.addedToInterface", - "new" : "method (void|int) com.mysql.cj.protocol.ServerSession::(getOldStatusFlags()|setOldStatusFlags(int))", + "new" : "method (void|int) com.mysql.cj.protocol.(ServerSession::getOldStatusFlags()|ServerSession::setOldStatusFlags(int))", "justification" : "Method was added to an interface." } ] From 38de567d0a69b68e4bcc673fb15e68d06f766b90 Mon Sep 17 00:00:00 2001 From: Muyao Date: Tue, 27 Jun 2023 09:18:14 +0800 Subject: [PATCH 12/12] fix pl --- .../src/main/resources/revapi/revapi.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index 776df9d9d97e..0935864e183f 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/eng/code-quality-reports/src/main/resources/revapi/revapi.json @@ -310,9 +310,13 @@ "justification" : "Fix field removed." }, { - "regex": true, "code" : "java.method.addedToInterface", - "new" : "method (void|int) com.mysql.cj.protocol.(ServerSession::getOldStatusFlags()|ServerSession::setOldStatusFlags(int))", + "new" : "method int com.mysql.cj.protocol.ServerSession::getOldStatusFlags()", + "justification" : "Method was added to an interface." + }, + { + "code" : "java.method.addedToInterface", + "new" : "method void com.mysql.cj.protocol.ServerSession::setOldStatusFlags(int)", "justification" : "Method was added to an interface." } ]