Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20498 from izeye

Browse Source 
* pr/20498:
  Polish

Closes gh-20498
This commit is contained in:
Stephane Nicoll
2020-03-11 12:19:16 +01:00
parent 9370f21221 8526e66939
commit ad9e5be324
5 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,8 +159,6 @@ public final class EndpointRequest {
private volatile ServerWebExchangeMatcher delegate;
private static ManagementPortType managementPortType;
private EndpointServerWebExchangeMatcher(boolean includeLinks) {
this(Collections.emptyList(), Collections.emptyList(), includeLinks);
}

92
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -525,52 +525,52 @@ bom {
}
library("Infinispan", "10.1.3.Final") {
group("org.infinispan") {
modules = [
'infinispan-api',
'infinispan-cachestore-jdbc',
'infinispan-cachestore-jpa',
'infinispan-cachestore-remote',
'infinispan-cachestore-rest',
'infinispan-cachestore-rocksdb',
'infinispan-cdi-common',
'infinispan-cdi-embedded',
'infinispan-cdi-remote',
'infinispan-client-hotrod',
'infinispan-client-rest',
'infinispan-clustered-counter',
'infinispan-clustered-lock',
'infinispan-commons',
'infinispan-component-annotations',
'infinispan-core',
'infinispan-directory-provider',
'infinispan-hibernate-cache-v53',
'infinispan-jboss-marshalling',
'infinispan-jcache',
'infinispan-jcache-commons',
'infinispan-jcache-remote',
'infinispan-key-value-store-client',
'infinispan-lucene-directory',
'infinispan-objectfilter',
'infinispan-osgi',
'infinispan-persistence-soft-index',
'infinispan-query',
'infinispan-query-core',
'infinispan-query-dsl',
'infinispan-remote-query-client',
'infinispan-remote-query-server',
'infinispan-scripting',
'infinispan-server-core',
'infinispan-server-hotrod',
'infinispan-server-memcached',
'infinispan-server-rest',
'infinispan-server-router',
'infinispan-spring5-common',
'infinispan-spring5-embedded',
'infinispan-spring5-remote',
'infinispan-tasks',
'infinispan-tasks-api',
'infinispan-tools'
]
modules = [
'infinispan-api',
'infinispan-cachestore-jdbc',
'infinispan-cachestore-jpa',
'infinispan-cachestore-remote',
'infinispan-cachestore-rest',
'infinispan-cachestore-rocksdb',
'infinispan-cdi-common',
'infinispan-cdi-embedded',
'infinispan-cdi-remote',
'infinispan-client-hotrod',
'infinispan-client-rest',
'infinispan-clustered-counter',
'infinispan-clustered-lock',
'infinispan-commons',
'infinispan-component-annotations',
'infinispan-core',
'infinispan-directory-provider',
'infinispan-hibernate-cache-v53',
'infinispan-jboss-marshalling',
'infinispan-jcache',
'infinispan-jcache-commons',
'infinispan-jcache-remote',
'infinispan-key-value-store-client',
'infinispan-lucene-directory',
'infinispan-objectfilter',
'infinispan-osgi',
'infinispan-persistence-soft-index',
'infinispan-query',
'infinispan-query-core',
'infinispan-query-dsl',
'infinispan-remote-query-client',
'infinispan-remote-query-server',
'infinispan-scripting',
'infinispan-server-core',
'infinispan-server-hotrod',
'infinispan-server-memcached',
'infinispan-server-rest',
'infinispan-server-router',
'infinispan-spring5-common',
'infinispan-spring5-embedded',
'infinispan-spring5-remote',
'infinispan-tasks',
'infinispan-tasks-api',
'infinispan-tools'
]
}
}
library("InfluxDB Java", "2.17") {

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
View File

@@ -2204,7 +2204,7 @@ Information returned by the `env` and `configprops` endpoints can be somewhat se
The patterns to use can be customized using the `management.endpoint.env.keys-to-sanitize` and `management.endpoint.configprops.keys-to-sanitize` respectively.
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.
Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+*credentials.*+`).
Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+.*credentials.*+`).
If any of the keys to sanitize are URI format (i.e. `<scheme>://<username>:<password>@<host>:<port>/`), only the password part is sanitized.

6
spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc
View File

@@ -663,12 +663,12 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr
| {spring-boot-actuator-module-code}/couchbase/CouchbaseHealthIndicator.java[`CouchbaseHealthIndicator`]
| Checks that a Couchbase cluster is up.
| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`]
| Checks for low disk space.
| {spring-boot-actuator-module-code}/jdbc/DataSourceHealthIndicator.java[`DataSourceHealthIndicator`]
| Checks that a connection to `DataSource` can be obtained.
| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`]
| Checks for low disk space.
| {spring-boot-actuator-module-code}/elasticsearch/ElasticSearchRestHealthContributorAutoConfiguration.java[`ElasticSearchRestHealthContributorAutoConfiguration`]
| Checks that an Elasticsearch cluster is up.

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

@@ -56,7 +56,7 @@ public class BuildInfoProperties implements Serializable {
this.version = project.getObjects().property(String.class);
this.version.set(project.provider(() -> project.getVersion().toString()));
this.name = project.getObjects().property(String.class);
this.name.set(project.provider(() -> project.getName().toString()));
this.name.set(project.provider(() -> project.getName()));
}
/**