diff --git a/sdk/spring/scripts/sync_external_dependencies.py b/sdk/spring/scripts/sync_external_dependencies.py index 8b486adabc34..092a9a446005 100644 --- a/sdk/spring/scripts/sync_external_dependencies.py +++ b/sdk/spring/scripts/sync_external_dependencies.py @@ -19,7 +19,6 @@ import unittest import argparse from itertools import takewhile -from packaging import version from log import log @@ -102,8 +101,23 @@ def sync_external_dependencies(source_file, target_file): file.write('\n') -def version_bigger_than(source_version, target_version): - return version.parse(source_version) > version.parse(target_version) +def version_bigger_than(version1, version2): + v1 = version1.split('.') + v2 = version2.split('.') + len_1 = len(v1) + len_2 = len(v2) + max_len = max(len_1, len_1) + for i in range(max_len): + if i < len_1 and i < len_2: + int_1 = int('0' + ''.join(takewhile(str.isdigit, v1[i]))) + int_2 = int('0' + ''.join(takewhile(str.isdigit, v2[i]))) + if int_1 != int_2: + return int_1 > int_2 + elif i < len_1: + return True + else: + return False + return False class Tests(unittest.TestCase): diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java index 634a11e7adce..a4772a8c2490 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java @@ -16,6 +16,7 @@ import com.nimbusds.jose.proc.JWSKeySelector; import com.nimbusds.jose.proc.JWSVerificationKeySelector; import com.nimbusds.jose.proc.SecurityContext; +import com.nimbusds.jose.shaded.json.JSONArray; import com.nimbusds.jose.util.ResourceRetriever; import com.nimbusds.jwt.JWT; import com.nimbusds.jwt.JWTClaimsSet; @@ -24,7 +25,6 @@ import com.nimbusds.jwt.proc.ConfigurableJWTProcessor; import com.nimbusds.jwt.proc.DefaultJWTClaimsVerifier; import com.nimbusds.jwt.proc.DefaultJWTProcessor; -import net.minidev.json.JSONArray; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/cloudfoundry/AzureCfService.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/cloudfoundry/AzureCfService.java index d4ff13e4af25..9084d46efff5 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/cloudfoundry/AzureCfService.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/cloudfoundry/AzureCfService.java @@ -26,7 +26,7 @@ enum AzureCfService { "accessKey", "account-key" )), - REDIS("spring.data.redis", "azure-rediscache", + REDIS("spring.redis", "azure-rediscache", getImmutableMap("host", "host", "password", "password", "port", "port"), false); diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml index 8030cafd6d78..14e54a2efac5 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml @@ -106,14 +106,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - false - - org.apache.maven.plugins maven-jar-plugin diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml index a7557d3f4c0b..e5404668f712 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml @@ -100,14 +100,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - false - - org.apache.maven.plugins maven-jar-plugin diff --git a/sdk/spring/spring-cloud-azure-supported-spring.json b/sdk/spring/spring-cloud-azure-supported-spring.json index ce0803abb83d..5613f282f406 100644 --- a/sdk/spring/spring-cloud-azure-supported-spring.json +++ b/sdk/spring/spring-cloud-azure-supported-spring.json @@ -5,27 +5,19 @@ "snapshot" : true, "supportStatus" : "TODO", "spring-boot-version" : "3.0.0-SNAPSHOT", - "spring-cloud-version" : "2022.0.0-SNAPSHOT" + "spring-cloud-version" : "2022.0.0-M4" }, { "current" : true, "releaseStatus" : "PRERELEASE", "snapshot" : false, "supportStatus" : "SUPPORTED", - "spring-boot-version" : "3.0.0-M5", - "spring-cloud-version" : "2022.0.0-M4" - }, - { - "current" : false, - "releaseStatus" : "GENERAL_AVAILABILITY", - "snapshot" : false, - "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "3.0.0-M4", "spring-cloud-version" : "2022.0.0-M4" }, { "current" : false, - "releaseStatus" : "GENERAL_AVAILABILITY", + "releaseStatus" : "PRERELEASE", "snapshot" : false, "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "3.0.0-M3", diff --git a/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml b/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml index 8800f4a68c89..29428c505a2d 100644 --- a/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml +++ b/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml @@ -48,18 +48,18 @@ 4.6.1 test - - org.junit.jupiter - junit-jupiter - 5.8.2 - test - com.azure azure-core-test 1.12.0 test + + org.junit.jupiter + junit-jupiter + 5.8.2 + test + com.azure azure-storage-blob diff --git a/sdk/spring/spring-integration-azure-core/pom.xml b/sdk/spring/spring-integration-azure-core/pom.xml index 13e671d2e114..2eabd07e6fe5 100644 --- a/sdk/spring/spring-integration-azure-core/pom.xml +++ b/sdk/spring/spring-integration-azure-core/pom.xml @@ -95,14 +95,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - false - - org.apache.maven.plugins maven-jar-plugin diff --git a/sdk/spring/spring-integration-azure-eventhubs/pom.xml b/sdk/spring/spring-integration-azure-eventhubs/pom.xml index 7f548d78f918..653869b85bd4 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-integration-azure-eventhubs/pom.xml @@ -94,14 +94,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - false - - org.apache.maven.plugins maven-jar-plugin diff --git a/sdk/spring/spring-integration-azure-servicebus/pom.xml b/sdk/spring/spring-integration-azure-servicebus/pom.xml index 3c024e279042..28657e3c5ac7 100644 --- a/sdk/spring/spring-integration-azure-servicebus/pom.xml +++ b/sdk/spring/spring-integration-azure-servicebus/pom.xml @@ -100,14 +100,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - false - - org.apache.maven.plugins maven-jar-plugin