fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,329 Commits 22 Branches 339 Tags
Commit Graph

2618 Commits

Author SHA1 Message Date
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