Commit Graph

2535 Commits

Author SHA1 Message Date
Madhura Bhave 84f1a6ca09 Merge branch '2.5.x' into 2.6.x
Closes gh-29138
2021-12-20 09:21:08 -08:00
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux
Closes gh-28955
2021-12-20 09:19:34 -08:00
Stephane Nicoll 53654a0160 Merge branch '2.5.x' into 2.6.x
Closes gh-29133
2021-12-20 12:37:10 +01:00
Pavel Anisimov b704ee0b30 Polish reference doc
See gh-29115
2021-12-20 12:36:33 +01:00
Stephane Nicoll bcaa59ce73 Merge branch '2.5.x' into 2.6.x
Closes gh-29098
2021-12-17 10:50:07 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc
See gh-29094
2021-12-17 10:48:55 +01:00
Stephane Nicoll 5599e8d340 Polish "Add consistent quotes in YAML samples of reference doc"
See gh-28911
2021-12-09 15:02:47 +01:00
Viktor Ardelean 0b781d87b1 Add consistent quotes in YAML samples of reference doc
See gh-28911
2021-12-09 15:02:23 +01:00
izeye c7921468fc Polish
See gh-28836
2021-11-29 09:38:07 +01:00
Stephane Nicoll e4082ee5d9 Merge branch '2.5.x'
Closes gh-28834
2021-11-28 11:18:57 +01:00
fml2 1d786e49e9 Fix typos in the "External Application Properties" section
See gh-28830
2021-11-28 11:17:22 +01:00
Stephane Nicoll 9719930496 Merge branch '2.5.x'
Closes gh-28833
2021-11-28 11:14:52 +01:00
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation
See gh-28831
2021-11-28 11:14:14 +01:00
Andy Wilkinson 4a0fa62d2e Polish "Replace "you're""
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant e629e77b29 Replace "you're"
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.

Also checked for words that end with "'ll" and "n't" but did not find
any.

See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
2021-11-18 11:59:48 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Leo Li 508841b444 Replace "e.g." by "for example"
See gh-28583
2021-11-09 19:50:11 +01:00
Jay Bryant 3422b1f38b Replace "refer to" with "see"
Update documentation to replace "refer to" with "see" and to drop
"please" when it is present.

See gh-28537
2021-11-08 14:40:57 -08:00
Jay Bryant 9f2c8f65ee Replace "check out" with more formal language
Update documentation to use more formal language rather than
"check out".

See gh-28503
2021-11-08 14:36:32 -08:00
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation"
See gh-28497
2021-11-08 13:27:24 -08:00
Jay Bryant 0d025b672e Remove 'etc' in reference documentation
Update the reference documentation to replace 'etc' with 'other'.

See gh-28497
2021-11-08 13:24:33 -08:00
Leo Li 73e9c355f1 Polish
See gh-28501
2021-11-02 09:05:44 +01:00
Stephane Nicoll 7ad60df844 Merge branch '2.5.x' 2021-11-02 09:05:11 +01:00
Stephane Nicoll 06e9991e6a Polish
See gh-28501
2021-11-02 09:04:32 +01:00
Andy Wilkinson 4a15a816ce Polish 'Replace "via" with words more suited to an international audience'
See gh-28464
2021-10-28 19:22:11 +01:00
Jay Bryant 73a18c73f4 Replace "via" with words more suited to an international audience
See gh-28464
2021-10-28 17:54:14 +01:00
Stephane Nicoll ea8a8ecd0e Merge branch '2.5.x'
Closes gh-28467
2021-10-28 11:53:34 +02:00
Stephane Nicoll ce38d592f9 Merge branch '2.4.x' into 2.5.x
Closes gh-28466
2021-10-28 11:53:19 +02:00
Stephane Nicoll 265199f42b Polish "Fix description of "logging.logback.rollingpolicy.max-history""
See gh-28448
2021-10-28 11:50:38 +02:00
Phillip Webb 9cb5f035e7 Fix typo
See gh-20971
2021-10-23 08:29:51 -07:00
Andy Wilkinson 1005159eab Merge branch '2.5.x'
Closes gh-28435
2021-10-22 12:30:47 +01:00
Andy Wilkinson 3fb5af9dd3 Merge branch '2.4.x' into 2.5.x
Closes gh-28434
2021-10-22 12:29:14 +01:00
Andy Wilkinson 8a78864edd Polish "Explain how to disable/configure the ActiveMQ embedded broker"
See gh-28183
2021-10-22 12:27:50 +01:00
Moritz Kammerer 0c5f0efcea Explain how to disable/configure the ActiveMQ embedded broker
See gh-28183
2021-10-22 12:27:37 +01:00
Andy Wilkinson d52b649bd7 Fix links to Spring Security's reference documentation
Closes gh-28407
2021-10-21 19:11:52 +01:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-10-20 22:58:31 -07:00
Phillip Webb 3729c4909a Polish package name for web sample code
See gh-27132
2021-10-20 21:31:41 -07:00
Andy Wilkinson 56b8494f15 Disable the env info contributor by default
Closes gh-28311
2021-10-20 12:42:17 +01:00
Andy Wilkinson f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
2021-10-20 12:18:54 +01:00
Andy Wilkinson 356554311f Merge branch '2.5.x'
Closes gh-28381
2021-10-19 17:17:29 +01:00
Artem Bilan 344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson 89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
2021-10-19 10:01:30 +01:00
Madhura Bhave a86a84e00b Merge branch '2.5.x' into main
Closes gh-28202
2021-10-05 15:46:26 -07:00
Madhura Bhave 9f4cf8398b Merge branch '2.4.x' into 2.5.x
Closes gh-28201
2021-10-05 15:46:04 -07:00
Madhura Bhave 61736e9958 Polish " Update configtree docs about dot notation being correctly mapped"
See gh-28170
2021-10-05 15:43:20 -07:00
deb-von-seggern 8f91fc450d Update configtree docs about dot notation being correctly mapped
See gh-28170
2021-10-05 15:14:02 -07:00
Stephane Nicoll 5d17257a52 Polish "Add Java InfoContributor"
See gh-28136
2021-10-05 15:11:58 +02:00
Stephane Nicoll 1008b754d7 Merge branch '2.5.x'
Closes gh-28194
2021-10-05 08:36:28 +02:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x
Closes gh-28193
2021-10-05 08:35:24 +02:00
Pratik Gupta a3423f1edf Fix log4j2 file name reference in reference doc
See gh-28189
2021-10-05 08:32:59 +02:00
Stephane Nicoll 1b7536fda4 Merge branch '2.5.x'
Closes gh-28160
2021-10-01 08:14:03 +02:00
Stephane Nicoll 1c139b1d23 Merge branch '2.4.x' into 2.5.x
Closes gh-28159
2021-10-01 08:13:49 +02:00
Stephane Nicoll bedd749e1c Polish "Clarify use of @AutoConfigureTestEntityManager"
See gh-28086
2021-10-01 08:12:01 +02:00
Leo Li 70f64f2c26 Clarify use of @AutoConfigureTestEntityManager
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.

See gh-28086
2021-10-01 07:55:57 +02:00
Stephane Nicoll 9e1ef76f84 Polish "Replace latin locutions in the documentation"
See gh-28141
2021-10-01 07:38:41 +02:00
Vincent Ricard 873bca36c4 Replace latin locutions in the documentation
See gh-28141
2021-10-01 07:33:01 +02:00
Andy Wilkinson ea68672594 Merge branch '2.5.x'
Closes gh-28153
2021-09-30 17:06:09 +01:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
Stephane Nicoll 2d34cff902 Polish "Improve Dynatrace examples description in reference guide"
See gh-27502
2021-09-30 10:08:15 +02:00
Georg Pirklbauer c236532607 Improve Dynatrace examples description in reference guide
See gh-27502
2021-09-30 09:59:44 +02:00
Artem Bilan b2d1423e34 Add Spring Integration default poller auto-config
When polling consumers or source polling channel adapters are used in
Spring Integration applications, they require some polling policy to
be configured.

This comment auto-configures a PollerMetadata bean which customized
via newly added `spring.integration.poller.*` configuration
properties or overriden completely be user-defined bean.

See gh-27992
2021-09-23 16:20:13 -07:00
Stephane Nicoll 842f3f0bd5 Merge branch '2.5.x'
Closes gh-28099
2021-09-22 09:14:09 +02:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Phillip Webb bc6b9be7cd Merge branch '2.5.x'
Closes gh-28084
2021-09-21 15:54:54 -07:00
Phillip Webb 8c3db23be3 Merge branch '2.4.x' into 2.5.x
Closes gh-28083
2021-09-21 15:53:37 -07:00
cdalexndr 798b282e58 Document that devtools restart doesn't work with AspectJ weaving
See gh-28071
2021-09-21 15:51:36 -07:00
Phillip Webb 61a84a4722 Polish asciidoctor links
Update `<<..>>` links to include the page.
2021-09-21 15:44:53 -07:00
dreis2211 3e831fe286 Fix link in caching docs
See gh-28078
2021-09-21 15:32:06 -07:00
Phillip Webb 667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Stephane Nicoll 124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration"
See gh-28028
2021-09-21 08:34:44 +02:00
dreis2211 cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Stephane Nicoll eab8f41152 Polish "Remove english contractions from the documentation"
See gh-28064
2021-09-21 08:04:48 +02:00
Vincent Ricard 52176b8ed6 Remove english contractions from the documentation
See gh-28064
2021-09-21 08:00:48 +02:00
Stephane Nicoll 3ef17820e9 Polish 2021-09-21 07:59:33 +02:00
Madhura Bhave ac00df79f1 Add what's next to new sections
This commit also moves hazelcast from core features to IO

Closes gh-27132
2021-09-20 16:15:08 -07:00
Madhura Bhave 7e257dc24c Rename packages for code samples to match sections
See gh-27132
2021-09-20 16:15:08 -07:00
Andy Wilkinson e2a355f003 Consolidate Elasticsearch configuration properties
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
2021-09-20 14:37:44 +01:00
Stephane Nicoll 7957d97528 Polish 2021-09-16 14:12:23 +02:00
Stephane Nicoll c62a6819fe Polish "Add startup time metrics"
See gh-27878
2021-09-16 13:33:08 +02:00
Andy Wilkinson 32cfde074f Merge branch '2.5.x' 2021-09-16 12:11:42 +01:00
Andy Wilkinson 9df099e343 Polish 2021-09-16 12:11:34 +01:00
Stephane Nicoll e1b1a25021 Polish "Auto-configure Micrometer's Lettuce latency metrics"
See gh-27865
2021-09-14 09:33:48 +02:00
Antonin ARQUEY 190fea6faa Auto-configure Micrometer's Lettuce latency metrics
Add auto-configuration support to export Lettuce latency metrics.

See gh-27865
2021-09-14 09:19:42 +02:00
Stephane Nicoll c4823f80cd Polish "Fix some typos in docs"
See gh-27968
2021-09-14 09:18:04 +02:00
Dmitriy Bogdanov 2ad3428039 Fix some typos in docs
See gh-27968
2021-09-14 09:16:13 +02:00
Stephane Nicoll 43a19c16a8 Merge branch '2.5.x'
Closes gh-27944
2021-09-12 09:02:50 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
2021-09-12 09:02:35 +02:00