Skip to content

Commit d3750c4

Browse files
committed
Merge branch '2.6.x' into 2.7.x
2 parents 6f787c4 + c416c17 commit d3750c4

File tree

24 files changed

+45
-45
lines changed

24 files changed

+45
-45
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ This would make `liveness` available at `/livez` and `readiness` at `readyz` on
10161016

10171017

10181018
[[actuator.endpoints.kubernetes-probes.external-state]]
1019-
==== Checking External State with Kubernetes Probes
1019+
==== Checking External State With Kubernetes Probes
10201020
Actuator configures the "`liveness`" and "`readiness`" probes as Health Groups.
10211021
This means that all the <<actuator#actuator.endpoints.health.groups, health groups features>> are available for them.
10221022
You can, for example, configure additional Health Indicators:

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/monitoring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[actuator.monitoring]]
2-
== Monitoring and Management over HTTP
2+
== Monitoring and Management Over HTTP
33
If you are developing a web application, Spring Boot Actuator auto-configures all enabled endpoints to be exposed over HTTP.
44
The default convention is to use the `id` of the endpoint with a prefix of `/actuator` as the URL path.
55
For example, `health` is exposed as `/actuator/health`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/cli/groovy-beans-dsl.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[cli.groovy-beans-dsl]]
2-
== Developing Applications with the Groovy Beans DSL
2+
== Developing Applications With the Groovy Beans DSL
33
Spring Framework 4.0 has native support for a `beans{}` "`DSL`" (borrowed from https://grails.org/[Grails]), and you can embed bean definitions in your Groovy application scripts by using the same format.
44
This is sometimes a good way to include external features like middleware declarations, as shown in the following example:
55

spring-boot-project/spring-boot-docs/src/docs/asciidoc/cli/maven-setting.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[cli.maven-setting]]
2-
== Configuring the CLI with settings.xml
2+
== Configuring the CLI With settings.xml
33
The Spring Boot CLI uses Maven Resolver, Maven's dependency resolution engine, to resolve dependencies.
44
The CLI makes use of the Maven configuration found in `~/.m2/settings.xml` to configure Maven Resolver.
55
The following configuration settings are honored by the CLI:

spring-boot-project/spring-boot-docs/src/docs/asciidoc/cli/using-the-cli.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The `version` command provides a quick way to check which version of Spring Boot
5050

5151

5252
[[cli.using-the-cli.run]]
53-
=== Running Applications with the CLI
53+
=== Running Applications With the CLI
5454
You can compile and run Groovy source code by using the `run` command.
5555
The Spring Boot CLI is completely self-contained, so you do not need any external Groovy installation.
5656

@@ -197,7 +197,7 @@ However, to ensure consistent ordering of the dependency management, you can use
197197

198198

199199
[[cli.using-the-cli.multiple-source-files]]
200-
=== Applications with Multiple Source Files
200+
=== Applications With Multiple Source Files
201201
You can use "`shell globbing`" with all commands that accept file input.
202202
Doing so lets you use multiple files from a single directory, as shown in the following example:
203203

spring-boot-project/spring-boot-docs/src/docs/asciidoc/container-images/efficient-images.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[container-images.efficient-images]]
2-
== Efficient container images
2+
== Efficient Container Images
33
It is easily possible to package a Spring Boot fat jar as a docker image.
44
However, there are various downsides to copying and running the fat jar as is in the docker image.
55
There’s always a certain amount of overhead when running a fat jar without unpacking it, and in a containerized environment this can be noticeable.
@@ -9,7 +9,7 @@ If you put jar files in the layer before your application classes, Docker often
99

1010

1111
[[container-images.efficient-images.unpacking]]
12-
=== Unpacking the fat jar
12+
=== Unpacking the Executable JAR
1313
If you are running your application from a container, you can use an executable jar, but it is also often an advantage to explode it and run it in a different way.
1414
Certain PaaS implementations may also choose to unpack archives before they run.
1515
For example, Cloud Foundry operates this way.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Spring Boot provides a dedicated "`Starter`", `spring-boot-starter-data-elastics
251251

252252

253253
[[data.nosql.elasticsearch.connecting-using-rest]]
254-
==== Connecting to Elasticsearch using REST clients
254+
==== Connecting to Elasticsearch Using REST clients
255255
Elasticsearch ships https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/index.html[two different REST clients] that you can use to query a cluster: the low-level client from the `org.elasticsearch.client:elasticsearch-rest-client` module and the high-level client from the `org.elasticsearch.client:elasticsearch-high-level-client` module.
256256
Additionally, Spring Boot provides support for a reactive client, based on Spring Framework's `WebClient`, from the `org.springframework.data:spring-data-elasticsearch` module.
257257
By default, the clients will target `http://localhost:9200`.
@@ -268,7 +268,7 @@ You can use `spring.elasticsearch.*` properties to further tune how the clients
268268
----
269269

270270
[[data.nosql.elasticsearch.connecting-using-rest.restclient]]
271-
===== Connecting to Elasticsearch using RestClient
271+
===== Connecting to Elasticsearch Using RestClient
272272
If you have `elasticsearch-rest-client` on the classpath, Spring Boot will auto-configure and register a `RestClient` bean.
273273
If you have `elasticsearch-rest-high-level-client` on the classpath a `RestHighLevelClient` bean will be auto-configured as well.
274274
Following Elasticsearch's deprecation of `RestHighLevelClient`, its auto-configuration is deprecated and will be removed in a future release.
@@ -293,7 +293,7 @@ You can further tune how `Sniffer` is configured, as shown in the following exam
293293

294294

295295
[[data.nosql.elasticsearch.connecting-using-rest.webclient]]
296-
===== Connecting to Elasticsearch using ReactiveElasticsearchClient
296+
===== Connecting to Elasticsearch Using ReactiveElasticsearchClient
297297
{spring-data-elasticsearch}[Spring Data Elasticsearch] ships `ReactiveElasticsearchClient` for querying Elasticsearch instances in a reactive fashion.
298298
It is built on top of WebFlux's `WebClient`, so both `spring-boot-starter-elasticsearch` and `spring-boot-starter-webflux` dependencies are useful to enable this support.
299299

spring-boot-project/spring-boot-docs/src/docs/asciidoc/documentation/using.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[documentation.using]]
2-
== Developing with Spring Boot
2+
== Developing With Spring Boot
33
Ready to actually start using Spring Boot? <<using#using, We have you covered>>:
44

55
* *Build systems:* <<using#using.build-systems.maven, Maven>> | <<using#using.build-systems.gradle, Gradle>> | <<using#using.build-systems.ant, Ant>> | <<using#using.build-systems.starters, Starters>>

spring-boot-project/spring-boot-docs/src/docs/asciidoc/executable-jar/jarfile-class.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ We do not need to unpack the archive, and we do not need to read all entry data
2626

2727

2828
[[appendix.executable-jar.jarfile-class.compatibility]]
29-
=== Compatibility with the Standard Java "`JarFile`"
29+
=== Compatibility With the Standard Java "`JarFile`"
3030
Spring Boot Loader strives to remain compatible with existing code and libraries.
3131
`org.springframework.boot.loader.jar.JarFile` extends from `java.util.jar.JarFile` and should work as a drop-in replacement.
3232
The `getURL()` method returns a `URL` that opens a connection compatible with `java.net.JarURLConnection` and can be used with Java's `URLClassLoader`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ This means that the JSON cannot override properties from lower order property so
9898

9999

100100
[[features.external-config.files]]
101-
=== External Application Properties [[features.external-config.files]]
101+
=== External Application Properties
102102
Spring Boot will automatically find and load `application.properties` and `application.yaml` files from the following locations when your application starts:
103103

104104
. From the classpath
@@ -471,7 +471,7 @@ See the _<<howto#howto.properties-and-configuration.short-command-line-arguments
471471

472472

473473
[[features.external-config.files.multi-document]]
474-
==== Working with Multi-Document Files
474+
==== Working With Multi-Document Files
475475
Spring Boot allows you to split a single physical file into multiple logical documents which are each added independently.
476476
Documents are processed in order, from top to bottom.
477477
Later documents can override the properties defined in earlier ones.
@@ -564,7 +564,7 @@ If you need a secure way to store credentials and passwords, the https://cloud.s
564564

565565

566566
[[features.external-config.yaml]]
567-
=== Working with YAML
567+
=== Working With YAML
568568
https://yaml.org[YAML] is a superset of JSON and, as such, is a convenient format for specifying hierarchical configuration data.
569569
The `SpringApplication` class automatically supports YAML as an alternative to properties whenever you have the https://github.com/snakeyaml/snakeyaml[SnakeYAML] library on your classpath.
570570

@@ -677,7 +677,7 @@ TIP: See also the <<features#features.external-config.typesafe-configuration-pro
677677

678678

679679
[[features.external-config.typesafe-configuration-properties.java-bean-binding]]
680-
==== JavaBean properties binding
680+
==== JavaBean Properties Binding
681681
It is possible to bind a bean declaring standard JavaBean properties as shown in the following example:
682682

683683
include::code:MyProperties[]
@@ -715,7 +715,7 @@ Finally, only standard Java Bean properties are considered and binding on static
715715

716716

717717
[[features.external-config.typesafe-configuration-properties.constructor-binding]]
718-
==== Constructor binding
718+
==== Constructor Binding
719719
The example in the previous section can be rewritten in an immutable fashion as shown in the following example:
720720

721721
include::code:MyProperties[]
@@ -747,7 +747,7 @@ For consistency with properties of other types, if you do declare an `Optional`
747747

748748

749749
[[features.external-config.typesafe-configuration-properties.enabling-annotated-types]]
750-
==== Enabling @ConfigurationProperties-annotated types
750+
==== Enabling @ConfigurationProperties-annotated Types
751751
Spring Boot provides infrastructure to bind `@ConfigurationProperties` types and register them as beans.
752752
You can either enable configuration properties on a class-by-class basis or enable configuration property scanning that works in a similar manner to component scanning.
753753

@@ -779,7 +779,7 @@ If you still want to inject other beans using the constructor, the configuration
779779

780780

781781
[[features.external-config.typesafe-configuration-properties.using-annotated-types]]
782-
==== Using @ConfigurationProperties-annotated types
782+
==== Using @ConfigurationProperties-annotated Types
783783
This style of configuration works particularly well with the `SpringApplication` external YAML configuration, as shown in the following example:
784784

785785
[source,yaml,indent=0,subs="verbatim"]
@@ -913,7 +913,7 @@ For example, binding `a.b=c` to `Map<String, Object>` will return a Map with the
913913

914914

915915
[[features.external-config.typesafe-configuration-properties.relaxed-binding.environment-variables]]
916-
===== Binding from Environment Variables
916+
===== Binding From Environment Variables
917917
Most operating systems impose strict rules around the names that can be used for environment variables.
918918
For example, Linux shell variables can contain only letters (`a` to `z` or `A` to `Z`), numbers (`0` to `9`) or the underscore character (`_`).
919919
By convention, Unix shell variables will also have their names in UPPERCASE.
@@ -1077,7 +1077,7 @@ Doing so gives a transparent upgrade path while supporting a much richer format.
10771077

10781078

10791079
[[features.external-config.typesafe-configuration-properties.conversion.periods]]
1080-
===== Converting periods
1080+
===== Converting Periods
10811081
In addition to durations, Spring Boot can also work with `java.time.Period` type.
10821082
The following formats can be used in application properties:
10831083

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/kotlin.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[features.kotlin]]
2-
== Kotlin support
2+
== Kotlin Support
33
https://kotlinlang.org[Kotlin] is a statically-typed language targeting the JVM (and other platforms) which allows writing concise and elegant code while providing {kotlin-docs}java-interop.html[interoperability] with existing libraries written in Java.
44

55
Spring Boot provides Kotlin support by leveraging the support in other Spring projects such as Spring Framework, Spring Data, and Reactor.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ include::code:MyApplicationArgumentTests[]
162162

163163

164164
[[features.testing.spring-boot-applications.with-mock-environment]]
165-
==== Testing with a mock environment
165+
==== Testing With a Mock Environment
166166
By default, `@SpringBootTest` does not start the server but instead sets up a mock environment for testing web endpoints.
167167

168168
With Spring MVC, we can query our web endpoints using {spring-framework-docs}/testing.html#spring-mvc-test-framework[`MockMvc`] or `WebTestClient`, as shown in the following example:
@@ -188,7 +188,7 @@ If you need to test these lower-level concerns, you can start a fully running se
188188

189189

190190
[[features.testing.spring-boot-applications.with-running-server]]
191-
==== Testing with a running server
191+
==== Testing With a Running Server
192192
If you need to start a full running server, we recommend that you use random ports.
193193
If you use `@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)`, an available port is picked at random each time your test runs.
194194

@@ -715,7 +715,7 @@ It can also be used to configure the host, scheme, and port that appears in any
715715

716716

717717
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-mock-mvc]]
718-
===== Auto-configured Spring REST Docs Tests with Mock MVC
718+
===== Auto-configured Spring REST Docs Tests With Mock MVC
719719
`@AutoConfigureRestDocs` customizes the `MockMvc` bean to use Spring REST Docs when testing servlet-based web applications.
720720
You can inject it by using `@Autowired` and use it in your tests as you normally would when using Mock MVC and Spring REST Docs, as shown in the following example:
721721

@@ -734,7 +734,7 @@ include::code:MyResultHandlerConfiguration[]
734734

735735

736736
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-web-test-client]]
737-
===== Auto-configured Spring REST Docs Tests with WebTestClient
737+
===== Auto-configured Spring REST Docs Tests With WebTestClient
738738
`@AutoConfigureRestDocs` can also be used with `WebTestClient` when testing reactive web applications.
739739
You can inject it by using `@Autowired` and use it in your tests as you normally would when using `@WebFluxTest` and Spring REST Docs, as shown in the following example:
740740

@@ -752,7 +752,7 @@ include::code:MyWebTestClientBuilderCustomizerConfiguration[]
752752

753753

754754
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-rest-assured]]
755-
===== Auto-configured Spring REST Docs Tests with REST Assured
755+
===== Auto-configured Spring REST Docs Tests With REST Assured
756756
`@AutoConfigureRestDocs` makes a `RequestSpecification` bean, preconfigured to use Spring REST Docs, available to your tests.
757757
You can inject it by using `@Autowired` and use it in your tests as you normally would when using REST Assured and Spring REST Docs, as shown in the following example:
758758

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ See {spring-boot-autoconfigure-module-code}/batch/BatchAutoConfiguration.java[Ba
3030

3131

3232
[[howto.batch.running-from-the-command-line]]
33-
=== Running from the Command Line
33+
=== Running From the Command Line
3434
Spring Boot converts any command line argument starting with `--` to a property to add to the `Environment`, see <<features#features.external-config.command-line-args,accessing command line properties>>.
3535
This should not be used to pass arguments to batch jobs.
3636
To specify batch arguments on the command line, use the regular format (that is without `--`), as shown in the following example:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ See {spring-boot-maven-plugin-docs}#run-example-debug[this example] for more det
257257

258258

259259
[[howto.build.build-an-executable-archive-with-ant-without-using-spring-boot-antlib]]
260-
=== Build an Executable Archive from Ant without Using spring-boot-antlib
260+
=== Build an Executable Archive From Ant without Using spring-boot-antlib
261261
To build with Ant, you need to grab dependencies, compile, and then create a jar or war archive.
262262
To make it executable, you can either use the `spring-boot-antlib` module or you can follow these instructions:
263263

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ The details of the `h2` support depend on the chosen web server and the applicat
228228

229229

230230
[[howto.webserver.configure-http2.tomcat]]
231-
==== HTTP/2 with Tomcat
231+
==== HTTP/2 With Tomcat
232232
Spring Boot ships by default with Tomcat 9.0.x which supports `h2c` out of the box and `h2` out of the box when using JDK 9 or later.
233233
Alternatively, `h2` can be used on JDK 8 if the `libtcnative` library and its dependencies are installed on the host operating system.
234234

@@ -248,7 +248,7 @@ This error is not fatal, and the application still starts with HTTP/1.1 SSL supp
248248

249249

250250
[[howto.webserver.configure-http2.jetty]]
251-
==== HTTP/2 with Jetty
251+
==== HTTP/2 With Jetty
252252
For HTTP/2 support, Jetty requires the additional `org.eclipse.jetty.http2:http2-server` dependency.
253253
To use `h2c` no other dependencies are required.
254254
To use `h2`, you also need to choose one of the following dependencies, depending on your deployment:
@@ -260,7 +260,7 @@ To use `h2`, you also need to choose one of the following dependencies, dependin
260260

261261

262262
[[howto.webserver.configure-http2.netty]]
263-
==== HTTP/2 with Reactor Netty
263+
==== HTTP/2 With Reactor Netty
264264
The `spring-boot-webflux-starter` is using by default Reactor Netty as a server.
265265
Reactor Netty supports `h2c` using JDK 8 or later with no additional dependencies.
266266
Reactor Netty supports `h2` using the JDK support with JDK 9 or later.
@@ -273,7 +273,7 @@ Developers can choose to import only the required dependencies using a classifie
273273

274274

275275
[[howto.webserver.configure-http2.undertow]]
276-
==== HTTP/2 with Undertow
276+
==== HTTP/2 With Undertow
277277
As of Undertow 1.4.0+, both `h2` and `h2c` are supported on JDK 8 without any additional dependencies.
278278

279279

spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/jta.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[io.jta]]
2-
== Distributed Transactions with JTA
2+
== Distributed Transactions With JTA
33
Spring Boot supports distributed JTA transactions across multiple XA resources by using an https://www.atomikos.com/[Atomikos] embedded transaction manager.
44
JTA transactions are also supported when deploying to a suitable Java EE Application Server.
55

spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/amqp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Spring Boot offers several conveniences for working with AMQP through RabbitMQ,
77

88

99
[[messaging.amqp.rabbitmq]]
10-
=== RabbitMQ support
10+
=== RabbitMQ Support
1111
https://www.rabbitmq.com/[RabbitMQ] is a lightweight, reliable, scalable, and portable message broker based on the AMQP protocol.
1212
Spring uses `RabbitMQ` to communicate through the AMQP protocol.
1313

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[upgrading.from-1x]]
2-
== Upgrading from 1.x
2+
== Upgrading From 1.x
33

44
If you are upgrading from the `1.x` release of Spring Boot, check the {github-wiki}/Spring-Boot-2.0-Migration-Guide["`migration guide`" on the project wiki] that provides detailed upgrade instructions.
55
Check also the {github-wiki}["`release notes`"] for a list of "`new and noteworthy`" features for each release.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/upgrading/to-feature.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[upgrading.to-feature]]
2-
== Upgrading to a new feature release
2+
== Upgrading to a New Feature Release
33

44
When upgrading to a new feature release, some properties may have been renamed or removed.
55
Spring Boot provides a way to analyze your application's environment and print diagnostics at startup, but also temporarily migrate properties at runtime for you.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/using/devtools.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ These work by rewriting classes as they are loaded to make them more amenable to
130130

131131

132132
[[using.devtools.restart.logging-condition-delta]]
133-
==== Logging changes in condition evaluation
133+
==== Logging Changes in Condition Evaluation
134134
By default, each time your application restarts, a report showing the condition evaluation delta is logged.
135135
The report shows the changes to your application's auto-configuration as you make changes such as adding or removing beans and setting configuration properties.
136136

spring-boot-project/spring-boot-docs/src/docs/asciidoc/using/running-your-application.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you choose to package your application as a war file, see your server and IDE
1010

1111

1212
[[using.running-your-application.from-an-ide]]
13-
=== Running from an IDE
13+
=== Running From an IDE
1414
You can run a Spring Boot application from your IDE as a Java application.
1515
However, you first need to import your project.
1616
Import steps vary depending on your IDE and build system.

0 commit comments

Comments
 (0)