Skip to content

Commit 636a1b9

Browse files
NetyyyyNetyyyy
committed
Fix and update
1 parent a573fd4 commit 636a1b9

File tree

13 files changed

+66
-74
lines changed

13 files changed

+66
-74
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ springboot4_org.springframework.boot:spring-boot-restclient;4.0.0
360360
springboot4_org.springframework.boot:spring-boot-resttestclient;4.0.0
361361
springboot4_org.springframework.boot:spring-boot-security;4.0.0
362362
springboot4_org.springframework.boot:spring-boot-security-oauth2-client;4.0.0
363+
springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0
363364
springboot4_org.springframework.boot:spring-boot-starter-actuator;4.0.0
364365
springboot4_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0
365366
springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0

‎sdk/spring/azure-spring-data-cosmos/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<groupId>org.springframework.boot</groupId>
9696
<artifactId>spring-boot-persistence</artifactId>
9797
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-persistence;external_dependency} -->
98-
<scope>test</scope>
9998
</dependency>
10099
<dependency>
101100
<groupId>com.azure</groupId>

‎sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
4545
<scope>compile</scope>
4646
</dependency>
47-
<dependency>
48-
<groupId>org.springframework.boot</groupId>
49-
<artifactId>spring-boot-health</artifactId>
50-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-health;external_dependency} -->
51-
<optional>true</optional>
52-
</dependency>
5347
<dependency>
5448
<groupId>com.fasterxml.jackson.core</groupId>
5549
<artifactId>jackson-databind</artifactId>
@@ -208,7 +202,6 @@
208202
<include>com.fasterxml.jackson.core:jackson-databind:[2.20.1]</include> <!-- {x-include-update;springboot4_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
209203
<include>org.springframework.boot:spring-boot-actuator:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-actuator;external_dependency} -->
210204
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
211-
<include>org.springframework.boot:spring-boot-health:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-health;external_dependency} -->
212205
</includes>
213206
</bannedDependencies>
214207
</rules>

‎sdk/spring/spring-cloud-azure-actuator/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<groupId>org.springframework.boot</groupId>
5353
<artifactId>spring-boot-health</artifactId>
5454
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-health;external_dependency} -->
55-
<optional>true</optional>
5655
</dependency>
5756

5857
<!-- Azure SDKs-->

‎sdk/spring/spring-cloud-azure-autoconfigure/pom.xml‎

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,6 @@
170170
<optional>true</optional>
171171
</dependency>
172172

173-
<!--Spring Security-->
174-
<dependency>
175-
<groupId>org.springframework.boot</groupId>
176-
<artifactId>spring-boot-security</artifactId>
177-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security;external_dependency} -->
178-
<optional>true</optional>
179-
</dependency>
180-
181173
<!--Jackson-->
182174
<dependency>
183175
<groupId>org.springframework.boot</groupId>
@@ -352,30 +344,30 @@
352344
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
353345
<optional>true</optional>
354346
</dependency>
355-
356-
<!-- Spring Security-->
357347
<dependency>
358-
<groupId>org.springframework.security</groupId>
359-
<artifactId>spring-security-oauth2-client</artifactId>
360-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-client;external_dependency} -->
348+
<groupId>org.springframework.boot</groupId>
349+
<artifactId>spring-boot-http-converter</artifactId>
350+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-http-converter;external_dependency} -->
361351
<optional>true</optional>
362352
</dependency>
353+
354+
<!-- Spring Security-->
363355
<dependency>
364-
<groupId>org.springframework.security</groupId>
365-
<artifactId>spring-security-oauth2-resource-server</artifactId>
366-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-resource-server;external_dependency} -->
356+
<groupId>org.springframework.boot</groupId>
357+
<artifactId>spring-boot-security</artifactId>
358+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security;external_dependency} -->
367359
<optional>true</optional>
368360
</dependency>
369361
<dependency>
370-
<groupId>org.springframework.security</groupId>
371-
<artifactId>spring-security-oauth2-jose</artifactId>
372-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-jose;external_dependency} -->
362+
<groupId>org.springframework.boot</groupId>
363+
<artifactId>spring-boot-security-oauth2-client</artifactId>
364+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-client;external_dependency} -->
373365
<optional>true</optional>
374366
</dependency>
375367
<dependency>
376-
<groupId>org.springframework.security</groupId>
377-
<artifactId>spring-security-config</artifactId>
378-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-config;external_dependency} -->
368+
<groupId>org.springframework.boot</groupId>
369+
<artifactId>spring-boot-security-oauth2-resource-server</artifactId>
370+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;external_dependency} -->
379371
<optional>true</optional>
380372
</dependency>
381373

@@ -415,18 +407,6 @@
415407
</dependency>
416408

417409
<!-- TEST-->
418-
<dependency>
419-
<groupId>org.springframework.boot</groupId>
420-
<artifactId>spring-boot-security-oauth2-client</artifactId>
421-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-client;external_dependency} -->
422-
<scope>test</scope>
423-
</dependency>
424-
<dependency>
425-
<groupId>org.springframework.boot</groupId>
426-
<artifactId>spring-boot-http-converter</artifactId>
427-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-http-converter;external_dependency} -->
428-
<scope>test</scope>
429-
</dependency>
430410
<dependency>
431411
<groupId>org.springframework.boot</groupId>
432412
<artifactId>spring-boot-starter-test</artifactId>
@@ -559,11 +539,9 @@
559539
<include>org.springframework.boot:spring-boot-jms:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-jms;external_dependency} -->
560540
<include>org.springframework.boot:spring-boot-restclient:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-restclient;external_dependency} -->
561541
<include>org.springframework.boot:spring-boot-security:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-security;external_dependency} -->
542+
<include>org.springframework.boot:spring-boot-security-oauth2-client:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-client;external_dependency} -->
543+
<include>org.springframework.boot:spring-boot-security-oauth2-resource-server:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;external_dependency} -->
562544
<include>org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.cloud:spring-cloud-starter-stream-kafka;external_dependency} -->
563-
<include>org.springframework.security:spring-security-config:[7.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.security:spring-security-config;external_dependency} -->
564-
<include>org.springframework.security:spring-security-oauth2-client:[7.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.security:spring-security-oauth2-client;external_dependency} -->
565-
<include>org.springframework.security:spring-security-oauth2-jose:[7.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.security:spring-security-oauth2-jose;external_dependency} -->
566-
<include>org.springframework.security:spring-security-oauth2-resource-server:[7.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.security:spring-security-oauth2-resource-server;external_dependency} -->
567545
<include>org.springframework:spring-context-support:[7.0.1]</include> <!-- {x-include-update;springboot4_org.springframework:spring-context-support;external_dependency} -->
568546
<include>org.springframework:spring-tx:[7.0.1]</include> <!-- {x-include-update;springboot4_org.springframework:spring-tx;external_dependency} -->
569547
</includes>

‎sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider;
88
import org.apache.commons.logging.Log;
99
import org.springframework.boot.SpringApplication;
10-
import org.springframework.boot.env.EnvironmentPostProcessor;
10+
import org.springframework.boot.EnvironmentPostProcessor;
1111
import org.springframework.boot.logging.DeferredLog;
1212
import org.springframework.core.Ordered;
1313
import org.springframework.core.env.ConfigurableEnvironment;

‎sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
org.springframework.boot.env.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor
2-
org.springframework.boot.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer
1+
org.springframework.boot.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor
2+
org.springframework.boot.bootstrap.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer

‎sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,29 @@
9393
<version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter;current} -->
9494
</dependency>
9595
<dependency>
96-
<groupId>org.springframework.security</groupId>
97-
<artifactId>spring-security-config</artifactId>
98-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-config;external_dependency} -->
96+
<groupId>org.springframework.boot</groupId>
97+
<artifactId>spring-boot-restclient</artifactId>
98+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-restclient;external_dependency} -->
9999
</dependency>
100100
<dependency>
101-
<groupId>org.springframework.security</groupId>
102-
<artifactId>spring-security-oauth2-client</artifactId>
103-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-client;external_dependency} -->
101+
<groupId>org.springframework.boot</groupId>
102+
<artifactId>spring-boot-security</artifactId>
103+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security;external_dependency} -->
104104
</dependency>
105105
<dependency>
106-
<groupId>org.springframework.security</groupId>
107-
<artifactId>spring-security-oauth2-jose</artifactId>
108-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-jose;external_dependency} -->
106+
<groupId>org.springframework.boot</groupId>
107+
<artifactId>spring-boot-security-oauth2-client</artifactId>
108+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-client;external_dependency} -->
109109
</dependency>
110110
<dependency>
111-
<groupId>org.springframework.security</groupId>
112-
<artifactId>spring-security-oauth2-resource-server</artifactId>
113-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-oauth2-resource-server;external_dependency} -->
111+
<groupId>org.springframework.boot</groupId>
112+
<artifactId>spring-boot-security-oauth2-resource-server</artifactId>
113+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;external_dependency} -->
114+
</dependency>
115+
<dependency>
116+
<groupId>org.springframework.boot</groupId>
117+
<artifactId>spring-boot-http-converter</artifactId>
118+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-http-converter;external_dependency} -->
114119
</dependency>
115120
</dependencies>
116121

‎sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,19 @@
9292
<version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-starter;current} -->
9393
</dependency>
9494
<dependency>
95-
<groupId>org.springframework.security</groupId>
96-
<artifactId>spring-security-web</artifactId>
97-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-web;external_dependency} -->
95+
<groupId>org.springframework.boot</groupId>
96+
<artifactId>spring-boot-restclient</artifactId>
97+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-restclient;external_dependency} -->
9898
</dependency>
9999
<dependency>
100-
<groupId>org.springframework.security</groupId>
101-
<artifactId>spring-security-config</artifactId>
102-
<version>7.0.0</version> <!-- {x-version-update;springboot4_org.springframework.security:spring-security-config;external_dependency} -->
100+
<groupId>org.springframework.boot</groupId>
101+
<artifactId>spring-boot-security</artifactId>
102+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-security;external_dependency} -->
103+
</dependency>
104+
<dependency>
105+
<groupId>org.springframework.boot</groupId>
106+
<artifactId>spring-boot-http-converter</artifactId>
107+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-http-converter;external_dependency} -->
103108
</dependency>
104109
<dependency>
105110
<groupId>com.nimbusds</groupId>

‎sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
</dependency>
9494

9595
<dependency>
96-
<groupId>org.springframework.data</groupId>
97-
<artifactId>spring-data-redis</artifactId>
98-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.data:spring-data-redis;external_dependency} -->
96+
<groupId>org.springframework.boot</groupId>
97+
<artifactId>spring-boot-data-redis</artifactId>
98+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.data:spring-boot-data-redis;external_dependency} -->
9999
</dependency>
100100

101101
<dependency>

0 commit comments

Comments
 (0)