Skip to content

Commit 32a79d6

Browse files
committed
remove sb3 samples
update pom
1 parent 8ef1cca commit 32a79d6

File tree

703 files changed

+113
-42080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

703 files changed

+113
-42080
lines changed

.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ jobs:
2121
distribution: 'adopt'
2222
cache: maven
2323
- name: Build azure-spring-boot-samples 4.x with Maven - Java ${{ matrix.java-version }}
24-
run: mvn -f pom.xml -P spring-cloud-azure-4.x --batch-mode --update-snapshots verify
25-
- if: ${{ (matrix.java-version == '17') }}
26-
name: Build azure-spring-boot-samples 5.x with Maven - ${{ matrix.java-version }}
2724
run: mvn -f pom.xml --batch-mode --update-snapshots verify
2825

README.md

+11-55
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44
- The repository hold samples about using [Spring Cloud Azure](https://learn.microsoft.com/azure/developer/java/spring-framework/) libraries.
55
- The **main** branch is using the latest stable version of Spring Cloud Azure. If you want to find sample about specific version of Spring Cloud Azure, please switch to corresponding tag in this repository.
66

7+
> [!NOTE]
8+
> This branch only work for Spring Cloud Azure 4.x, if you want to find samples for Spring Cloud Azure 5.x, please switch to [main](https://github.com/Azure-Samples/azure-spring-boot-samples) branch.
9+
710
## All Samples in This Repo
811

912
### Microsoft Entra ID
1013

1114
| Sample Project | Support Spring Cloud Azure 4.x | Support Spring Cloud Azure 5.x |
1215
|------------------------------------------------------------------------------------------------------------------------------------|--------------------------------|--------------------------------|
13-
| [aad-b2c-resource-server](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server) || |
14-
| [aad-b2c-web-application](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application) || |
15-
| [aad-resource-server-by-filter-stateless](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter-stateless) || |
16-
| [aad-resource-server-by-filter](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter) || |
17-
| [web-client-access-resource-server](aad/spring-cloud-azure-starter-active-directory/web-client-access-resource-server) || |
18-
| [aad-webapp-resource-server](aad/spring-cloud-azure-starter-active-directory/aad-web-application-and-resource-server) || |
16+
| [aad-b2c-resource-server](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-resource-server) || |
17+
| [aad-b2c-web-application](aad/spring-cloud-azure-starter-active-directory-b2c/aad-b2c-web-application) || |
18+
| [aad-resource-server-by-filter-stateless](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter-stateless) || |
19+
| [aad-resource-server-by-filter](aad/spring-cloud-azure-starter-active-directory/aad-resource-server-by-filter) || |
20+
| [web-client-access-resource-server](aad/spring-cloud-azure-starter-active-directory/web-client-access-resource-server) || |
21+
| [aad-webapp-resource-server](aad/spring-cloud-azure-starter-active-directory/aad-web-application-and-resource-server) || |
1922

2023
### Azure App Configuration
2124

@@ -60,8 +63,8 @@
6063
|---------------------------------------------------------------------------------------------------------------------------------|--------------------------------|--------------------------------|
6164
| [keyvault-certificates-client-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-client-side) |||
6265
| [keyvault-certificates-server-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side) |||
63-
| [run-with-command-line-server-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) || |
64-
| [run-with-command-line-client-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) || |
66+
| [run-with-command-line-server-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) || |
67+
| [run-with-command-line-client-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) || |
6568
| [property-source](keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) |||
6669
| [secret-client](keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client) |||
6770

@@ -119,50 +122,3 @@
119122

120123
## Getting Help
121124
- If you have any question about using these samples, please [create an new issue](https://github.com/Azure-Samples/azure-spring-boot-samples/issues/new/choose).
122-
123-
## Introduction to Maven profiles
124-
125-
This project uses one pom file to manage the samples for Spring Cloud Azure 4.x and Spring Cloud Azure 5.x, the profile `spring-cloud-azure-4.x` is activated by default.
126-
127-
The profile names ending with `-4.x` are used to run the samples with Spring Cloud Azure 4.x and Spring Boot 2;
128-
the profile names ending with `-5.x` are used to run the samples with Spring Cloud Azure 5.x and Spring Boot 3. The profile names ending with `4.x` and `5.x` cannot be mixed at the same time.
129-
130-
**Note**:
131-
- Profiles `native-5.x` and `nativeTest-5.x` are variants of the two profiles `native` and `nativeTest` provided by `spring-boot-starter-parent` of Spring Boot 3, and they have the same function. If you want to use this profile, please use it with the profile `spring-cloud-azure-5.x`, such as `mvn -P spring-cloud-azure-5.x,native-5.x native:compile`.
132-
133-
134-
## Samples for Spring Boot 3
135-
136-
**Note**: This section is used to convert the samples to run in Spring Boot 3, the branch `feature/spring-boot-3` is no longer maintained.
137-
138-
### Convert samples to use Spring Boot 3
139-
140-
To get samples for Spring Boot 3, please refer to the content in each sample's *README.md* like this:
141-
> Current sample is using Spring Cloud Azure 4.x (which is compatible with Spring Boot 2.x).
142-
> If you want sample about Spring Cloud Azure 5.x (which is compatible with Spring Boot 3.x),
143-
> please refer to [CONVERT_SAMPLE_TO_USE_SPRING_BOOT_3.md](./CONVERT_SAMPLE_TO_USE_SPRING_BOOT_3_TEMPLATE.md).
144-
145-
Mostly samples can work with both Spring Cloud Azure 4.x and Spring Cloud Azure 5.x, you can directly activate the profile of Spring Cloud Azure 5.x to run.
146-
147-
If you're adding a new example, here's a template that converts the example to support Spring Boot 3: [./CONVERT_SAMPLE_TO_USE_SPRING_BOOT_3_TEMPLATE.md](CONVERT_SAMPLE_TO_USE_SPRING_BOOT_3_TEMPLATE.md).
148-
149-
### Run samples with Maven command
150-
151-
Use below command to enable the profile for Spring Cloud Azure 5.x.
152-
153-
```shell
154-
mvn clean spring-boot:run -P spring-cloud-azure-5.x
155-
```
156-
157-
### Run samples with IDE
158-
159-
Activate the profile Spring Cloud Azure 5.x by default, then you can run in your IDE tool.
160-
161-
Remove the below activation for `spring-cloud-azure-4.x`, and add it to profile `spring-cloud-azure-5.x`:
162-
163-
```xml
164-
<activation>
165-
<activeByDefault>true</activeByDefault>
166-
</activation>
167-
```
168-
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.azure.spring</groupId>
99
<artifactId>azure-spring-boot-samples</artifactId>
1010
<version>1.0.0</version>
11-
<relativePath>../../../../pom.xml</relativePath>
11+
<relativePath>../../../pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>spring-cloud-azure-feature-management-web-sample</artifactId>
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.azure.spring</groupId>
88
<artifactId>azure-spring-boot-samples</artifactId>
99
<version>1.0.0</version>
10-
<relativePath>../../../../pom.xml</relativePath>
10+
<relativePath>../../../pom.xml</relativePath>
1111
</parent>
1212

1313
<artifactId>spring-cloud-azure-targeting-filter-web-sample</artifactId>

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/README.md

-79
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/pom.xml

-46
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/FeatureFilter.java

-38
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/FeatureManagerWebApplication.java

-15
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/HelloController.java

-53
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/MessageProperties.java

-20
This file was deleted.

appconfiguration/spring-cloud-azure-feature-management-web/spring3samples/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/MyDisabledFeaturesHandler.java

-20
This file was deleted.

0 commit comments

Comments
 (0)