Phillip Webb
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
Phillip Webb
a2ac38e203
Update copyright year of changed files
2023-01-09 15:46:07 -08:00
Krzysztof Krason
cf6493f65c
Simplify AssertJ assertions and also make them more readable
...
See gh-33653
2023-01-09 11:10:20 +01:00
Phillip Webb
f588793445
Update copyright year of changed files
2022-12-22 01:00:42 -08:00
Moritz Halbritter
725337f976
Make fields final
...
Closes gh-33537
2022-12-16 14:28:44 +01:00
weixsun
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
izeye
09f4d4b9bf
Polish
...
See gh-25617
2021-03-13 18:08:54 +01:00
Stephane Nicoll
6ebc69d704
Polish "Include properties in source merge algorithm"
...
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart
cf4bc6e9e0
Include properties in source merge algorithm
...
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.
See gh-25507
2021-03-05 15:47:09 +01:00
Phillip Webb
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Andy Wilkinson
66f1344f7c
Merge branch '2.1.x'
...
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Andy Wilkinson
91786bc712
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d
Merge branch '1.5.x' into 2.0.x
2019-06-27 11:39:02 +01:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Phillip Webb
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
Phillip Webb
5fba43aa31
Merge branch '1.5.x' into 2.0.x
2019-06-04 00:05:57 -07:00
Stephane Nicoll
e99deb95f7
Fix source detection in case of multiple candidates
...
This commit improves the detection of a property source when more than
one group with the same type exist.
Closes gh-16549
2019-04-15 16:17:11 +02:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Phillip Webb
d76bba5e6f
Migrate from ExpectedException rule to AssertJ
...
Replace ExpectedException JUnit rules with AssertJ exception
assertions.
Closes gh-14336
2018-10-02 10:55:28 -07:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Johnny Lim
d441a8a89a
Polish
...
Closes gh-12205
2018-02-24 11:53:25 +01:00
Stephane Nicoll
43bac617d4
Add access to short deprecation reason
...
Closes gh-11770
2018-01-25 12:47:54 +01:00
Phillip Webb
f3379668ac
Polish
2018-01-18 23:21:51 -08:00
Stephane Nicoll
aa748cb0ef
Polish "Use System.lineSeparator()""
...
Closes gh-11665
2018-01-18 16:45:29 +01:00
Johnny Lim
d8c83af987
Use System.lineSeparator()
...
See gh-11665
2018-01-18 16:45:09 +01:00
Johnny Lim
bd0dcfb172
Utilize StandardCharsets
...
Closes gh-10972
2017-11-10 09:49:13 +01:00
Johnny Lim
6168fae720
Remove explicit type arguments
...
See gh-10494
2017-10-24 14:44:20 +01:00
Phillip Webb
748e0779b6
Update copyright year for changed files
2017-10-10 11:56:13 -07:00
Phillip Webb
0ba4830b4f
Relocate projects to spring-boot-project
...
Move projects to better reflect the way that Spring Boot is released.
The following projects are under `spring-boot-project`:
- `spring-boot`
- `spring-boot-autoconfigure`
- `spring-boot-tools`
- `spring-boot-starters`
- `spring-boot-actuator`
- `spring-boot-actuator-autoconfigure`
- `spring-boot-test`
- `spring-boot-test-autoconfigure`
- `spring-boot-devtools`
- `spring-boot-cli`
- `spring-boot-docs`
See gh-9316
2017-10-04 16:34:23 -07:00