Skip to content

Revert "Update Spring Cloud Azure Support File in branch feature/spring-boot-3" #31226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moarychan merged 1 commit into from
Sep 30, 2022
Merged

Revert "Update Spring Cloud Azure Support File in branch feature/spring-boot-3" #31226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions sdk/spring/scripts/sync_external_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import unittest
import argparse
from itertools import takewhile
from packaging import version

from log import log

Expand Down Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...igure/src/main/java/com/azure/spring/cloud/autoconfigure/cloudfoundry/AzureCfService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 0 additions & 8 deletions sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,6 @@
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
12 changes: 2 additions & 10 deletions sdk/spring/spring-cloud-azure-supported-spring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,18 @@
<version>4.6.1</version><!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.12.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions sdk/spring/spring-integration-azure-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions sdk/spring/spring-integration-azure-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions sdk/spring/spring-integration-azure-servicebus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down