Skip to content

Commit 37cd4b0

Browse files
authored
Update for Spring Cloud Azure to 5.15 (#752)
* update Spring Cloud Azure 5.15 update Spring Boot 3.3.2/Spring Cloud 2023.0.3 set 5.x as default version * fix Build with maven * fix CodeQL * support spring3 * fix duplicate name
1 parent a66e1ac commit 37cd4b0

File tree

136 files changed

+3532
-29
lines changed

Some content is hidden

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

136 files changed

+3532
-29
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ 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 --batch-mode --update-snapshots verify
24+
run: mvn -f pom.xml -P spring-cloud-azure-4.x --batch-mode --update-snapshots verify
2525
- if: ${{ (matrix.java-version == '17') }}
2626
name: Build azure-spring-boot-samples 5.x with Maven - ${{ matrix.java-version }}
27-
run: mvn -f pom.xml -P spring-cloud-azure-5.x --batch-mode --update-snapshots verify
27+
run: mvn -f pom.xml --batch-mode --update-snapshots verify
2828

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ jobs:
4646
repository: Azure/azure-sdk-for-java
4747
ref: main
4848
path: azure-sdk-for-java
49+
- uses: actions/setup-java@v4
50+
with:
51+
distribution: 'oracle' # See 'Supported distributions' for available options
52+
java-version: '17'
4953
- name: Build latest azure-sdk-for-java repository
5054
run: |
5155
cd azure-sdk-for-java
@@ -70,7 +74,7 @@ jobs:
7074

7175
# Initializes the CodeQL tools for scanning.
7276
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@v1
77+
uses: github/codeql-action/init@v3
7478
with:
7579
languages: ${{ matrix.language }}
7680
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,7 +85,7 @@ jobs:
8185
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
8286
# If this step fails, then you should remove it and run the build manually (see below)
8387
- name: Autobuild
84-
uses: github/codeql-action/autobuild@v1
88+
uses: github/codeql-action/autobuild@v3
8589

8690
# ℹ️ Command-line programs to run using the OS shell.
8791
# 📚 https://git.io/JvXDl
@@ -95,4 +99,4 @@ jobs:
9599
# make release
96100

97101
- name: Perform CodeQL Analysis
98-
uses: github/codeql-action/analyze@v1
102+
uses: github/codeql-action/analyze@v3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
| [spring-cloud-azure-appconfiguration-config-sample](appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-sample) |||
2626
| [spring-cloud-azure-appconfiguration-config-convert-sample-initial](appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial) |||
2727
| [spring-cloud-azure-feature-management-sample](appconfiguration/spring-cloud-azure-feature-management/spring-cloud-azure-feature-management-sample) |||
28-
| [spring-cloud-azure-feature-management-web-sample](appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample) |||
28+
| [spring-cloud-azure-feature-management-web-sample](appconfiguration/spring-cloud-azure-feature-management-web) |||
2929
| [spring-cloud-azure-starter-appconfiguration-config-sample](appconfiguration/spring-cloud-azure-starter-appconfiguration-config/spring-cloud-azure-starter-appconfiguration-config-sample) |||
3030
| [appconfiguration-client](appconfiguration/spring-cloud-azure-starter-appconfiguration/appconfiguration-client) |||
3131

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ This sample describes how to use [spring-cloud-azure-feature-management](https:/
1818

1919

2020
### How to run without App Configuration Service
21-
Start the application and check the resulting console output to check the returned value.
21+
Start the application and access http://localhost:8080 to check the resulting console output.
2222

2323
1. Load features from application.yml
2424
```
2525
mvn spring-boot:run
2626
```
2727

28-
2. Check the returned value. The feature `Beta` has one filter `Random` which defines
28+
2. Check the returned value, you will see the following information displayed: **Run the Beta filter**.
2929

3030
### How to run with App Configuration Service
3131

Lines changed: 1 addition & 1 deletion
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>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)