diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java index 77f9278956..6f39e12453 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointProperties.java @@ -41,7 +41,7 @@ public class JmxEndpointProperties { private String domain = "org.springframework.boot"; /** - * Ensure that ObjectNames are modified in case of conflict. + * Whether to ensure that ObjectNames are modified in case of conflict. */ private boolean uniqueNames = false; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaProperties.java index 4feb167925..98db648fa9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaProperties.java @@ -33,8 +33,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class JolokiaProperties { /** - * Jolokia settings. These are traditionally set using servlet parameters. Refer to - * the documentation of Jolokia for more details. + * Jolokia settings. Refer to the documentation of Jolokia for more details. */ private final Map config = new HashMap<>(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java index b6f0ae8af4..2798e2974d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ public class DiskSpaceHealthIndicatorProperties { private File path = new File("."); /** - * Minimum disk space that should be available, in bytes. + * Minimum disk space, in bytes, that should be available. */ private long threshold = DEFAULT_THRESHOLD; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java index 387f88602d..82a16e21a0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java @@ -39,13 +39,14 @@ import org.springframework.util.StringUtils; public class ManagementServerProperties implements SecurityPrerequisite { /** - * Management endpoint HTTP port. Use the same port as the application by default. + * Management endpoint HTTP port (uses the same port as the application by default). + * Configure a different port to use management-specific SSL. */ private Integer port; /** - * Network address that to which the management endpoints should bind to. Requires a - * custom management.server.port. + * Network address to which the management endpoints should bind. Requires a custom + * management.server.port. */ private InetAddress address; @@ -55,7 +56,8 @@ public class ManagementServerProperties implements SecurityPrerequisite { private Ssl ssl; /** - * Add the "X-Application-Context" HTTP header in each response. + * Add the "X-Application-Context" HTTP header in each response. Requires a custom + * management.server.port. */ private boolean addApplicationContextHeader = false; @@ -112,7 +114,7 @@ public class ManagementServerProperties implements SecurityPrerequisite { public static class Servlet { /** - * Management endpoint context-path. For instance, '/management'. Requires a + * Management endpoint context-path (for instance, `/management`). Requires a * custom management.server.port. */ private String contextPath = ""; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index a35f340f60..b23dde1645 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -62,13 +62,13 @@ { "name": "management.health.cassandra.enabled", "type": "java.lang.Boolean", - "description": "Whether to enable cassandra health check.", + "description": "Whether to enable Cassandra health check.", "defaultValue": true }, { "name": "management.health.couchbase.enabled", "type": "java.lang.Boolean", - "description": "Whether to enable couchbase health check.", + "description": "Whether to enable Couchbase health check.", "defaultValue": true }, { @@ -92,7 +92,7 @@ { "name": "management.health.elasticsearch.enabled", "type": "java.lang.Boolean", - "description": "Whether to enable elasticsearch health check.", + "description": "Whether to enable Elasticsearch health check.", "defaultValue": true }, { @@ -143,6 +143,15 @@ "description": "Whether to enable Solr health check.", "defaultValue": true }, + { + "name": "management.health.status.order", + "defaultValue": [ + "DOWN", + "OUT_OF_SERVICE", + "UP", + "UNKNOWN" + ] + }, { "name": "management.health.mail.enabled", "type": "java.lang.Boolean", @@ -283,6 +292,15 @@ "description": "Whether to enable HTTP request-response tracing.", "defaultValue": true }, + { + "name": "management.trace.http.include", + "defaultValue": [ + "request-headers", + "response-headers", + "cookies", + "errors" + ] + }, { "name": "endpoints.actuator.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java index 72bde870d5..e2fc4834e9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java @@ -556,7 +556,7 @@ public class RabbitProperties { private Integer prefetch; /** - * Whether rejected deliveries are re-queued by default. Defaults to true. + * Whether rejected deliveries are re-queued by default. */ private Boolean defaultRequeueRejected; @@ -694,12 +694,12 @@ public class RabbitProperties { private Boolean mandatory; /** - * Timeout for receive() operations. + * Timeout for `receive()` operations. */ private Long receiveTimeout; /** - * Timeout for sendAndReceive() operations. + * Timeout for `sendAndReceive()` operations. */ private Long replyTimeout; @@ -762,17 +762,17 @@ public class RabbitProperties { public static class Retry { /** - * Whether to enable retries in the RabbitTemplate. + * Whether publishing retries are enabled. */ private boolean enabled; /** - * Maximum number of attempts to publish or deliver a message. + * Maximum number of attempts to deliver a message. */ private int maxAttempts = 3; /** - * Interval between the first and second attempt to publish or deliver a message. + * Interval, in milliseconds, between the first and second attempt to deliver a message. */ private long initialInterval = 1000L; @@ -782,7 +782,7 @@ public class RabbitProperties { private double multiplier = 1.0; /** - * Maximum interval between attempts. + * Maximum interval, in milliseconds, between attempts. */ private long maxInterval = 10000L; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java index 17b5dce46a..1935b10f7b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,8 +43,8 @@ public class MessageSourceProperties { private Charset encoding = StandardCharsets.UTF_8; /** - * Loaded resource bundle files cache expiration, in seconds. When not set, bundles - * are cached forever. + * Loaded resource bundle files cache duration. When not set, bundles are cached + * forever. */ private Duration cacheDuration; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java index f81aabf532..c751190ce9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,8 +84,8 @@ public class RepositoryRestProperties { private Boolean returnBodyOnUpdate; /** - * Whether to enable enum value translation through Spring Data REST default resource - * bundle. Will use the fully qualified enum name as key. + * Whether to enable enum value translation through the Spring Data REST default + * resource bundle. */ private Boolean enableEnumTranslation; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index c5a460cc23..91d649b2bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -60,7 +60,7 @@ public class FlywayProperties { private String user; /** - * Login password of the database to migrate. + * JDBC password to use if you want Flyway to create its own DataSource. */ private String password; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java index 071a270aa7..be580863de 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java @@ -54,9 +54,8 @@ public class JacksonProperties { private String jodaDateTimeFormat; /** - * One of the constants on Jackson's PropertyNamingStrategy - * (CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES). Can also be a fully-qualified class - * name of a PropertyNamingStrategy subclass. + * One of the constants on Jackson's PropertyNamingStrategy. Can also be a + * fully-qualified class name of a PropertyNamingStrategy subclass. */ private String propertyNamingStrategy; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index f39a78151b..c71ae00572 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -73,7 +73,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB private String driverClassName; /** - * JDBC url of the database. + * JDBC URL of the database. */ private String url; @@ -94,7 +94,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB private String jndiName; /** - * Initialize the datasource using available DDL and DML scripts. + * Initialize the datasource with available DDL and DML scripts. */ private DataSourceInitializationMode initializationMode = DataSourceInitializationMode.EMBEDDED; @@ -110,7 +110,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB private List schema; /** - * User of the database to execute DDL scripts (if different). + * Username of the database to execute DDL scripts (if different). */ private String schemaUsername; @@ -125,12 +125,12 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB private List data; /** - * Username of the database to execute DML scripts. + * Username of the database to execute DML scripts (if different). */ private String dataUsername; /** - * Password of the database to execute DML scripts. + * Password of the database to execute DML scripts (if different). */ private String dataPassword; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java index a0896b8984..2a6b696de5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,8 +66,7 @@ public class ActiveMQProperties { private boolean nonBlockingRedelivery = false; /** - * Time to wait on message sends for a response. Set it to 0 to indicate to wait - * forever. + * Time to wait on message sends for a response. Set it to 0 to wait forever. */ private Duration sendTimeout = Duration.ofMillis(0); @@ -158,7 +157,7 @@ public class ActiveMQProperties { private boolean blockIfFull = true; /** - * Blocking period, before throwing an exception if the pool is still full. + * Blocking period before throwing an exception if the pool is still full. */ private Duration blockIfFullTimeout = Duration.ofMillis(-1); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index bd8bf06e20..4dce8a9526 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -260,14 +260,13 @@ public class KafkaProperties { private Duration fetchMaxWait; /** - * Minimum amount of data, in bytes, the server should return for a fetch request - * in bytes. + * Minimum amount of data, in bytes, the server should return for a fetch request. */ private Integer fetchMinSize; /** - * Unique string that identifies the consumer group to which this consumer belongs - * to. + * Unique string that identifies the consumer group to which this consumer + * belongs. */ private String groupId; @@ -951,7 +950,7 @@ public class KafkaProperties { private Resource keystoreLocation; /** - * Password of the key store file. + * Store password for the key store file. */ private String keystorePassword; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java index 6c2e74205f..263b0b1737 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java @@ -36,7 +36,7 @@ public class LdapProperties { private static final int DEFAULT_PORT = 389; /** - * LDAP URLs. + * LDAP URLs of the server. */ private String[] urls; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java index fea3be4fb6..93b358dd52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java @@ -176,7 +176,7 @@ public class JpaProperties { /** * DDL mode. This is actually a shortcut for the "hibernate.hbm2ddl.auto" * property. Defaults to "create-drop" when using an embedded database and no - * schema manager was detected. Otherwise, defaults to "none" otherwise. + * schema manager was detected. Otherwise, defaults to "none". */ private String ddlAuto; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index c409f13ab3..c8a47f46b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -333,7 +333,7 @@ public class ServerProperties { private final Accesslog accesslog = new Accesslog(); /** - * Regular expression that matches proxies that are to be trusted. + * Regular expression matching trusted IP addresses. */ private String internalProxies = "10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 10/8 + "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16 @@ -360,12 +360,12 @@ public class ServerProperties { /** * Name of the HTTP header from which the remote IP is extracted. For instance, - * 'X-FORWARDED-FOR'. + * `X-FORWARDED-FOR`. */ private String remoteIpHeader; /** - * Tomcat base directory. If not specified, a temporary directory will be used. + * Tomcat base directory. If not specified, a temporary directory is used. */ private File basedir; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java index fe8c512fd4..6c2b8b1b97 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class WebFluxProperties { /** - * Date format to use. For instance, "dd/MM/yyyy". + * Date format to use. For instance, `dd/MM/yyyy`. */ private String dateFormat; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java index d43b602561..d3bdbca719 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java @@ -55,7 +55,7 @@ public class WebMvcProperties { private LocaleResolver localeResolver = LocaleResolver.ACCEPT_HEADER; /** - * Date format to use. For instance, "dd/MM/yyyy". + * Date format to use. For instance, `dd/MM/yyyy`. */ private String dateFormat; @@ -286,8 +286,8 @@ public class WebMvcProperties { private boolean favorParameter = false; /** - * Maps file extensions to media types for content negotiation, e.g. yml to - * text/yaml. + * Map file extensions to media types for content negotiation. For instance, yml + * to text/yaml. */ private Map mediaTypes = new LinkedHashMap<>(); @@ -340,7 +340,7 @@ public class WebMvcProperties { /** * Whether suffix pattern matching should work only against extensions registered - * with "spring.mvc.content-negotiation.media-types.*". This is generally + * with "spring.mvc.contentnegotiation.media-types.*". This is generally * recommended to reduce ambiguity and to avoid issues such as when a "." appears * in the path for other reasons. */ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index a1dedb3f24..8a2016a6af 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -39,6 +39,10 @@ "description": "Whether to enable the default error page displayed in browsers in case of a server error.", "defaultValue": true }, + { + "name": "server.port", + "defaultValue": 8080 + }, { "name": "spring.aop.auto", "type": "java.lang.Boolean", @@ -174,6 +178,10 @@ "level": "error" } }, + { + "name": "spring.data.mongodb.uri", + "defaultValue": "mongodb://localhost/test" + }, { "name": "spring.data.neo4j.auto-index", "defaultValue": "none" @@ -282,7 +290,7 @@ }, { "name": "spring.jta.bitronix.properties.allow-multiple-lrc", - "description": "Allow multiple LRC resources to be enlisted into the same transaction.", + "description": "Whether to allow multiple LRC resources to be enlisted into the same transaction.", "defaultValue": false }, { @@ -305,17 +313,17 @@ }, { "name": "spring.jta.bitronix.properties.current-node-only-recovery", - "description": "Recover only the current node. Should be enabled if you run multiple instances of the transaction manager on the same JMS and JDBC resources.", + "description": "Whether to recover only the current node. Should be enabled if you run multiple instances of the transaction manager on the same JMS and JDBC resources.", "defaultValue": true }, { "name": "spring.jta.bitronix.properties.debug-zero-resource-transaction", - "description": "Log the creation and commit call stacks of transactions executed without a single enlisted resource.", + "description": "Whether to log the creation and commit call stacks of transactions executed without a single enlisted resource.", "defaultValue": false }, { "name": "spring.jta.bitronix.properties.default-transaction-timeout", - "description": "Default transaction timeout in seconds.", + "description": "Default transaction timeout, in seconds.", "defaultValue": 60 }, { @@ -334,17 +342,17 @@ }, { "name": "spring.jta.bitronix.properties.force-batching-enabled", - "description": " Set if disk forces are batched.", + "description": "Whether disk forces are batched.", "defaultValue": true }, { "name": "spring.jta.bitronix.properties.forced-write-enabled", - "description": "Set if logs are forced to disk.", + "description": "Whether logs are forced to disk.", "defaultValue": true }, { "name": "spring.jta.bitronix.properties.graceful-shutdown-interval", - "description": "Maximum amount of seconds the TM will wait for transactions to get done before aborting them at shutdown time.", + "description": "Maximum amount of seconds the TM waits for transactions to get done before aborting them at shutdown time.", "defaultValue": 60 }, { @@ -357,7 +365,7 @@ }, { "name": "spring.jta.bitronix.properties.journal", - "description": "Name of the journal. Can be 'disk', 'null' or a class name.", + "description": "Name of the journal. Can be 'disk', 'null', or a class name.", "defaultValue": "disk" }, { @@ -381,7 +389,7 @@ }, { "name": "spring.jta.bitronix.properties.server-id", - "description": "ASCII ID that must uniquely identify this TM instance. Default to the machine's IP address." + "description": "ASCII ID that must uniquely identify this TM instance. Defaults to the machine's IP address." }, { "name": "spring.jta.bitronix.properties.skip-corrupted-logs", @@ -390,7 +398,7 @@ }, { "name": "spring.jta.bitronix.properties.warn-about-zero-resource-transaction", - "description": "Log a warning for transactions executed without a single enlisted resource.", + "description": "Whether to log a warning for transactions executed without a single enlisted resource.", "defaultValue": true }, { @@ -401,6 +409,12 @@ "name": "spring.kafka.listener.type", "defaultValue": "single" }, + { + "name": "spring.mongodb.embedded.features", + "defaultValue": [ + "sync_delay" + ] + }, { "name": "spring.mustache.prefix", "defaultValue": "classpath:/templates/" @@ -464,6 +478,10 @@ "request" ] }, + { + "name": "spring.security.filter.order", + "defaultValue": -100 + }, { "name": "spring.session.jdbc.initialize-schema", "defaultValue": "embedded" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java index e4ccc3d745..6797b8f1b2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,6 +44,11 @@ public class SecurityPropertiesTests { this.binder = new Binder(this.source); } + @Test + public void validateDefaultFilterOrderMatchesMetadata() { + assertThat(this.security.getFilter().getOrder()).isEqualTo(-100); + } + @Test public void filterOrderShouldBind() { this.source.put("spring.security.filter.order", "55"); diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java index 4f7c2dd50e..314682f02b 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java @@ -91,7 +91,7 @@ public class DevToolsProperties { /** * Name of a specific file that, when changed, triggers the restart check. If not - * specified, any classpath file change will trigger the restart. + * specified, any classpath file change triggers the restart. */ private String triggerFile; diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 306519c585..120f17de05 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -31,17 +31,17 @@ content into your application. Rather, pick only the properties that you need. trace=false # Enable trace logs. # LOGGING - logging.config= # Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback + logging.config= # Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback. logging.exception-conversion-word=%wEx # Conversion word used when logging exceptions. - logging.file= # Log file name. For instance, `myapp.log` - logging.file.max-history= # Maximum of archive log files to keep. Only supported with the default logback setup. - logging.file.max-size= # Maximum log file size. Only supported with the default logback setup. - logging.level.*= # Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG` + logging.file= # Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory. + logging.file.max-history=0 # Maximum of archive log files to keep. Only supported with the default logback setup. + logging.file.max-size=10MB # Maximum log file size. Only supported with the default logback setup. + logging.level.*= # Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`. logging.path= # Location of the log file. For instance, `/var/log`. logging.pattern.console= # Appender pattern for output to the console. Supported only with the default Logback setup. logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss.SSS # Appender pattern for log date format. Supported only with the default Logback setup. logging.pattern.file= # Appender pattern for output to a file. Supported only with the default Logback setup. - logging.pattern.level= # Appender pattern for log level (default: %5p). Supported only with the default Logback setup. + logging.pattern.level=%5p # Appender pattern for log level. Supported only with the default Logback setup. logging.register-shutdown-hook=false # Register a shutdown hook for the logging system when it is initialized. # AOP @@ -60,12 +60,12 @@ content into your application. Rather, pick only the properties that you need. # BANNER spring.banner.charset=UTF-8 # Banner file encoding. - spring.banner.location=classpath:banner.txt # Banner file location. + spring.banner.location=classpath:banner.txt # Banner text resource location. spring.banner.image.location=classpath:banner.gif # Banner image file location (jpg or png can also be used). - spring.banner.image.width= # Width of the banner image in chars (default 76) - spring.banner.image.height= # Height of the banner image in chars (default based on image height) - spring.banner.image.margin= # Left hand image margin in chars (default 2) - spring.banner.image.invert= # Whether images should be inverted for dark terminal themes (default false) + spring.banner.image.width=76 # Width of the banner image in chars. + spring.banner.image.height= # Height of the banner image in chars (default based on image height). + spring.banner.image.margin=2 # Left hand image margin in chars. + spring.banner.image.invert=false # Whether images should be inverted for dark terminal themes. # SPRING CORE spring.beaninfo.ignore=true # Whether to skip search of BeanInfo classes. @@ -73,7 +73,7 @@ content into your application. Rather, pick only the properties that you need. # SPRING CACHE ({sc-spring-boot-autoconfigure}/cache/CacheProperties.{sc-ext}[CacheProperties]) spring.cache.cache-names= # Comma-separated list of cache names to create if supported by the underlying cache manager. spring.cache.caffeine.spec= # The spec to use to create caches. See CaffeineSpec for more details on the spec format. - spring.cache.couchbase.expiration=0ms # Entry expiration in milliseconds. By default, the entries never expire. + spring.cache.couchbase.expiration=0ms # Entry expiration. By default the entries never expire. Note that this value is ultimately converted to seconds. spring.cache.ehcache.config= # The location of the configuration file to use to initialize EhCache. spring.cache.infinispan.config= # The location of the configuration file to use to initialize Infinispan. spring.cache.jcache.config= # The location of the configuration file to use to initialize the cache manager. @@ -86,7 +86,7 @@ content into your application. Rather, pick only the properties that you need. # SPRING CONFIG - using environment property only ({sc-spring-boot}/context/config/ConfigFileApplicationListener.{sc-ext}[ConfigFileApplicationListener]) spring.config.additional-location= # Config file locations used in addition to the defaults. - spring.config.location= # Config file locations. + spring.config.location= # Config file locations that replace the defaults. spring.config.name=application # Config file name. # HAZELCAST ({sc-spring-boot-autoconfigure}/hazelcast/HazelcastProperties.{sc-ext}[HazelcastProperties]) @@ -103,7 +103,7 @@ content into your application. Rather, pick only the properties that you need. # Email ({sc-spring-boot-autoconfigure}/mail/MailProperties.{sc-ext}[MailProperties]) spring.mail.default-encoding=UTF-8 # Default MimeMessage encoding. - spring.mail.host= # SMTP server host. For instance, `smtp.example.com` + spring.mail.host= # SMTP server host. For instance, `smtp.example.com`. spring.mail.jndi-name= # Session JNDI name. When set, takes precedence over other mail settings. spring.mail.password= # Login password of the SMTP server. spring.mail.port= # SMTP server port. @@ -136,7 +136,7 @@ content into your application. Rather, pick only the properties that you need. spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used). # PROFILES - spring.profiles.active= # Comma-separated list (or list if using YAML) of <>. + spring.profiles.active= # Comma-separated list of active profiles. Can be overridden by a command line switch. spring.profiles.include= # Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML). # QUARTZ SCHEDULER ({sc-spring-boot-autoconfigure}/quartz/QuartzProperties.{sc-ext}[QuartzProperties]) @@ -168,7 +168,7 @@ content into your application. Rather, pick only the properties that you need. server.error.include-exception=false # Include the "exception" attribute. server.error.include-stacktrace=never # When to include a "stacktrace" attribute. server.error.path=/error # Path of the error controller. - server.error.whitelabel.enabled=true # Enable the default error page displayed in browsers in case of a server error. + server.error.whitelabel.enabled=true # Whether to enable the default error page displayed in browsers in case of a server error. server.http2.enabled=false # Whether to enable HTTP/2 support, if the current environment supports it. server.jetty.acceptors= # Number of acceptor threads to use. server.jetty.accesslog.append=false # Append to log. @@ -187,9 +187,9 @@ content into your application. Rather, pick only the properties that you need. server.jetty.selectors= # Number of selector threads to use. server.max-http-header-size=0 # Maximum size, in bytes, of the HTTP message header. server.port=8080 # Server HTTP port. - server.server-header= # Value to use for the Server response header (if empty, no header is sent) + server.server-header= # Value to use for the Server response header (if empty, no header is sent). server.use-forward-headers= # Whether X-Forwarded-* headers should be applied to the HttpRequest. - server.servlet.context-parameters.*= # Servlet context init parameters + server.servlet.context-parameters.*= # Servlet context init parameters. server.servlet.context-path= # Context path of the application. server.servlet.application-display-name=application # Display name of the application. server.servlet.jsp.class-name=org.apache.jasper.servlet.JspServlet # The class name of the JSP servlet. @@ -222,7 +222,7 @@ content into your application. Rather, pick only the properties that you need. server.ssl.trust-store-password= # Password used to access the trust store. server.ssl.trust-store-provider= # Provider for the trust store. server.ssl.trust-store-type= # Type of the trust store. - server.tomcat.accept-count= # Maximum queue length for incoming connection requests when all possible request processing threads are in use. + server.tomcat.accept-count=0 # Maximum queue length for incoming connection requests when all possible request processing threads are in use. server.tomcat.accesslog.buffered=true # Whether to buffer output such that it is flushed only periodically. server.tomcat.accesslog.directory=logs # Directory in which log files are created. Can be absolute or relative to the Tomcat base dir. server.tomcat.accesslog.enabled=false # Enable access log. @@ -242,8 +242,8 @@ content into your application. Rather, pick only the properties that you need. 127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\ 172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ 172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ - 172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3} # regular expression matching trusted IP addresses. - server.tomcat.max-connections= # Maximum number of connections that the server accepts and processes at any given time. + 172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3} # Regular expression matching trusted IP addresses. + server.tomcat.max-connections=0 # Maximum number of connections that the server accepts and processes at any given time. server.tomcat.max-http-header-size=0 # Maximum size, in bytes, of the HTTP message header. server.tomcat.max-http-post-size=0 # Maximum size, in bytes, of the HTTP post content. server.tomcat.max-threads=0 # Maximum number of worker threads. @@ -291,11 +291,11 @@ content into your application. Rather, pick only the properties that you need. # GROOVY TEMPLATES ({sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateProperties.{sc-ext}[GroovyTemplateProperties]) spring.groovy.template.allow-request-override=false # Whether HttpServletRequest attributes are allowed to override (hide) controller generated model attributes of the same name. spring.groovy.template.allow-session-override=false # Whether HttpSession attributes are allowed to override (hide) controller generated model attributes of the same name. - spring.groovy.template.cache= # Whether to enable template caching. + spring.groovy.template.cache=false # Whether to enable template caching. spring.groovy.template.charset=UTF-8 # Template encoding. - spring.groovy.template.check-template-location=true # Check that the templates location exists. + spring.groovy.template.check-template-location=true # Whether to check that the templates location exists. spring.groovy.template.configuration.*= # See https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/view/groovy/GroovyMarkupConfigurer.html[GroovyMarkupConfigurer] - spring.groovy.template.content-type=test/html # Content-Type value. + spring.groovy.template.content-type=text/html # Content-Type value. spring.groovy.template.enabled=true # Whether to enable MVC view resolution for this technology. spring.groovy.template.expose-request-attributes=false # Whether all request attributes should be added to the model prior to merging with the template. spring.groovy.template.expose-session-attributes=false # Whether all HttpSession attributes should be added to the model prior to merging with the template. @@ -370,25 +370,25 @@ content into your application. Rather, pick only the properties that you need. spring.ldap.username= # Login username of the server. # EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties]) - spring.ldap.embedded.base-dn= # The base DN + spring.ldap.embedded.base-dn= # List of base DN. spring.ldap.embedded.credential.username= # Embedded LDAP username. spring.ldap.embedded.credential.password= # Embedded LDAP password. spring.ldap.embedded.ldif=classpath:schema.ldif # Schema (LDIF) script resource reference. - spring.ldap.embedded.port= # Embedded LDAP port. + spring.ldap.embedded.port=0 # Embedded LDAP port. spring.ldap.embedded.validation.enabled=true # Whether to enable LDAP schema validation. spring.ldap.embedded.validation.schema= # Path to the custom schema. # MUSTACHE TEMPLATES ({sc-spring-boot-autoconfigure}/mustache/MustacheAutoConfiguration.{sc-ext}[MustacheAutoConfiguration]) - spring.mustache.allow-request-override= # Whether HttpServletRequest attributes are allowed to override (hide) controller generated model attributes of the same name. - spring.mustache.allow-session-override= # Whether HttpSession attributes are allowed to override (hide) controller generated model attributes of the same name. - spring.mustache.cache= # Whether to enable template caching. - spring.mustache.charset= # Template encoding. - spring.mustache.check-template-location= # Whether to check that the templates location exists. - spring.mustache.content-type= # Content-Type value. - spring.mustache.enabled= # Whether to enable MVC view resolution for this technology. - spring.mustache.expose-request-attributes= # Whether all request attributes should be added to the model prior to merging with the template. - spring.mustache.expose-session-attributes= # Whether all HttpSession attributes should be added to the model prior to merging with the template. - spring.mustache.expose-spring-macro-helpers= # Whether to expose a RequestContext for use by Spring's macro library under the name "springMacroRequestContext". + spring.mustache.allow-request-override=false # Whether HttpServletRequest attributes are allowed to override (hide) controller generated model attributes of the same name. + spring.mustache.allow-session-override=false # Whether HttpSession attributes are allowed to override (hide) controller generated model attributes of the same name. + spring.mustache.cache=false # Whether to enable template caching. + spring.mustache.charset=UTF-8 # Template encoding. + spring.mustache.check-template-location=true # Whether to check that the templates location exists. + spring.mustache.content-type=text/html # Content-Type value. + spring.mustache.enabled=true # Whether to enable MVC view resolution for this technology. + spring.mustache.expose-request-attributes=false # Whether all request attributes should be added to the model prior to merging with the template. + spring.mustache.expose-session-attributes=false # Whether all HttpSession attributes should be added to the model prior to merging with the template. + spring.mustache.expose-spring-macro-helpers=true # Whether to expose a RequestContext for use by Spring's macro library, under the name "springMacroRequestContext". spring.mustache.prefix=classpath:/templates/ # Prefix to apply to template names. spring.mustache.request-context-attribute= # Name of the RequestContext attribute for all views. spring.mustache.suffix=.mustache # Suffix to apply to template names. @@ -398,7 +398,7 @@ content into your application. Rather, pick only the properties that you need. spring.mvc.async.request-timeout= # Amount of time before asynchronous request handling times out. spring.mvc.contentnegotiation.favor-parameter=false # Whether a request parameter ("format" by default) should be used to determine the requested media type. spring.mvc.contentnegotiation.favor-path-extension=false # Whether the path extension in the URL path should be used to determine the requested media type. - spring.mvc.contentnegotiation.media-types.*= # Maps file extensions to media types for content negotiation. + spring.mvc.contentnegotiation.media-types.*= # Map file extensions to media types for content negotiation. For instance, yml to text/yaml. spring.mvc.contentnegotiation.parameter-name= # Query parameter name to use when "favor-parameter" is enabled. spring.mvc.date-format= # Date format to use. For instance, `dd/MM/yyyy`. spring.mvc.dispatch-trace-request=false # Whether to dispatch TRACE requests to the FrameworkServlet doService method. @@ -412,7 +412,7 @@ content into your application. Rather, pick only the properties that you need. spring.mvc.message-codes-resolver-format= # Formatting strategy for message codes. For instance, `PREFIX_ERROR_CODE`. spring.mvc.pathmatch.use-registered-suffix-pattern=false # Whether suffix pattern matching should work only against extensions registered with "spring.mvc.contentnegotiation.media-types.*". spring.mvc.pathmatch.use-suffix-pattern=false # Whether to use suffix pattern match (".*") when matching patterns to requests. - spring.mvc.servlet.load-on-startup=-1 # Load on startup priority of the Spring Web Services servlet. + spring.mvc.servlet.load-on-startup=-1 # Load on startup priority of the dispatcher servlet. spring.mvc.static-path-pattern=/** # Path pattern used for static resources. spring.mvc.throw-exception-if-no-handler-found=false # Whether a "NoHandlerFoundException" should be thrown if no Handler was found to process a request. spring.mvc.view.prefix= # Spring MVC view prefix. @@ -446,7 +446,7 @@ content into your application. Rather, pick only the properties that you need. # SPRING SESSION ({sc-spring-boot-autoconfigure}/session/SessionProperties.{sc-ext}[SessionProperties]) spring.session.store-type= # Session store type. spring.session.servlet.filter-order=-2147483598 # Session repository filter order. - spring.session.servlet.filter-dispatcher-types=ASYNC,ERROR,REQUEST # Session repository filter dispatcher types. + spring.session.servlet.filter-dispatcher-types=async,error,request # Session repository filter dispatcher types. # SPRING SESSION HAZELCAST ({sc-spring-boot-autoconfigure}/session/HazelcastSessionProperties.{sc-ext}[HazelcastSessionProperties]) spring.session.hazelcast.flush-mode=on-save # Sessions flush mode. @@ -473,17 +473,17 @@ content into your application. Rather, pick only the properties that you need. spring.thymeleaf.enabled=true # Whether to enable Thymeleaf view resolution for Web frameworks. spring.thymeleaf.enable-spring-el-compiler=false # Enable the SpringEL compiler in SpringEL expressions. spring.thymeleaf.encoding=UTF-8 # Template files encoding. - spring.thymeleaf.excluded-view-names= # Comma-separated list of view names that should be excluded from resolution. - spring.thymeleaf.mode=HTML5 # Template mode to be applied to templates. See also Thymeleaf's TemplateMode enum. + spring.thymeleaf.excluded-view-names= # Comma-separated list of view names (patterns allowed) that should be excluded from resolution. + spring.thymeleaf.mode=HTML # Template mode to be applied to templates. See also Thymeleaf's TemplateMode enum. spring.thymeleaf.prefix=classpath:/templates/ # Prefix that gets prepended to view names when building a URL. spring.thymeleaf.reactive.chunked-mode-view-names= # Comma-separated list of view names (patterns allowed) that should be the only ones executed in CHUNKED mode when a max chunk size is set. spring.thymeleaf.reactive.full-mode-view-names= # Comma-separated list of view names (patterns allowed) that should be executed in FULL mode even if a max chunk size is set. - spring.thymeleaf.reactive.max-chunk-size= # Maximum size of data buffers used for writing to the response, in bytes. + spring.thymeleaf.reactive.max-chunk-size=0 # Maximum size of data buffers used for writing to the response, in bytes. spring.thymeleaf.reactive.media-types= # Media types supported by the view technology. spring.thymeleaf.servlet.content-type=text/html # Content-Type value written to HTTP responses. spring.thymeleaf.suffix=.html # Suffix that gets appended to view names when building a URL. spring.thymeleaf.template-resolver-order= # Order of the template resolver in the chain. - spring.thymeleaf.view-names= # Comma-separated list of view names that can be resolved. + spring.thymeleaf.view-names= # Comma-separated list of view names (patterns allowed) that can be resolved. # SPRING WEBFLUX ({sc-spring-boot-autoconfigure}/web/reactive/WebFluxProperties.{sc-ext}[WebFluxProperties]) spring.webflux.date-format= # Date format to use. For instance, `dd/MM/yyyy`. @@ -501,8 +501,8 @@ content into your application. Rather, pick only the properties that you need. # SECURITY PROPERTIES # ---------------------------------------- # SECURITY ({sc-spring-boot-autoconfigure}/security/SecurityProperties.{sc-ext}[SecurityProperties]) - spring.security.filter.order=0 # Security filter chain order. - spring.security.filter.dispatcher-types=ASYNC,ERROR,REQUEST # Security filter chain dispatcher types. + spring.security.filter.order=-100 # Security filter chain order. + spring.security.filter.dispatcher-types=async,error,request # Security filter chain dispatcher types. spring.security.user.name=user # Default user name. spring.security.user.password= # Password for the default user name. spring.security.user.roles= # Granted roles for the default user name. @@ -572,10 +572,10 @@ content into your application. Rather, pick only the properties that you need. spring.couchbase.bootstrap-hosts= # Couchbase nodes (host or IP address) to bootstrap from. spring.couchbase.bucket.name=default # Name of the bucket to connect to. spring.couchbase.bucket.password= # Password of the bucket. - spring.couchbase.env.endpoints.key-value=1 # Number of sockets per node against the Key/value service. - spring.couchbase.env.endpoints.query=1 # Number of sockets per node against the Query (N1QL) service. + spring.couchbase.env.endpoints.key-value=1 # Number of sockets per node against the key/value service. + spring.couchbase.env.endpoints.query=1 # Number of sockets per node against the query (N1QL) service. spring.couchbase.env.endpoints.view=1 # Number of sockets per node against the view service. - spring.couchbase.env.ssl.enabled= # Whether to enable SSL support. Enabled automatically if a "keyStore" is provided, unless specified otherwise. + spring.couchbase.env.ssl.enabled= # Whether to enable SSL support. Enabled automatically if a "keyStore" is provided unless specified otherwise. spring.couchbase.env.ssl.key-store= # Path to the JVM key store that holds the certificates. spring.couchbase.env.ssl.key-store-password= # Password used to access the key store. spring.couchbase.env.timeouts.connect=5000ms # Bucket connections timeouts. @@ -592,14 +592,14 @@ content into your application. Rather, pick only the properties that you need. spring.data.cassandra.compression=none # Compression supported by the Cassandra binary protocol. spring.data.cassandra.connect-timeout= # Socket option: connection time out. spring.data.cassandra.consistency-level= # Queries consistency level. - spring.data.cassandra.contact-points=localhost # Comma-separated list of cluster node addresses. + spring.data.cassandra.contact-points=localhost # Cluster node addresses. spring.data.cassandra.fetch-size= # Queries default fetch size. spring.data.cassandra.keyspace-name= # Keyspace name to use. spring.data.cassandra.load-balancing-policy= # Class name of the load balancing policy. spring.data.cassandra.port= # Port of the Cassandra server. spring.data.cassandra.password= # Login password of the server. - spring.data.cassandra.pool.heartbeat-interval=30 # Heartbeat interval after which a message is sent on an idle connection to make sure it's still alive. If a duration suffix is not specified, seconds will be used. - spring.data.cassandra.pool.idle-timeout=120 # Idle timeout before an idle connection is removed. If a duration suffix is not specified, seconds will be used. + spring.data.cassandra.pool.heartbeat-interval=30s # Heartbeat interval after which a message is sent on an idle connection to make sure it's still alive. If a duration suffix is not specified, seconds will be used. + spring.data.cassandra.pool.idle-timeout=120s # Idle timeout before an idle connection is removed. If a duration suffix is not specified, seconds will be used. spring.data.cassandra.pool.max-queue-size=256 # Maximum number of requests that get queued if no connection is available. spring.data.cassandra.pool.pool-timeout=5000ms # Pool timeout when trying to acquire a connection from a host's pool. spring.data.cassandra.read-timeout= # Socket option: read time out. @@ -623,17 +623,17 @@ content into your application. Rather, pick only the properties that you need. spring.data.elasticsearch.repositories.enabled=true # Whether to enable Elasticsearch repositories. # DATA LDAP - spring.data.ldap.repositories.enabled=true # Enable LDAP repositories. + spring.data.ldap.repositories.enabled=true # Whether to enable LDAP repositories. # MONGODB ({sc-spring-boot-autoconfigure}/mongo/MongoProperties.{sc-ext}[MongoProperties]) spring.data.mongodb.authentication-database= # Authentication database name. - spring.data.mongodb.database=test # Database name. + spring.data.mongodb.database= # Database name. spring.data.mongodb.field-naming-strategy= # Fully qualified name of the FieldNamingStrategy to use. spring.data.mongodb.grid-fs-database= # GridFS database name. - spring.data.mongodb.host=localhost # Mongo server host. Cannot be set with URI. + spring.data.mongodb.host= # Mongo server host. Cannot be set with URI. spring.data.mongodb.password= # Login password of the mongo server. Cannot be set with URI. - spring.data.mongodb.port=27017 # Mongo server port. Cannot be set with URI. - spring.data.mongodb.repositories.type=true # Type of Mongo repositories to enable. + spring.data.mongodb.port= # Mongo server port. Cannot be set with URI. + spring.data.mongodb.repositories.type=auto # Type of Mongo repositories to enable. spring.data.mongodb.uri=mongodb://localhost/test # Mongo database URI. Cannot be set with host, port and credentials. spring.data.mongodb.username= # Login user of the mongo server. Cannot be set with URI. @@ -731,7 +731,7 @@ content into your application. Rather, pick only the properties that you need. # JDBC ({sc-spring-boot-autoconfigure}/jdbc/JdbcProperties.{sc-ext}[JdbcProperties]) spring.jdbc.template.fetch-size=-1 # Number of rows that should be fetched from the database when more rows are needed. spring.jdbc.template.max-rows=-1 # Maximum number of rows. - spring.jdbc.template.query-timeout= # Query timeout. If a duration suffix is not specified, seconds will be used. + spring.jdbc.template.query-timeout= # Query timeout. Default is to use the JDBC driver's default configuration. If a duration suffix is not specified, seconds will be used. # JPA ({sc-spring-boot-autoconfigure}/orm/jpa/JpaBaseConfiguration.{sc-ext}[JpaBaseConfiguration], {sc-spring-boot-autoconfigure}/orm/jpa/HibernateJpaAutoConfiguration.{sc-ext}[HibernateJpaAutoConfiguration]) spring.data.jpa.repositories.enabled=true # Whether to enable JPA repositories. @@ -739,8 +739,8 @@ content into your application. Rather, pick only the properties that you need. spring.jpa.database-platform= # Name of the target database to operate on, auto-detected by default. Can be alternatively set using the "Database" enum. spring.jpa.generate-ddl=false # Whether to initialize the schema on startup. spring.jpa.hibernate.ddl-auto= # DDL mode. This is actually a shortcut for the "hibernate.hbm2ddl.auto" property. Defaults to "create-drop" when using an embedded database and no schema manager was detected. Otherwise, defaults to "none". - spring.jpa.hibernate.naming.implicit-strategy= # Hibernate 5 implicit naming strategy fully qualified name. - spring.jpa.hibernate.naming.physical-strategy= # Hibernate 5 physical naming strategy fully qualified name. + spring.jpa.hibernate.naming.implicit-strategy= # Fully qualified name of the implicit naming strategy. + spring.jpa.hibernate.naming.physical-strategy= # Fully qualified name of the physical naming strategy. spring.jpa.hibernate.use-new-id-generator-mappings= # Whether to use Hibernate's newer IdentifierGenerator for AUTO, TABLE and SEQUENCE. spring.jpa.mapping-resources= # Mapping resources (equivalent to "mapping-file" entries in persistence.xml). spring.jpa.open-in-view=true # Register OpenEntityManagerInViewInterceptor. Binds a JPA EntityManager to the thread for the entire processing of the request. @@ -781,16 +781,16 @@ content into your application. Rather, pick only the properties that you need. spring.jta.atomikos.datasource.xa-properties= # Vendor-specific XA properties. spring.jta.atomikos.properties.allow-sub-transactions=true # Specify whether sub-transactions are allowed. spring.jta.atomikos.properties.checkpoint-interval=500 # Interval between checkpoints, in milliseconds. - spring.jta.atomikos.properties.default-jta-timeout=10000 # Default timeout for JTA transactions, in milliseconds. + spring.jta.atomikos.properties.default-jta-timeout=10000ms # Default timeout for JTA transactions. spring.jta.atomikos.properties.default-max-wait-time-on-shutdown=9223372036854775807 # How long should normal shutdown (no-force) wait for transactions to complete. spring.jta.atomikos.properties.enable-logging=true # Whether to enable disk logging. spring.jta.atomikos.properties.force-shutdown-on-vm-exit=false # Whether a VM shutdown should trigger forced shutdown of the transaction core. spring.jta.atomikos.properties.log-base-dir= # Directory in which the log files should be stored. spring.jta.atomikos.properties.log-base-name=tmlog # Transactions log file base name. spring.jta.atomikos.properties.max-actives=50 # Maximum number of active transactions. - spring.jta.atomikos.properties.max-timeout=30m # Maximum timeout that can be allowed for transactions. + spring.jta.atomikos.properties.max-timeout=300000ms # Maximum timeout that can be allowed for transactions. spring.jta.atomikos.properties.recovery.delay=10000ms # Delay between two recovery scans. - spring.jta.atomikos.properties.recovery.forget-orphaned-log-entries-delay=86400000 # Delay after which recovery can cleanup pending ('orphaned') log entries. + spring.jta.atomikos.properties.recovery.forget-orphaned-log-entries-delay=86400000ms # Delay after which recovery can cleanup pending ('orphaned') log entries. spring.jta.atomikos.properties.recovery.max-retries=5 # Number of retry attempts to commit the transaction before throwing an exception. spring.jta.atomikos.properties.recovery.retry-interval=10000ms # Delay between retry attempts. spring.jta.atomikos.properties.serial-jta-transactions=true # Whether sub-transactions should be joined when possible. @@ -849,7 +849,7 @@ content into your application. Rather, pick only the properties that you need. spring.jta.bitronix.datasource.unique-name=dataSource # The unique name used to identify the resource during recovery. spring.jta.bitronix.datasource.use-tm-join=true # Whether TMJOIN should be used when starting XAResources. spring.jta.bitronix.properties.allow-multiple-lrc=false # Whether to allow multiple LRC resources to be enlisted into the same transaction. - spring.jta.bitronix.properties.asynchronous2-pc=false # Enable asynchronously execution of two phase commit. + spring.jta.bitronix.properties.asynchronous2-pc=false # Whether to enable asynchronously execution of two phase commit. spring.jta.bitronix.properties.background-recovery-interval-seconds=60 # Interval in seconds at which to run the recovery process in the background. spring.jta.bitronix.properties.current-node-only-recovery=true # Whether to recover only the current node. spring.jta.bitronix.properties.debug-zero-resource-transaction=false # Whether to log the creation and commit call stacks of transactions executed without a single enlisted resource. @@ -887,11 +887,11 @@ content into your application. Rather, pick only the properties that you need. spring.jta.narayana.xa-resource-orphan-filters= # Comma-separated list of orphan filters. # EMBEDDED MONGODB ({sc-spring-boot-autoconfigure}/mongo/embedded/EmbeddedMongoProperties.{sc-ext}[EmbeddedMongoProperties]) - spring.mongodb.embedded.features=SYNC_DELAY # Comma-separated list of features to enable. + spring.mongodb.embedded.features=sync_delay # Comma-separated list of features to enable. spring.mongodb.embedded.storage.database-dir= # Directory used for data storage. spring.mongodb.embedded.storage.oplog-size= # Maximum size of the oplog, in megabytes. spring.mongodb.embedded.storage.repl-set-name= # Name of the replica set. - spring.mongodb.embedded.version=2.6.10 # Version of Mongo to use. + spring.mongodb.embedded.version=3.2.2 # Version of Mongo to use. # REDIS ({sc-spring-boot-autoconfigure}/data/redis/RedisProperties.{sc-ext}[RedisProperties]) spring.redis.cluster.max-redirects= # Maximum number of redirects to follow when executing commands across the cluster. @@ -899,8 +899,8 @@ content into your application. Rather, pick only the properties that you need. spring.redis.database=0 # Database index used by the connection factory. spring.redis.url= # Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379 spring.redis.host=localhost # Redis server host. - spring.redis.jedis.pool.max-active=8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit. - spring.redis.jedis.pool.max-idle=8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections. + spring.redis.jedis.pool.max-active=8 # Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit. + spring.redis.jedis.pool.max-idle=8 # Maximum number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections. spring.redis.jedis.pool.max-wait=-1ms # Maximum amount of time a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely. spring.redis.jedis.pool.min-idle=0 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive. spring.redis.lettuce.pool.max-active=8 # Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit. @@ -913,7 +913,7 @@ content into your application. Rather, pick only the properties that you need. spring.redis.sentinel.master= # Name of the Redis server. spring.redis.sentinel.nodes= # Comma-separated list of "host:port" pairs. spring.redis.ssl=false # Whether to enable SSL support. - spring.redis.timeout=0 # Connection timeout. + spring.redis.timeout= # Connection timeout. # TRANSACTION ({sc-spring-boot-autoconfigure}/transaction/TransactionProperties.{sc-ext}[TransactionProperties]) spring.transaction.default-timeout= # Default transaction timeout. If a duration suffix is not specified, seconds will be used. @@ -931,7 +931,7 @@ content into your application. Rather, pick only the properties that you need. spring.activemq.in-memory=true # Whether the default broker URL should be in memory. Ignored if an explicit broker has been specified. spring.activemq.non-blocking-redelivery=false # Whether to stop message delivery before re-delivering messages from a rolled back transaction. This implies that message order is not preserved when this is enabled. spring.activemq.password= # Login password of the broker. - spring.activemq.send-timeout=0 # Time to wait on message sends for a response. Set it to 0 to wait forever. + spring.activemq.send-timeout=0ms # Time to wait on message sends for a response. Set it to 0 to wait forever. spring.activemq.user= # Login user of the broker. spring.activemq.packages.trust-all= # Whether to trust all packages. spring.activemq.packages.trusted= # Comma-separated list of specific packages to trust (when not trusting all packages). @@ -985,7 +985,7 @@ content into your application. Rather, pick only the properties that you need. spring.jms.template.priority= # Priority of a message when sending. Enables QoS (Quality of Service) when set. spring.jms.template.qos-enabled= # Whether to enable explicit QoS (Quality of Service) when sending a message. spring.jms.template.receive-timeout= # Timeout to use for receive calls. - spring.jms.template.time-to-live= # Time-to-live of a message when sending. Enable QoS (Quality of Service) when set. + spring.jms.template.time-to-live= # Time-to-live of a message when sending. Enables QoS (Quality of Service) when set. # APACHE KAFKA ({sc-spring-boot-autoconfigure}/kafka/KafkaProperties.{sc-ext}[KafkaProperties]) spring.kafka.admin.client-id= # ID to pass to the server when making requests. Used for server-side logging. @@ -993,7 +993,7 @@ content into your application. Rather, pick only the properties that you need. spring.kafka.admin.properties.*= # Additional admin-specific properties used to configure the client. spring.kafka.admin.ssl.key-password= # Password of the private key in the key store file. spring.kafka.admin.ssl.keystore-location= # Location of the key store file. - spring.kafka.admin.ssl.keystore-password= # Password of the key store file. + spring.kafka.admin.ssl.keystore-password= # Store password for the key store file. spring.kafka.admin.ssl.truststore-location= # Location of the trust store file. spring.kafka.admin.ssl.truststore-password= # Store password for the trust store file. spring.kafka.bootstrap-servers= # Comma-delimited list of host:port pairs to use for establishing the initial connection to the Kafka cluster. @@ -1017,7 +1017,7 @@ content into your application. Rather, pick only the properties that you need. spring.kafka.consumer.ssl.truststore-password= # Store password for the trust store file. spring.kafka.consumer.value-deserializer= # Deserializer class for values. spring.kafka.jaas.control-flag=required # Control flag for login configuration. - spring.kafka.jaas.enabled= # Whether to enable JAAS configuration. + spring.kafka.jaas.enabled=false # Whether to enable JAAS configuration. spring.kafka.jaas.login-module=com.sun.security.auth.module.Krb5LoginModule # Login module. spring.kafka.jaas.options= # Additional JAAS options. spring.kafka.listener.ack-count= # Number of records between offset commits when ackMode is "COUNT" or "COUNT_TIME". @@ -1067,28 +1067,28 @@ content into your application. Rather, pick only the properties that you need. spring.rabbitmq.listener.direct.acknowledge-mode= # Acknowledge mode of container. spring.rabbitmq.listener.direct.auto-startup=true # Whether to start the container automatically on startup. spring.rabbitmq.listener.direct.consumers-per-queue= # Number of consumers per queue. - spring.rabbitmq.listener.direct.default-requeue-rejected= # Whether rejected deliveries are re-queued by default. Defaults to true. + spring.rabbitmq.listener.direct.default-requeue-rejected= # Whether rejected deliveries are re-queued by default. spring.rabbitmq.listener.direct.idle-event-interval= # How often idle container events should be published. spring.rabbitmq.listener.direct.prefetch= # Number of messages to be handled in a single request. It should be greater than or equal to the transaction size (if used). spring.rabbitmq.listener.direct.retry.enabled=false # Whether publishing retries are enabled. - spring.rabbitmq.listener.direct.retry.initial-interval=1000ms # Interval between the first and second attempt to publish or deliver a message. - spring.rabbitmq.listener.direct.retry.max-attempts=3 # Maximum number of attempts to publish or deliver a message. - spring.rabbitmq.listener.direct.retry.max-interval=10000ms # Maximum interval between attempts. + spring.rabbitmq.listener.direct.retry.initial-interval=1000ms # Interval, in milliseconds, between the first and second attempt to deliver a message. + spring.rabbitmq.listener.direct.retry.max-attempts=3 # Maximum number of attempts to deliver a message. + spring.rabbitmq.listener.direct.retry.max-interval=10000ms # Maximum interval, in milliseconds, between attempts. spring.rabbitmq.listener.direct.retry.multiplier=1 # Multiplier to apply to the previous retry interval. spring.rabbitmq.listener.direct.retry.stateless=true # Whether retries are stateless or stateful. spring.rabbitmq.listener.simple.acknowledge-mode= # Acknowledge mode of container. spring.rabbitmq.listener.simple.auto-startup=true # Whether to start the container automatically on startup. spring.rabbitmq.listener.simple.concurrency= # Minimum number of listener invoker threads. - spring.rabbitmq.listener.simple.default-requeue-rejected= # Whether to re-queue delivery failures. + spring.rabbitmq.listener.simple.default-requeue-rejected= # Whether rejected deliveries are re-queued by default. spring.rabbitmq.listener.simple.idle-event-interval= # How often idle container events should be published. - spring.rabbitmq.listener.simple.max-concurrency= # Maximum number of listener invoker. + spring.rabbitmq.listener.simple.max-concurrency= # Maximum number of listener invoker threads. spring.rabbitmq.listener.simple.prefetch= # Number of messages to be handled in a single request. It should be greater than or equal to the transaction size (if used). spring.rabbitmq.listener.simple.retry.enabled=false # Whether publishing retries are enabled. spring.rabbitmq.listener.simple.retry.initial-interval=1000 # Interval, in milliseconds, between the first and second attempt to deliver a message. spring.rabbitmq.listener.simple.retry.max-attempts=3 # Maximum number of attempts to deliver a message. spring.rabbitmq.listener.simple.retry.max-interval=10000 # Maximum interval, in milliseconds, between attempts. - spring.rabbitmq.listener.simple.retry.multiplier=1.0 # Multiplier to apply to the previous delivery retry interval. - spring.rabbitmq.listener.simple.retry.stateless=true # Whether or not retry is stateless or stateful. + spring.rabbitmq.listener.simple.retry.multiplier=1 # Multiplier to apply to the previous retry interval. + spring.rabbitmq.listener.simple.retry.stateless=true # Whether retries are stateless or stateful. spring.rabbitmq.listener.simple.transaction-size= # Number of messages to be processed in a transaction. That is, the number of messages between acks. For best results, it should be less than or equal to the prefetch count. spring.rabbitmq.listener.type=simple # Listener container type. spring.rabbitmq.password=guest # Login to authenticate against the broker. @@ -1105,14 +1105,14 @@ content into your application. Rather, pick only the properties that you need. spring.rabbitmq.ssl.trust-store-type=JKS # Trust store type. spring.rabbitmq.ssl.algorithm= # SSL algorithm to use. By default, configured by the Rabbit client library. spring.rabbitmq.template.exchange= # Name of the default exchange to use for send operations. - spring.rabbitmq.template.mandatory=false # Whether to enable mandatory messages. - spring.rabbitmq.template.receive-timeout=0 # Timeout for `receive()` methods. - spring.rabbitmq.template.reply-timeout=5000 # Timeout for `sendAndReceive()` methods. - spring.rabbitmq.template.retry.enabled=false # Whether to enable retries in the `RabbitTemplate`. - spring.rabbitmq.template.retry.initial-interval=1000 # Interval, in milliseconds, between the first and second attempt to publish a message. - spring.rabbitmq.template.retry.max-attempts=3 # Maximum number of attempts to publish a message. - spring.rabbitmq.template.retry.max-interval=10000 # Maximum number of attempts to publish a message. - spring.rabbitmq.template.retry.multiplier=1.0 # Multiplier to apply to the previous publishing retry interval. + spring.rabbitmq.template.mandatory= # Whether to enable mandatory messages. + spring.rabbitmq.template.receive-timeout= # Timeout for `receive()` operations. + spring.rabbitmq.template.reply-timeout= # Timeout for `sendAndReceive()` operations. + spring.rabbitmq.template.retry.enabled=false # Whether publishing retries are enabled. + spring.rabbitmq.template.retry.initial-interval=1000 # Interval, in milliseconds, between the first and second attempt to deliver a message. + spring.rabbitmq.template.retry.max-attempts=3 # Maximum number of attempts to deliver a message. + spring.rabbitmq.template.retry.max-interval=10000 # Maximum interval, in milliseconds, between attempts. + spring.rabbitmq.template.retry.multiplier=1 # Multiplier to apply to the previous retry interval. spring.rabbitmq.template.routing-key= # Value of a default routing key to use for send operations. spring.rabbitmq.username=guest # Login user to authenticate to the broker. spring.rabbitmq.virtual-host= # Virtual host to use when connecting to the broker. @@ -1124,9 +1124,9 @@ content into your application. Rather, pick only the properties that you need. # MANAGEMENT HTTP SERVER ({sc-spring-boot-actuator-autoconfigure}/web/server/ManagementServerProperties.{sc-ext}[ManagementServerProperties]) management.server.add-application-context-header=false # Add the "X-Application-Context" HTTP header in each response. Requires a custom management.server.port. - management.server.address= # Network address that to which the management endpoints should bind. Requires a custom management.server.port. - management.server.port= # Management endpoint HTTP port. Uses the same port as the application by default. Configure a different port to use management-specific SSL. - management.server.servlet.context-path= # Management endpoint context-path. For instance, `/management`. Requires a custom management.server.port. + management.server.address= # Network address to which the management endpoints should bind. Requires a custom management.server.port. + management.server.port= # Management endpoint HTTP port (uses the same port as the application by default). Configure a different port to use management-specific SSL. + management.server.servlet.context-path= # Management endpoint context-path (for instance, `/management`). Requires a custom management.server.port. management.server.ssl.ciphers= # Supported SSL ciphers. Requires a custom management.port. management.server.ssl.client-auth= # Whether client authentication is wanted ("want") or needed ("need"). Requires a trust store. Requires a custom management.server.port. management.server.ssl.enabled= # Whether to enable SSL support. Requires a custom management.server.port. @@ -1148,17 +1148,17 @@ content into your application. Rather, pick only the properties that you need. management.cloudfoundry.skip-ssl-validation=false # Whether to skip SSL verification for Cloud Foundry actuator endpoint security calls. # ENDPOINTS GENERAL CONFIGURATION - management.endpoints.enabled-by-default= # Enable or disable all endpoints by default. + management.endpoints.enabled-by-default= # Whether to enable or disable all endpoints by default. # ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/jmx/JmxEndpointProperties.{sc-ext}[JmxEndpointProperties]) management.endpoints.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set. management.endpoints.jmx.exposure.include=* # Endpoint IDs that should be included or '*' for all. management.endpoints.jmx.exposure.exclude= # Endpoint IDs that should be excluded. - management.endpoints.jmx.static-names=false # Additional static properties to append to all ObjectNames of MBeans representing Endpoints. + management.endpoints.jmx.static-names= # Additional static properties to append to all ObjectNames of MBeans representing Endpoints. management.endpoints.jmx.unique-names=false # Whether to ensure that ObjectNames are modified in case of conflict. # ENDPOINTS WEB CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/web/WebEndpointProperties.{sc-ext}[WebEndpointProperties]) - management.endpoints.web.exposure.include=info,health # Endpoint IDs that should be included or '*' for all. + management.endpoints.web.exposure.include=health,info # Endpoint IDs that should be included or '*' for all. management.endpoints.web.exposure.exclude= # Endpoint IDs that should be excluded. management.endpoints.web.base-path=/actuator # Base path for Web endpoints. Relative to server.servlet.context-path or management.server.servlet.context-path if management.server.port is configured. management.endpoints.web.path-mapping= # Mapping between endpoint IDs and the path that should expose them. @@ -1169,47 +1169,47 @@ content into your application. Rather, pick only the properties that you need. management.endpoints.web.cors.allowed-methods= # Comma-separated list of methods to allow. '*' allows all methods. When not set, defaults to GET. management.endpoints.web.cors.allowed-origins= # Comma-separated list of origins to allow. '*' allows all origins. When not set, CORS support is disabled. management.endpoints.web.cors.exposed-headers= # Comma-separated list of headers to include in a response. - management.endpoints.web.cors.max-age=1800 # How long the response from a pre-flight request can be cached by clients. If a duration suffix is not specified, seconds will be used. + management.endpoints.web.cors.max-age=1800s # How long the response from a pre-flight request can be cached by clients. If a duration suffix is not specified, seconds will be used. # AUDIT EVENTS ENDPOINT ({sc-spring-boot-actuator}/audit/AuditEventsEndpoint.{sc-ext}[AuditEventsEndpoint]) management.endpoint.auditevents.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.auditevents.enabled= # Whether to enable the auditevents endpoint. + management.endpoint.auditevents.enabled=true # Whether to enable the auditevents endpoint. # BEANS ENDPOINT ({sc-spring-boot-actuator}/beans/BeansEndpoint.{sc-ext}[BeansEndpoint]) management.endpoint.beans.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.beans.enabled= # Whether to enable the beans endpoint. + management.endpoint.beans.enabled=true # Whether to enable the beans endpoint. # CONDITIONS REPORT ENDPOINT ({sc-spring-boot-actuator-autoconfigure}/condition/ConditionsReportEndpoint.{sc-ext}[ConditionsReportEndpoint]) management.endpoint.conditions.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.conditions.enabled= # Whether to enable the conditions endpoint. + management.endpoint.conditions.enabled=true # Whether to enable the conditions endpoint. # CONFIGURATION PROPERTIES REPORT ENDPOINT ({sc-spring-boot-actuator}/context/properties/ConfigurationPropertiesReportEndpoint.{sc-ext}[ConfigurationPropertiesReportEndpoint], {sc-spring-boot-actuator-autoconfigure}/context/properties/ConfigurationPropertiesReportEndpointProperties.{sc-ext}[ConfigurationPropertiesReportEndpointProperties]) management.endpoint.configprops.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.configprops.enabled= # Whether to enable the configprops endpoint. + management.endpoint.configprops.enabled=true # Whether to enable the configprops endpoint. management.endpoint.configprops.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regular expressions. # ENVIRONMENT ENDPOINT ({sc-spring-boot-actuator}/env/EnvironmentEndpoint.{sc-ext}[EnvironmentEndpoint], {sc-spring-boot-actuator-autoconfigure}/env/EnvironmentEndpointProperties.{sc-ext}[EnvironmentEndpointProperties]) management.endpoint.env.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.env.enabled= # Whether to enable the env endpoint. + management.endpoint.env.enabled=true # Whether to enable the env endpoint. management.endpoint.env.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regular expressions. # FLYWAY ENDPOINT ({sc-spring-boot-actuator}/flyway/FlywayEndpoint.{sc-ext}[FlywayEndpoint]) management.endpoint.flyway.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.flyway.enabled= # Whether to enable the flyway endpoint. + management.endpoint.flyway.enabled=true # Whether to enable the flyway endpoint. # HEALTH ENDPOINT ({sc-spring-boot-actuator}/health/HealthEndpoint.{sc-ext}[HealthEndpoint], {sc-spring-boot-actuator-autoconfigure}/health/HealthEndpointProperties.{sc-ext}[HealthEndpointProperties]) management.endpoint.health.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.health.enabled= # Whether to enable the health endpoint. + management.endpoint.health.enabled=true # Whether to enable the health endpoint. management.endpoint.health.roles= # Roles used to determine whether or not a user is authorized to be shown details. When empty, all authenticated users are authorized. management.endpoint.health.show-details=never # When to show full health details. # HEAP DUMP ENDPOINT ({sc-spring-boot-actuator}/management/HeapDumpWebEndpoint.{sc-ext}[HeapDumpWebEndpoint]) management.endpoint.heapdump.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.heapdump.enabled= # Whether to enable the heapdump endpoint. + management.endpoint.heapdump.enabled=true # Whether to enable the heapdump endpoint. # HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/trace/http/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint]) management.endpoint.httptrace.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.httptrace.enabled= # Whether to enable the HTTP trace endpoint. + management.endpoint.httptrace.enabled=true # Whether to enable the httptrace endpoint. # INFO ENDPOINT ({sc-spring-boot-actuator}/info/InfoEndpoint.{sc-ext}[InfoEndpoint]) info= # Arbitrary properties to add to the info endpoint. @@ -1217,47 +1217,47 @@ content into your application. Rather, pick only the properties that you need. management.endpoint.info.enabled=true # Whether to enable the info endpoint. # JOLOKIA ENDPOINT ({sc-spring-boot-actuator-autoconfigure}/jolokia/JolokiaProperties.{sc-ext}[JolokiaProperties]) - management.endpoint.jolokia.config.*= # Jolokia settings. See the Jolokia manual for details. - management.endpoint.jolokia.enabled=true # Whether to enable Jolokia. + management.endpoint.jolokia.config.*= # Jolokia settings. Refer to the documentation of Jolokia for more details. + management.endpoint.jolokia.enabled=true # Whether to enable the jolokia endpoint. # LIQUIBASE ENDPOINT ({sc-spring-boot-actuator}/liquibase/LiquibaseEndpoint.{sc-ext}[LiquibaseEndpoint]) management.endpoint.liquibase.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.liquibase.enabled= # Whether to enable the liquibase endpoint. + management.endpoint.liquibase.enabled=true # Whether to enable the liquibase endpoint. # LOG FILE ENDPOINT ({sc-spring-boot-actuator}/logging/LogFileWebEndpoint.{sc-ext}[LogFileWebEndpoint], {sc-spring-boot-actuator-autoconfigure}/logging/LogFileWebEndpointProperties.{sc-ext}[LogFileWebEndpointProperties]) management.endpoint.logfile.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.logfile.enabled= # Whether to enable the logfile endpoint. + management.endpoint.logfile.enabled=true # Whether to enable the logfile endpoint. management.endpoint.logfile.external-file= # External Logfile to be accessed. Can be used if the logfile is written by output redirect and not by the logging system itself. # LOGGERS ENDPOINT ({sc-spring-boot-actuator}/logging/LoggersEndpoint.{sc-ext}[LoggersEndpoint]) management.endpoint.loggers.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.loggers.enabled= # Whether to enable the loggers endpoint. + management.endpoint.loggers.enabled=true # Whether to enable the loggers endpoint. # REQUEST MAPPING ENDPOINT ({sc-spring-boot-actuator}/web/mappings/MappingsEndpoint.{sc-ext}[MappingsEndpoint]) management.endpoint.mappings.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.mappings.enabled= # Whether to enable the mappings endpoint. + management.endpoint.mappings.enabled=true # Whether to enable the mappings endpoint. # METRICS ENDPOINT ({sc-spring-boot-actuator}/metrics/MetricsEndpoint.{sc-ext}[MetricsEndpoint]) management.endpoint.metrics.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.metrics.enabled= # Whether to enable the metrics endpoint. + management.endpoint.metrics.enabled=true # Whether to enable the metrics endpoint. # PROMETHEUS ENDPOINT ({sc-spring-boot-actuator}/metrics/export/prometheus/PrometheusScrapeEndpoint.{sc-ext}[PrometheusScrapeEndpoint]) management.endpoint.prometheus.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.prometheus.enabled= # Whether to enable the Prometheus endpoint. + management.endpoint.prometheus.enabled=true # Whether to enable the prometheus endpoint. # SCHEDULED TASKS ENDPOINT ({sc-spring-boot-actuator}/scheduling/ScheduledTasksEndpoint.{sc-ext}[ScheduledTasksEndpoint]) management.endpoint.scheduledtasks.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.scheduledtasks.enabled= # Whether to enable the scheduled tasks endpoint. + management.endpoint.scheduledtasks.enabled=true # Whether to enable the scheduledtasks endpoint. # SESSIONS ENDPOINT ({sc-spring-boot-actuator}/session/SessionsEndpoint.{sc-ext}[SessionsEndpoint]) - management.endpoint.sessions.enabled= # Whether to enable the sessions endpoint. + management.endpoint.sessions.enabled=true # Whether to enable the sessions endpoint. # SHUTDOWN ENDPOINT ({sc-spring-boot-actuator}/context/ShutdownEndpoint.{sc-ext}[ShutdownEndpoint]) management.endpoint.shutdown.enabled=false # Whether to enable the shutdown endpoint. # THREAD DUMP ENDPOINT ({sc-spring-boot-actuator}/management/ThreadDumpEndpoint.{sc-ext}[ThreadDumpEndpoint]) management.endpoint.threaddump.cache.time-to-live=0ms # Maximum time that a response can be cached. - management.endpoint.threaddump.enabled= # Whether to enable the threaddump endpoint. + management.endpoint.threaddump.enabled=true # Whether to enable the threaddump endpoint. # HEALTH INDICATORS management.health.db.enabled=true # Whether to enable database health check. @@ -1269,7 +1269,7 @@ content into your application. Rather, pick only the properties that you need. management.health.diskspace.threshold=0 # Minimum disk space, in bytes, that should be available. management.health.elasticsearch.enabled=true # Whether to enable Elasticsearch health check. management.health.elasticsearch.indices= # Comma-separated index names. - management.health.elasticsearch.response-timeout=100ms # The time to wait for a response from the cluster. + management.health.elasticsearch.response-timeout=100ms # Time to wait for a response from the cluster. management.health.influxdb.enabled=true # Whether to enable InfluxDB health check. management.health.jms.enabled=true # Whether to enable JMS health check. management.health.kafka.enabled=true # Whether to enable Kafka health check. @@ -1282,7 +1282,7 @@ content into your application. Rather, pick only the properties that you need. management.health.redis.enabled=true # Whether to enable Redis health check. management.health.solr.enabled=true # Whether to enable Solr health check. management.health.status.http-mapping= # Mapping of health statuses to HTTP status codes. By default, registered health statuses map to sensible defaults (for example, UP maps to 200). - management.health.status.order=DOWN, OUT_OF_SERVICE, UP, UNKNOWN # Comma-separated list of health statuses in order of severity. + management.health.status.order=DOWN,OUT_OF_SERVICE,UP,UNKNOWN # Comma-separated list of health statuses in order of severity. # HTTP TRACING ({sc-spring-boot-actuator-autoconfigure}/trace/http/HttpTraceProperties.{sc-ext}[HttpTraceProperties]) management.trace.http.enabled=true # Whether to enable HTTP request-response tracing. @@ -1421,8 +1421,8 @@ content into your application. Rather, pick only the properties that you need. spring.devtools.livereload.port=35729 # Server port. spring.devtools.restart.additional-exclude= # Additional patterns that should be excluded from triggering a full restart. spring.devtools.restart.additional-paths= # Additional paths to watch for changes. - spring.devtools.restart.enabled=true # Enable automatic restart. - spring.devtools.restart.exclude=META-INF/maven/**,META-INF/resources/**,resources/**,static/**,public/**,templates/**,**/*Test.class,**/*Tests.class,git.properties # Patterns that should be excluded from triggering a full restart. + spring.devtools.restart.enabled=true # Whether to enable automatic restart. + spring.devtools.restart.exclude=META-INF/maven/**,META-INF/resources/**,resources/**,static/**,public/**,templates/**,**/*Test.class,**/*Tests.class,git.properties,META-INF/build-info.properties # Patterns that should be excluded from triggering a full restart. spring.devtools.restart.log-condition-evaluation-delta=true # Whether to log the condition evaluation delta upon restart. spring.devtools.restart.poll-interval=1s # Amount of time to wait between polling for classpath changes. spring.devtools.restart.quiet-period=400ms # Amount of quiet time required without any classpath changes before a restart is triggered. diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 5e793af554..f25fb511de 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -22,22 +22,24 @@ "name": "spring.banner.image.location", "type": "org.springframework.core.io.Resource", "description": "Banner image file location (jpg or png can also be used).", - "defaultValue": "banner.gif" + "defaultValue": "classpath:banner.gif" }, { "name": "spring.banner.image.width", "type": "java.lang.Integer", - "description": "Banner image width (in chars)." + "description": "Width of the banner image in chars.", + "defaultValue": 76 }, { "name": "spring.banner.image.height", "type": "java.lang.Integer", - "description": "Banner image height (in chars)." + "description": "Height of the banner image in chars (default based on image height)." }, { "name": "spring.banner.image.margin", "type": "java.lang.Integer", - "description": "Left hand image margin (in chars)." + "description": "Left hand image margin in chars.", + "defaultValue": 2 }, { "name": "spring.banner.image.invert", @@ -55,7 +57,7 @@ { "name": "logging.config", "type": "java.lang.String", - "description": "Location of the logging configuration file. For instance, 'classpath:logback.xml' for Logback.", + "description": "Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, { @@ -68,7 +70,7 @@ { "name": "logging.file", "type": "java.lang.String", - "description": "Log file name. For instance, 'myapp.log'. Names can be an exact location or relative to the current directory.", + "description": "Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, { @@ -81,20 +83,20 @@ { "name": "logging.file.max-history", "type": "java.lang.Integer", - "description": "Maximum number of archive log files to keep. Only supported with the default logback setup.", + "description": "Maximum of archive log files to keep. Only supported with the default logback setup.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "defaultValue": 0 }, { "name": "logging.level", "type": "java.util.Map", - "description": "Log levels severity mapping. For instance, 'logging.level.org.springframework=DEBUG'", + "description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, { "name": "logging.path", "type": "java.lang.String", - "description": "Location of the log file. For instance, '/var/log'.", + "description": "Location of the log file. For instance, `/var/log`.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, { @@ -129,13 +131,8 @@ "name": "logging.register-shutdown-hook", "type": "java.lang.Boolean", "description": "Register a shutdown hook for the logging system when it is initialized.", - "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" - }, - { - "name": "spring.mandatory-file-encoding", - "sourceType": "org.springframework.boot.context.FileEncodingApplicationListener", - "type": "java.nio.charset.Charset", - "description": "Expected character encoding the application must use." + "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", + "defaultValue": false }, { "name": "spring.application.name", @@ -169,6 +166,12 @@ "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "description": "Config file locations that replace the defaults." }, + { + "name": "spring.jta.narayana.expiry-scanners", + "defaultValue": [ + "com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner" + ] + }, { "name": "spring.main.banner-mode", "type": "org.springframework.boot.Banner$Mode", @@ -203,11 +206,16 @@ "type": "java.lang.Boolean", "sourceType": "org.springframework.boot.SpringApplication", "description": "Run the application in a web environment (auto-detected by default).", - "deprecated": true, "deprecation": { "replacement": "spring.main.web-application-type" } }, + { + "name": "spring.mandatory-file-encoding", + "sourceType": "org.springframework.boot.context.FileEncodingApplicationListener", + "type": "java.nio.charset.Charset", + "description": "Expected character encoding the application must use." + }, { "name": "spring.output.ansi.enabled", "type": "org.springframework.boot.ansi.AnsiOutput$Enabled",