Skip to content

Commit 026fdc3

Browse files
authored
Replace unnecessary dependency in webapi samples (Azure#18423)
* refactor dependencies for spring aad webapi samples, to use spring boot starter.
1 parent 802b407 commit 026fdc3

File tree

4 files changed

+20
-57
lines changed
  • sdk/spring/azure-spring-boot-samples

4 files changed

+20
-57
lines changed

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/README.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,21 @@ We need to ensure that this [environment checklist][ready-to-run-checklist] is c
2424
### Include the package
2525
```xml
2626
<dependencies>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-web</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>org.springframework.boot</groupId>
33-
<artifactId>spring-boot-starter-security</artifactId>
34-
</dependency>
3527
<dependency>
3628
<groupId>com.azure.spring</groupId>
3729
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
3830
</dependency>
3931
<dependency>
40-
<groupId>org.springframework.security</groupId>
41-
<artifactId>spring-security-oauth2-resource-server</artifactId>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.springframework.security</groupId>
45-
<artifactId>spring-security-oauth2-client</artifactId>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-oauth2-client</artifactId>
4634
</dependency>
4735
<dependency>
48-
<groupId>com.microsoft.azure</groupId>
49-
<artifactId>msal4j</artifactId>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
5038
</dependency>
5139
<dependency>
52-
<groupId>org.springframework.security</groupId>
53-
<artifactId>spring-security-oauth2-jose</artifactId>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-web</artifactId>
5442
</dependency>
5543
</dependencies>
5644
```

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,24 @@
1515
<description>Azure AD Spring Security Integration Spring Boot Resource Server OBO</description>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>org.springframework.boot</groupId>
20-
<artifactId>spring-boot-starter-web</artifactId>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-security</artifactId>
25-
</dependency>
2618
<dependency>
2719
<groupId>com.azure.spring</groupId>
2820
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
2921
<version>3.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
3022
</dependency>
23+
24+
<!-- spring boot starter dependencies. -->
3125
<dependency>
32-
<groupId>org.springframework.security</groupId>
33-
<artifactId>spring-security-oauth2-resource-server</artifactId>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.springframework.security</groupId>
37-
<artifactId>spring-security-oauth2-client</artifactId>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter-oauth2-client</artifactId>
3828
</dependency>
3929
<dependency>
40-
<groupId>com.microsoft.azure</groupId>
41-
<artifactId>msal4j</artifactId>
42-
<version>1.8.0</version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
4332
</dependency>
4433
<dependency>
45-
<groupId>org.springframework.security</groupId>
46-
<artifactId>spring-security-oauth2-jose</artifactId>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-web</artifactId>
4736
</dependency>
4837
</dependencies>
4938

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ We need to ensure that this [environment checklist][ready-to-run-checklist] is c
2424
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>org.springframework.security</groupId>
28-
<artifactId>spring-security-oauth2-resource-server</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.springframework.security</groupId>
32-
<artifactId>spring-security-oauth2-jose</artifactId>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter-resource-server</artifactId>
3329
</dependency>
3430
</dependencies>
3531
```

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,15 @@
2020
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
2121
<version>3.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
2222
</dependency>
23-
<dependency>
24-
<groupId>org.springframework.security</groupId>
25-
<artifactId>spring-security-oauth2-resource-server</artifactId>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.springframework.security</groupId>
29-
<artifactId>spring-security-oauth2-jose</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>org.springframework.boot</groupId>
33-
<artifactId>spring-boot-starter-web</artifactId>
34-
</dependency>
23+
24+
<!-- spring boot starter dependencies. -->
3525
<dependency>
3626
<groupId>org.springframework.boot</groupId>
37-
<artifactId>spring-boot-starter-thymeleaf</artifactId>
27+
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
3828
</dependency>
3929
<dependency>
4030
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-starter-security</artifactId>
31+
<artifactId>spring-boot-starter-web</artifactId>
4232
</dependency>
4333
</dependencies>
4434

0 commit comments

Comments
 (0)