Skip to content

Commit 3897206

Browse files
committed
merging changes from main
1 parent 178250a commit 3897206

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ private void verifyPropertyConfigurationUpdate() {
174174
"spring.cassandra.request.timeout=10s\n" +
175175
"spring.cassandra.connection.connect-timeout=10s\n" +
176176
"spring.cassandra.connection.init-query-timeout=10s\n" +
177-
"logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss.SSS\n");
177+
"logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss.SSS\n" +
178+
"management.endpoints.jmx.exposure.include=*\n");
178179
}
179180

180181
private void verifyEhCacheVersionIsUpgraded() {

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,15 @@
693693
condition:
694694
type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition
695695
addDefaultPropertiesFileToTopModules: true
696-
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat
697696

697+
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat
698698
description: "Sets logging date format to yyyy-MM-dd HH:mm:ss.SSS"
699699
condition:
700700
type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition
701701

702+
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_JmxEndpointExposureAction
703+
description: "Sets JMX endpoint exposure include to *"
704+
condition:
705+
type: org.springframework.sbm.boot.upgrade_27_30.conditions.JmxEndpointExposureCondition
706+
702707

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@
1616
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat
1717
description: "Sets logging date format to yyyy-MM-dd HH:mm:ss.SSS"
1818
condition:
19-
type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition
20-
- type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_JmxEndpointExposureAction
21-
description: "Sets JMX endpoint exposure include to *"
22-
condition:
23-
type: org.springframework.sbm.boot.upgrade_27_30.conditions.JmxEndpointExposureCondition
19+
type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition

0 commit comments

Comments
 (0)