Polish

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -27,6 +27,8 @@ content into your application. Rather, pick only the properties that you need.
 	# ----------------------------------------
 	# CORE PROPERTIES
 	# ----------------------------------------
+	debug=false # Enable debug logs.
+	trace=false # Enable trace logs.
 
 	# LOGGING
 	logging.config= # Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback
@@ -760,7 +762,10 @@ content into your application. Rather, pick only the properties that you need.
 	spring.jta.atomikos.connectionfactory.min-pool-size=1 # The minimum size of the pool.
 	spring.jta.atomikos.connectionfactory.reap-timeout=0 # The reap timeout, in seconds, for borrowed connections. 0 denotes no limit.
 	spring.jta.atomikos.connectionfactory.unique-resource-name=jmsConnectionFactory # The unique name used to identify the resource during recovery.
+	spring.jta.atomikos.connectionfactory.xa-connection-factory-class-name= # Vendor-specific implementation of XAConnectionFactory.
+	spring.jta.atomikos.connectionfactory.xa-properties= # Vendor-specific XA properties.
 	spring.jta.atomikos.datasource.borrow-connection-timeout=30 # Timeout, in seconds, for borrowing connections from the pool.
+	spring.jta.atomikos.datasource.concurrent-connection-validation= # Whether to use concurrent connection validation.
 	spring.jta.atomikos.datasource.default-isolation-level= # Default isolation level of connections provided by the pool.
 	spring.jta.atomikos.datasource.login-timeout= # Timeout, in seconds, for establishing a database connection.
 	spring.jta.atomikos.datasource.maintenance-interval=60 # The time, in seconds, between runs of the pool's maintenance thread.
@@ -771,6 +776,8 @@ content into your application. Rather, pick only the properties that you need.
 	spring.jta.atomikos.datasource.reap-timeout=0 # The reap timeout, in seconds, for borrowed connections. 0 denotes no limit.
 	spring.jta.atomikos.datasource.test-query= # SQL query or statement used to validate a connection before returning it.
 	spring.jta.atomikos.datasource.unique-resource-name=dataSource # The unique name used to identify the resource during recovery.
+	spring.jta.atomikos.datasource.xa-data-source-class-name= # Vendor-specific implementation of XAConnectionFactory.
+	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.
@@ -798,7 +805,11 @@ content into your application. Rather, pick only the properties that you need.
 	spring.jta.bitronix.connectionfactory.apply-transaction-timeout=false # Whether the transaction timeout should be set on the XAResource when it is enlisted.
 	spring.jta.bitronix.connectionfactory.automatic-enlisting-enabled=true # Whether resources should be enlisted and delisted automatically.
 	spring.jta.bitronix.connectionfactory.cache-producers-consumers=true # Whether producers and consumers should be cached.
+	spring.jta.bitronix.connectionfactory.class-name= # Underlying implementation class name of the XA resource.
 	spring.jta.bitronix.connectionfactory.defer-connection-release=true # Whether the provider can run many transactions on the same connection and supports transaction interleaving.
+	spring.jta.bitronix.connectionfactory.disabled= # Whether this resource is disabled, meaning it's temporarily forbidden to acquire a connection from its pool.
+	spring.jta.bitronix.connectionfactory.driver-properties= # Properties that should be set on the underlying implementation.
+	spring.jta.bitronix.connectionfactory.failed= # Mark this resource producer as failed.
 	spring.jta.bitronix.connectionfactory.ignore-recovery-failures=false # Whether recovery failures should be ignored.
 	spring.jta.bitronix.connectionfactory.max-idle-time=60 # The time, in seconds, after which connections are cleaned up from the pool.
 	spring.jta.bitronix.connectionfactory.max-pool-size=10 # The maximum size of the pool. 0 denotes no limit.
@@ -816,9 +827,13 @@ content into your application. Rather, pick only the properties that you need.
 	spring.jta.bitronix.datasource.allow-local-transactions=true # Whether the transaction manager should allow mixing XA and non-XA transactions.
 	spring.jta.bitronix.datasource.apply-transaction-timeout=false # Whether the transaction timeout should be set on the XAResource when it is enlisted.
 	spring.jta.bitronix.datasource.automatic-enlisting-enabled=true # Whether resources should be enlisted and delisted automatically.
+	spring.jta.bitronix.datasource.class-name= # Underlying implementation class name of the XA resource.
 	spring.jta.bitronix.datasource.cursor-holdability= # The default cursor holdability for connections.
 	spring.jta.bitronix.datasource.defer-connection-release=true # Whether the database can run many transactions on the same connection and supports transaction interleaving.
+	spring.jta.bitronix.datasource.disabled= # Whether this resource is disabled, meaning it's temporarily forbidden to acquire a connection from its pool.
+	spring.jta.bitronix.datasource.driver-properties= # Properties that should be set on the underlying implementation.
 	spring.jta.bitronix.datasource.enable-jdbc4-connection-test= # Whether Connection.isValid() is called when acquiring a connection from the pool.
+	spring.jta.bitronix.datasource.failed= # Mark this resource producer as failed.
 	spring.jta.bitronix.datasource.ignore-recovery-failures=false # Whether recovery failures should be ignored.
 	spring.jta.bitronix.datasource.isolation-level= # The default isolation level for connections.
 	spring.jta.bitronix.datasource.local-auto-commit= # The default auto-commit mode for local transactions.
@@ -1193,6 +1208,7 @@ content into your application. Rather, pick only the properties that you need.
 	management.endpoint.heapdump.enabled= # Whether to enable the heapdump endpoint.
 
 	# INFO ENDPOINT ({sc-spring-boot-actuator}/info/InfoEndpoint.{sc-ext}[InfoEndpoint])
+	info= # Arbitrary properties to add to the info endpoint.
 	management.endpoint.info.cache.time-to-live=0ms # Maximum time that a response can be cached.
 	management.endpoint.info.enabled=true # Whether to enable the info endpoint.
 

spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -169,10 +169,6 @@
       "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
       "description": "Config file locations that replace the defaults."
     },
-    {
-      "name": "spring.jta.atomikos.properties.console-log-level",
-      "defaultValue": "warn"
-    },
     {
       "name": "spring.main.banner-mode",
       "type": "org.springframework.boot.Banner$Mode",