Skip to content

Commit f09aeba

Browse files
Copilotrujche
andcommitted
Re-enable spring-cloud-azure-starter-monitor for Spring Boot 4 support
Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>
1 parent 94426a8 commit f09aeba

3 files changed

Lines changed: 18 additions & 21 deletions

File tree

sdk/boms/spring-cloud-azure-dependencies/pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,11 @@
209209
<artifactId>spring-cloud-azure-starter-keyvault-certificates</artifactId>
210210
<version>${project.version}</version>
211211
</dependency>
212-
<!-- todo: add back when monitor support Spring Boot 4-->
213-
<!-- <dependency>-->
214-
<!-- <groupId>com.azure.spring</groupId>-->
215-
<!-- <artifactId>spring-cloud-azure-starter-monitor</artifactId>-->
216-
<!-- <version>${project.version}</version>-->
217-
<!-- </dependency>-->
212+
<dependency>
213+
<groupId>com.azure.spring</groupId>
214+
<artifactId>spring-cloud-azure-starter-monitor</artifactId>
215+
<version>${project.version}</version>
216+
</dependency>
218217
<dependency>
219218
<groupId>com.azure.spring</groupId>
220219
<artifactId>spring-cloud-azure-starter-servicebus</artifactId>

sdk/spring/ci.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,10 @@ parameters:
244244
displayName: 'spring-cloud-azure-starter-appconfiguration-config'
245245
type: boolean
246246
default: true
247-
# todo: add back when monitor support Spring Boot 4
248-
#- name: release_springcloudazurestartermonitor
249-
# displayName: 'spring-cloud-azure-starter-monitor'
250-
# type: boolean
251-
# default: true
247+
- name: release_springcloudazurestartermonitor
248+
displayName: 'spring-cloud-azure-starter-monitor'
249+
type: boolean
250+
default: true
252251

253252

254253
extends:
@@ -604,13 +603,12 @@ extends:
604603
skipPublishDocMs: true
605604
skipVerifyChangeLog: true
606605
releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }}
607-
# todo: add back when monitor support Spring Boot 4
608-
# - name: spring-cloud-azure-starter-monitor
609-
# groupId: com.azure.spring
610-
# safeName: springcloudazurestartermonitor
611-
# skipPublishDocGithubIo: true
612-
# skipPublishDocMs: true
613-
# skipVerifyChangelog: true
614-
# releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }}
606+
- name: spring-cloud-azure-starter-monitor
607+
groupId: com.azure.spring
608+
safeName: springcloudazurestartermonitor
609+
skipPublishDocGithubIo: true
610+
skipPublishDocMs: true
611+
skipVerifyChangelog: true
612+
releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }}
615613
MatrixFilters:
616614
- JavaTestVersion=^(?!1.8|1.11).*

sdk/spring/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<module>spring-cloud-azure-feature-management-web</module>
7171
<module>spring-cloud-azure-starter-appconfiguration-config</module>
7272
<module>azure-spring-data-cosmos</module>
73-
<!-- <module>spring-cloud-azure-starter-monitor</module>-->
74-
<!-- <module>spring-cloud-azure-starter-monitor-test</module>-->
73+
<module>spring-cloud-azure-starter-monitor</module>
74+
<module>spring-cloud-azure-starter-monitor-test</module>
7575
</modules>
7676
</profile>
7777

0 commit comments

Comments
 (0)