Skip to content

Commit 8526e66

Browse files
izeyesnicoll
izeye
authored and
snicoll
committed
Polish
See gh-20498
1 parent 9370f21 commit 8526e66

File tree

5 files changed

+51
-53
lines changed

5 files changed

+51
-53
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ public static final class EndpointServerWebExchangeMatcher extends AbstractWebEx
159159

160160
private volatile ServerWebExchangeMatcher delegate;
161161

162-
private static ManagementPortType managementPortType;
163-
164162
private EndpointServerWebExchangeMatcher(boolean includeLinks) {
165163
this(Collections.emptyList(), Collections.emptyList(), includeLinks);
166164
}

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -525,52 +525,52 @@ bom {
525525
}
526526
library("Infinispan", "10.1.3.Final") {
527527
group("org.infinispan") {
528-
modules = [
529-
'infinispan-api',
530-
'infinispan-cachestore-jdbc',
531-
'infinispan-cachestore-jpa',
532-
'infinispan-cachestore-remote',
533-
'infinispan-cachestore-rest',
534-
'infinispan-cachestore-rocksdb',
535-
'infinispan-cdi-common',
536-
'infinispan-cdi-embedded',
537-
'infinispan-cdi-remote',
538-
'infinispan-client-hotrod',
539-
'infinispan-client-rest',
540-
'infinispan-clustered-counter',
541-
'infinispan-clustered-lock',
542-
'infinispan-commons',
543-
'infinispan-component-annotations',
544-
'infinispan-core',
545-
'infinispan-directory-provider',
546-
'infinispan-hibernate-cache-v53',
547-
'infinispan-jboss-marshalling',
548-
'infinispan-jcache',
549-
'infinispan-jcache-commons',
550-
'infinispan-jcache-remote',
551-
'infinispan-key-value-store-client',
552-
'infinispan-lucene-directory',
553-
'infinispan-objectfilter',
554-
'infinispan-osgi',
555-
'infinispan-persistence-soft-index',
556-
'infinispan-query',
557-
'infinispan-query-core',
558-
'infinispan-query-dsl',
559-
'infinispan-remote-query-client',
560-
'infinispan-remote-query-server',
561-
'infinispan-scripting',
562-
'infinispan-server-core',
563-
'infinispan-server-hotrod',
564-
'infinispan-server-memcached',
565-
'infinispan-server-rest',
566-
'infinispan-server-router',
567-
'infinispan-spring5-common',
568-
'infinispan-spring5-embedded',
569-
'infinispan-spring5-remote',
570-
'infinispan-tasks',
571-
'infinispan-tasks-api',
572-
'infinispan-tools'
573-
]
528+
modules = [
529+
'infinispan-api',
530+
'infinispan-cachestore-jdbc',
531+
'infinispan-cachestore-jpa',
532+
'infinispan-cachestore-remote',
533+
'infinispan-cachestore-rest',
534+
'infinispan-cachestore-rocksdb',
535+
'infinispan-cdi-common',
536+
'infinispan-cdi-embedded',
537+
'infinispan-cdi-remote',
538+
'infinispan-client-hotrod',
539+
'infinispan-client-rest',
540+
'infinispan-clustered-counter',
541+
'infinispan-clustered-lock',
542+
'infinispan-commons',
543+
'infinispan-component-annotations',
544+
'infinispan-core',
545+
'infinispan-directory-provider',
546+
'infinispan-hibernate-cache-v53',
547+
'infinispan-jboss-marshalling',
548+
'infinispan-jcache',
549+
'infinispan-jcache-commons',
550+
'infinispan-jcache-remote',
551+
'infinispan-key-value-store-client',
552+
'infinispan-lucene-directory',
553+
'infinispan-objectfilter',
554+
'infinispan-osgi',
555+
'infinispan-persistence-soft-index',
556+
'infinispan-query',
557+
'infinispan-query-core',
558+
'infinispan-query-dsl',
559+
'infinispan-remote-query-client',
560+
'infinispan-remote-query-server',
561+
'infinispan-scripting',
562+
'infinispan-server-core',
563+
'infinispan-server-hotrod',
564+
'infinispan-server-memcached',
565+
'infinispan-server-rest',
566+
'infinispan-server-router',
567+
'infinispan-spring5-common',
568+
'infinispan-spring5-embedded',
569+
'infinispan-spring5-remote',
570+
'infinispan-tasks',
571+
'infinispan-tasks-api',
572+
'infinispan-tools'
573+
]
574574
}
575575
}
576576
library("InfluxDB Java", "2.17") {

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ Information returned by the `env` and `configprops` endpoints can be somewhat se
22042204
The patterns to use can be customized using the `management.endpoint.env.keys-to-sanitize` and `management.endpoint.configprops.keys-to-sanitize` respectively.
22052205

22062206
Spring Boot uses sensible defaults for such keys: any key ending with the word "password", "secret", "key", "token", "vcap_services", "sun.java.command", "uri", "uris", "address" or "addresses" is sanitized.
2207-
Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+*credentials.*+`).
2207+
Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+.*credentials.*+`).
22082208

22092209
If any of the keys to sanitize are URI format (i.e. `<scheme>://<username>:<password>@<host>:<port>/`), only the password part is sanitized.
22102210

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,12 +663,12 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr
663663
| {spring-boot-actuator-module-code}/couchbase/CouchbaseHealthIndicator.java[`CouchbaseHealthIndicator`]
664664
| Checks that a Couchbase cluster is up.
665665

666-
| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`]
667-
| Checks for low disk space.
668-
669666
| {spring-boot-actuator-module-code}/jdbc/DataSourceHealthIndicator.java[`DataSourceHealthIndicator`]
670667
| Checks that a connection to `DataSource` can be obtained.
671668

669+
| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`]
670+
| Checks for low disk space.
671+
672672
| {spring-boot-actuator-module-code}/elasticsearch/ElasticSearchRestHealthContributorAutoConfiguration.java[`ElasticSearchRestHealthContributorAutoConfiguration`]
673673
| Checks that an Elasticsearch cluster is up.
674674

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class BuildInfoProperties implements Serializable {
5656
this.version = project.getObjects().property(String.class);
5757
this.version.set(project.provider(() -> project.getVersion().toString()));
5858
this.name = project.getObjects().property(String.class);
59-
this.name.set(project.provider(() -> project.getName().toString()));
59+
this.name.set(project.provider(() -> project.getName()));
6060
}
6161

6262
/**

0 commit comments

Comments
 (0)