Skip to content

Commit b563524

Browse files
committed
Merge branch '3.3.x'
2 parents 5f9a13b + e645f4e commit b563524

File tree

21 files changed

+52
-53
lines changed

21 files changed

+52
-53
lines changed

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,16 @@ private void addArtifactAttributes(Map<String, String> attributes) {
203203

204204
private void addUrlJava(Map<String, String> attributes) {
205205
attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api/");
206-
attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}");
207-
attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}");
208-
attributes.put("javadoc-location-java-net", "{url-javase-javadoc}");
209-
attributes.put("javadoc-location-java-io", "{url-javase-javadoc}");
210-
attributes.put("javadoc-location-java-time", "{url-javase-javadoc}");
211-
attributes.put("javadoc-location-java-util", "{url-javase-javadoc}");
212-
attributes.put("javadoc-location-javax-management", "{url-javase-javadoc}");
213-
attributes.put("javadoc-location-javax-net", "{url-javase-javadoc}");
214-
attributes.put("javadoc-location-javax-sql", "{url-javase-javadoc}");
215-
attributes.put("javadoc-location-javax-xml", "{url-javase-javadoc}");
206+
attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}/java.desktop");
207+
attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}/java.base");
208+
attributes.put("javadoc-location-java-net", "{url-javase-javadoc}/java.base");
209+
attributes.put("javadoc-location-java-io", "{url-javase-javadoc}/java.base");
210+
attributes.put("javadoc-location-java-time", "{url-javase-javadoc}/java.base");
211+
attributes.put("javadoc-location-java-util", "{url-javase-javadoc}/java.base");
212+
attributes.put("javadoc-location-javax-management", "{url-javase-javadoc}/java.management");
213+
attributes.put("javadoc-location-javax-net", "{url-javase-javadoc}/java.base");
214+
attributes.put("javadoc-location-javax-sql", "{url-javase-javadoc}/java.sql");
215+
attributes.put("javadoc-location-javax-xml", "{url-javase-javadoc}/java.xml");
216216
}
217217

218218
private void addUrlLibraryLinkAttributes(Map<String, String> attributes) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ bom {
10221022
}
10231023
links {
10241024
site("https://www.jooq.org")
1025+
javadoc("https://www.jooq.org/javadoc/{version}", "org.jooq")
10251026
docs("https://www.jooq.org/doc/{version}/manual-single-page")
10261027
releaseNotes("https://github.com/jOOQ/jOOQ/releases/tag/version-{version}")
10271028
}
@@ -1582,6 +1583,7 @@ bom {
15821583
}
15831584
links {
15841585
site("https://netty.io")
1586+
javadoc(version -> "https://netty.io/%s.%s/api".formatted(version.major(), version.minor()), "io.netty")
15851587
}
15861588
}
15871589
library("OpenTelemetry", "1.43.0") {

spring-boot-project/spring-boot-docs/src/docs/antora/modules/build-tool-plugin/pages/other-build-systems.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Various settings can also be configured on the repackager before it is run.
2525
When repackaging an archive, you can include references to dependency files by using the `org.springframework.boot.loader.tools.Libraries` interface.
2626
We do not provide any concrete implementations of `Libraries` here as they are usually build-system-specific.
2727

28-
If your archive already includes libraries, you can use `Libraries.NONE`.
28+
If your archive already includes libraries, you can use javadoc:org.springframework.boot.loader.tools.Libraries#NONE[].
2929

3030

3131

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/application.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ When reading the code, remember the following rules of thumb:
6060
[[howto.application.customize-the-environment-or-application-context]]
6161
== Customize the Environment or ApplicationContext Before It Starts
6262

63-
A `SpringApplication` has `ApplicationListeners` and `ApplicationContextInitializers` that are used to apply customizations to the context or environment.
63+
A `SpringApplication` has `ApplicationListener` and `ApplicationContextInitializer` implementations that are used to apply customizations to the context or environment.
6464
Spring Boot loads a number of such customizations for use internally from `META-INF/spring.factories`.
6565
There is more than one way to register additional customizations:
6666

@@ -97,7 +97,7 @@ This is too late to configure certain properties such as `+logging.*+` and `+spr
9797
[[howto.application.context-hierarchy]]
9898
== Build an ApplicationContext Hierarchy (Adding a Parent or Root Context)
9999

100-
You can use the `ApplicationBuilder` class to create parent/child `ApplicationContext` hierarchies.
100+
You can use the `SpringApplicationBuilder` class to create parent/child `ApplicationContext` hierarchies.
101101
See xref:reference:features/spring-application.adoc#features.spring-application.fluent-builder-api[] in the "`Spring Boot Features`" section for more information.
102102

103103

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ server:
441441
filename: "/var/log/jetty-access.log"
442442
----
443443

444-
By default, logs are redirected to `System.err`.
444+
By default, logs are redirected to javadoc:java.lang.System#err[].
445445
For more details, see the Jetty documentation.
446446

447447

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,11 @@ You can configure the roles by using the configprop:management.endpoint.health.r
581581
NOTE: If you have secured your application and wish to use `always`, your security configuration must permit access to the health endpoint for both authenticated and unauthenticated users.
582582

583583
Health information is collected from the content of a javadoc:org.springframework.boot.actuate.health.HealthContributorRegistry[] (by default, all javadoc:org.springframework.boot.actuate.health.HealthContributor[] instances defined in your `ApplicationContext`).
584-
Spring Boot includes a number of auto-configured `HealthContributors`, and you can also write your own.
584+
Spring Boot includes a number of auto-configured `HealthContributor` beans, and you can also write your own.
585585

586586
A `HealthContributor` can be either a `HealthIndicator` or a `CompositeHealthContributor`.
587587
A `HealthIndicator` provides actual health information, including a `Status`.
588-
A `CompositeHealthContributor` provides a composite of other `HealthContributors`.
588+
A `CompositeHealthContributor` provides a composite of other `HealthContributor` instances.
589589
Taken together, contributors form a tree structure to represent the overall system health.
590590

591591
By default, the final system health is derived by a `StatusAggregator`, which sorts the statuses from each `HealthIndicator` based on an ordered list of statuses.
@@ -599,7 +599,7 @@ TIP: You can use the `HealthContributorRegistry` to register and unregister heal
599599
[[actuator.endpoints.health.auto-configured-health-indicators]]
600600
=== Auto-configured HealthIndicators
601601

602-
When appropriate, Spring Boot auto-configures the `HealthIndicators` listed in the following table.
602+
When appropriate, Spring Boot auto-configures the `HealthIndicator` beans listed in the following table.
603603
You can also enable or disable selected indicators by configuring `management.health.key.enabled`,
604604
with the `key` listed in the following table:
605605

@@ -674,9 +674,7 @@ TIP: The `ssl` `HealthIndicator` has a "warning threshold" property named config
674674
If an SSL certificate will be invalid within the time span defined by this threshold, the `HealthIndicator` will warn you but it will still return HTTP 200 to not disrupt the application.
675675
You can use this threshold to give yourself enough lead time to rotate the soon to be expired certificate.
676676

677-
678-
679-
Additional `HealthIndicators` are available but are not enabled by default:
677+
Additional `HealthIndicators` beans are available but are not enabled by default:
680678

681679
[cols="3,4,6"]
682680
|===
@@ -773,7 +771,7 @@ The following table shows the default status mappings for the built-in statuses:
773771

774772
For reactive applications, such as those that use Spring WebFlux, `ReactiveHealthContributor` provides a non-blocking contract for getting application health.
775773
Similar to a traditional `HealthContributor`, health information is collected from the content of a javadoc:org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry[] (by default, all javadoc:org.springframework.boot.actuate.health.HealthContributor[] and javadoc:org.springframework.boot.actuate.health.ReactiveHealthContributor[] instances defined in your `ApplicationContext`).
776-
Regular `HealthContributors` that do not check against a reactive API are executed on the elastic scheduler.
774+
Regular `HealthContributor` instances that do not check against a reactive API are executed on the elastic scheduler.
777775

778776
TIP: In a reactive application, you should use the `ReactiveHealthContributorRegistry` to register and unregister health indicators at runtime.
779777
If you need to register a regular `HealthContributor`, you should wrap it with `ReactiveHealthContributor#adapt`.
@@ -790,7 +788,7 @@ TIP: To handle the error automatically, consider extending from `AbstractReactiv
790788
[[actuator.endpoints.health.auto-configured-reactive-health-indicators]]
791789
=== Auto-configured ReactiveHealthIndicators
792790

793-
When appropriate, Spring Boot auto-configures the following `ReactiveHealthIndicators`:
791+
When appropriate, Spring Boot auto-configures the following `ReactiveHealthIndicator` beans:
794792

795793
[cols="2,4,6"]
796794
|===

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ To customize the tags when using `WebClient`, provide a `@Bean` that implements
888888
[[actuator.metrics.supported.tomcat]]
889889
=== Tomcat Metrics
890890

891-
Auto-configuration enables the instrumentation of Tomcat only when an `MBeanRegistry` is enabled.
892-
By default, the `MBeanRegistry` is disabled, but you can enable it by setting configprop:server.tomcat.mbeanregistry.enabled[] to `true`.
891+
Auto-configuration enables the instrumentation of Tomcat only when an MBean `org.apache.tomcat.util.modeler.Registry` is enabled.
892+
By default, the MBean registry is disabled, but you can enable it by setting configprop:server.tomcat.mbeanregistry.enabled[] to `true`.
893893

894894
Tomcat metrics are published under the `tomcat.` meter name.
895895

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ Furthermore, you can define a `RestClientOptions` bean to take further control o
372372
{url-spring-data-elasticsearch-site}[Spring Data Elasticsearch] ships `ReactiveElasticsearchClient` for querying Elasticsearch instances in a reactive fashion.
373373
If you have Spring Data Elasticsearch and Reactor on the classpath, Spring Boot will auto-configure and register a `ReactiveElasticsearchClient`.
374374

375-
The `ReactiveElasticsearchclient` uses a transport that depends upon the previously described `RestClient`.
375+
The `ReactiveElasticsearchClient` uses a transport that depends upon the previously described `RestClient`.
376376
Therefore, the properties described previously can be used to configure the `ReactiveElasticsearchClient`.
377377
Furthermore, you can define a `RestClientOptions` bean to take further control of the behavior of the transport.
378378

@@ -409,10 +409,10 @@ You can customize the locations to look for repositories and documents by using
409409

410410
TIP: For complete details of Spring Data Elasticsearch, see the {url-spring-data-elasticsearch-docs}[reference documentation].
411411

412-
Spring Boot supports both classic and reactive Elasticsearch repositories, using the `ElasticsearchRestTemplate` or `ReactiveElasticsearchTemplate` beans.
412+
Spring Boot supports both classic and reactive Elasticsearch repositories, using the `ElasticsearchTemplate` or `ReactiveElasticsearchTemplate` beans.
413413
Most likely those beans are auto-configured by Spring Boot given the required dependencies are present.
414414

415-
If you wish to use your own template for backing the Elasticsearch repositories, you can add your own `ElasticsearchRestTemplate` or `ElasticsearchOperations` `@Bean`, as long as it is named `"elasticsearchTemplate"`.
415+
If you wish to use your own template for backing the Elasticsearch repositories, you can add your own `ElasticsearchTemplate` or `ElasticsearchOperations` `@Bean`, as long as it is named `"elasticsearchTemplate"`.
416416
Same applies to `ReactiveElasticsearchTemplate` and `ReactiveElasticsearchOperations`, with the bean name `"reactiveElasticsearchTemplate"`.
417417

418418
You can choose to disable the repositories support with the following property:

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/data/sql.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ If HikariCP is available, we always choose it.
125125
. Otherwise, if https://commons.apache.org/proper/commons-dbcp/[Commons DBCP2] is available, we use it.
126126
. If none of HikariCP, Tomcat, and DBCP2 are available and if Oracle UCP is available, we use it.
127127

128-
NOTE: If you use the `spring-boot-starter-jdbc` or `spring-boot-starter-data-jpa` starters, you automatically get a dependency to `HikariCP`.
128+
NOTE: If you use the `spring-boot-starter-jdbc` or `spring-boot-starter-data-jpa` starters, you automatically get a dependency to HikariCP.
129129

130130
You can bypass that algorithm completely and specify the connection pool to use by setting the configprop:spring.datasource.type[] property.
131131
This is especially important if you run your application in a Tomcat container, as `tomcat-jdbc` is provided by default.

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/developing-auto-configuration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ TIP: If multiple auto-configurations have to be defined, there is no need to ord
192192

193193
Each test can use the runner to represent a particular use case.
194194
For instance, the sample below invokes a user configuration (`UserConfiguration`) and checks that the auto-configuration backs off properly.
195-
Invoking `run` provides a callback context that can be used with `AssertJ`.
195+
Invoking `run` provides a callback context that can be used with AssertJ.
196196

197197
include-code::MyServiceAutoConfigurationTests[tag=test-user-config]
198198

0 commit comments

Comments
 (0)