270 Commits

Author SHA1 Message Date
Scott Frederick
3d65be0e1c Merge branch '3.0.x'
Closes gh-34660
2023-03-20 18:39:26 -05:00
Scott Frederick
86a1cfff6f Merge branch '2.7.x' into 3.0.x
Closes gh-34659
2023-03-20 18:39:11 -05:00
Scott Frederick
6dc0f90e00 Polish "Disable embedded web auto-config when not using embedded web server"
See gh-34332
2023-03-20 18:38:04 -05:00
Guirong Hu
b2facecb12 Disable embedded web auto-config when not using embedded web server
See gh-34332
2023-03-20 18:14:58 -05:00
Andy Wilkinson
d51a042cb2 Merge branch '3.0.x'
Closes gh-34603
2023-03-14 14:52:57 +00:00
Andy Wilkinson
7f807dccb7 Merge branch '2.7.x' into 3.0.x
Closes gh-34602
2023-03-14 14:52:27 +00:00
1993heqiang
e447c49f3b Update two references to old APIs in the docs
See gh-34567
2023-03-14 14:48:19 +00:00
Moritz Halbritter
e821085752 Merge branch '3.0.x'
Closes gh-34415
2023-03-01 12:41:24 +01:00
Moritz Halbritter
e407515a0f Merge branch '2.7.x' into 3.0.x
Closes gh-34414
2023-03-01 12:41:13 +01:00
Jongwoo Han
8e166595c0 Fix typo in external-config.adoc
See gh-34386
2023-03-01 12:40:21 +01:00
Andy Wilkinson
b9aae4c808 Merge branch '3.0.x'
Closes gh-34193
2023-02-14 21:20:35 +00:00
Andy Wilkinson
3e618fe70b Merge branch '2.7.x' into 3.0.x
Closes gh-34192
2023-02-14 21:20:23 +00:00
Andy Wilkinson
710559297e Polish "Fix bean name by adding sample class with prefix"
See gh-34029
2023-02-14 21:19:41 +00:00
Raina Banerjee
0a3007133b Fix bean name by adding sample class with prefix
See gh-34029
2023-02-14 21:18:04 +00:00
Yubao Liu
6ba5329a79 Allow different log level for FILE and CONSOLE appender
- java.util.logging isn't supported yet

See gh-32076
2023-01-31 14:31:51 +01:00
Moritz Halbritter
94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter
e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2023-01-18 16:56:42 +01:00
Moritz Halbritter
4735a0fb7e Merge branch '2.7.x'
Closes gh-33869
2023-01-18 10:24:13 +01:00
zhangyanyue
1eb394f958 Fix typo in kotlin getting started documentation
See gh-33867
2023-01-18 10:23:24 +01:00
Moritz Halbritter
5a97c1493e Update Java 11 to Java 17 in documentation 2023-01-09 15:24:16 +01:00
Moritz Halbritter
7922ac63bc Polish documentation 2023-01-09 15:23:27 +01:00
Moritz Halbritter
1e70822adb Fix javax with jakarta references in documentation 2023-01-09 12:46:02 +01:00
Moritz Halbritter
6a6ecad325 Merge branch '2.7.x'
Closes gh-33728
2023-01-09 12:13:36 +01:00
Joseph Lane
54754d2c7a Fix typo in External Configuration documentation
See gh-33630
2023-01-09 12:12:50 +01:00
Moritz Halbritter
f11de0c4cf Merge branch '2.7.x'
Closes gh-33726
2023-01-09 10:39:14 +01:00
Bart
aa8a531731 Fix a type in the ExitCodeGenerator documentation
See gh-33658
2023-01-09 10:38:32 +01:00
Daniel Oh
f1edd17a42 Fix a typo in docs
See gh-33453
2022-12-05 11:16:37 +01:00
Johnny Lim
78b43279a7 Polish
See gh-33455
2022-12-05 11:14:38 +01:00
Brian Clozel
d48ab37505 Reinstate GraphQL testing documentation
Closes gh-33407
2022-11-29 14:15:36 +01:00
Moritz Halbritter
012e13527a Fix typo in documentation 2022-11-28 13:39:24 +01:00
Andy Wilkinson
421f2fac67 Fail fast when constructor bound and not compiled with -parameters
Closes gh-33182
2022-11-16 21:00:55 +00:00
Johnny Lim
6027508cf7 Polish
See gh-33108
2022-11-16 10:00:36 +01:00
Johnny Lim
ea4f22684d Polish Log4j2 changes
See gh-32742
2022-11-08 13:27:01 +00:00
Phillip Webb
0219b222c2 Merge branch '2.7.x' 2022-10-19 22:03:18 -07:00
Phillip Webb
d3750c4991 Merge branch '2.6.x' into 2.7.x 2022-10-19 22:01:13 -07:00
Phillip Webb
c416c17fe8 Polish documentation title case 2022-10-19 21:53:21 -07:00
Phillip Webb
8dadf86f93 Merge branch '2.7.x'
Closes gh-32778
2022-10-18 17:15:03 -07:00
Phillip Webb
fcaac2b343 Merge branch '2.6.x' into 2.7.x
Closes gh-32777
2022-10-18 17:14:48 -07:00
Guirong Hu
33e379c4a2 Use exclamation character for the document separator prefix
See gh-32521
2022-10-18 17:07:51 -07:00
Phillip Webb
76ef540716 Merge branch '2.7.x' 2022-10-15 14:19:18 -07:00
Phillip Webb
0f4a978731 Merge branch '2.6.x' into 2.7.x 2022-10-15 14:19:06 -07:00
Phillip Webb
6641a98913 Improve the phrasing around property source ordering 2022-10-15 14:18:49 -07:00
Phillip Webb
029aab6b58 Document Log4j2 extensions
See gh-32578
2022-10-14 10:14:43 -07:00
Scott Frederick
f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d442771704fba268f33fbc90aaaf1aa.
2022-09-21 14:50:15 -05:00
Phillip Webb
7f5785182d Switch @SpringBootTest to UseMainMethod.NEVER by default
See gh-22405
2022-09-15 12:37:26 -07:00
Phillip Webb
48f3cd75d4 Refine SpringBootTest.useMainMethod support
Refine `SpringBootContextLoader` so that calls to the main method do
not exit early and the hook is only used when necessary.

See gh-22405
2022-09-15 10:48:58 -07:00
Phillip Webb
41e0bbf4bb Add SpringBootTest.useMainMethod support
Add a new `useMainMethod` attribute to `SpringBootTest` which can be
used to determine how the test should run. The three available options
are:

	- `ALWAYS`
	- `NEVER`
	- `WHEN_AVAILABLE`

The default is `WHEN_AVAILABLE` which will attempt to launch the test
using the `main` method if there is one.

The `SpringBootContextLoader` has been updated to use the new
`SpringApplicationHook` interface when the main method is being used.

Closes gh-22405
2022-09-14 22:37:37 -07:00
Stephane Nicoll
ebef52b207 Merge branch '2.7.x'
Closes gh-32292
2022-09-10 09:13:53 +02:00
Stephane Nicoll
04a668fd07 Merge branch '2.6.x' into 2.7.x
Closes gh-32291
2022-09-10 09:13:40 +02:00
Oliver B. Fischer
6e4e76597a Make the path of the config directory better understandable
Currently, the documentation relates to the subdirectory for external
configurations as `/config`. Read as UNIX path, the leading slash
could be read as reference to the root directory `/`.

This commit updates the documentation to use 'config/' instead.

See gh-32224
2022-09-10 09:09:43 +02:00