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
006cb643ea
Merge branch '2.4.x'
...
Closes gh-25514
2021-03-05 14:16:27 +00:00
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
2021-03-05 14:16:07 +00:00
c62367e8c4
Merge pull request #25375 from cdalexndr
...
* gh-25375:
Polish "Improve documentaion of Mockito test execution listeners"
Improve documentaion of Mockito test execution listeners
Closes gh-25375
2021-03-05 14:15:03 +00:00
22b73f3020
Polish "Improve documentaion of Mockito test execution listeners"
...
See gh-25375
2021-03-05 14:14:36 +00:00
72562e0fd4
Improve documentaion of Mockito test execution listeners
...
See gh-25375
2021-03-05 12:49:18 +00:00
2cffbc90cb
Merge branch '2.4.x'
...
Closes gh-25511
2021-03-05 11:03:41 +00:00
836ad76df1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25510
2021-03-05 11:03:08 +00:00
8b5c345d49
Merge pull request #25486 from cdalexndr
...
* gh-25486:
Polish "Make link to Actuator API docs more prominent"
Make link to Actuator API docs more prominent
Closes gh-25486
2021-03-05 10:59:07 +00:00
92133d47d0
Polish "Make link to Actuator API docs more prominent"
...
See gh-25486
2021-03-05 10:58:47 +00:00
5f4e1b747e
Make link to Actuator API docs more prominent
...
See gh-25486
2021-03-05 10:57:59 +00:00
2b7f23b29d
Merge branch '2.4.x'
...
Closes gh-25509
2021-03-05 10:44:24 +00:00
ac258a95a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25508
2021-03-05 10:39:52 +00:00
1ac9b3fac2
Merge pull request #25505 from trungPa
...
* gh-25505:
Polish "Prevent extracting zip entries outside of destination path"
Prevent extracting zip entries outside of destination path
Closes gh-25505
2021-03-05 10:38:19 +00:00
c6ca7a53ab
Polish "Prevent extracting zip entries outside of destination path"
...
See gh-25505
2021-03-05 10:13:32 +00:00
2993e68715
Prevent extracting zip entries outside of destination path
...
See gh-25505
2021-03-05 10:12:06 +00:00
76d0a7f8ba
Merge branch '2.4.x'
...
Closes gh-25506
2021-03-05 10:03:42 +01:00
2682b3803a
Merge pull request #25499 from dreis2211
...
* pr/25499:
Fix some assertions
Closes gh-25499
2021-03-05 10:01:48 +01:00
89a44f3da4
Fix some assertions
...
See gh-25499
2021-03-05 09:56:55 +01:00
37dcb90876
Merge branch '2.4.x'
...
Closes gh-25502
2021-03-04 14:48:11 -08:00
ae630e03ce
Warn against using multi-document files with TestPropertySource
...
Closes gh-24945
2021-03-04 14:46:59 -08:00
e1904fb72f
Merge branch '2.4.x'
...
Closes gh-25500
2021-03-04 13:04:18 -08:00
cfac223cff
Document configtree support for Docker secrets
...
Closes gh-25095
2021-03-04 13:02:28 -08:00
961a34a5ee
Merge branch '2.4.x'
...
Closes gh-25497
2021-03-04 19:15:03 +00:00
52350473d1
Merge pull request #25171 from dreis2211
...
* gh-25171:
Polish "Allow the project to be built with Java 16"
Allow the project to be built with Java 16
Closes gh-25171
2021-03-04 18:56:25 +00:00
1ce6e796fe
Polish "Allow the project to be built with Java 16"
...
See gh-25171
2021-03-04 18:54:58 +00:00
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
2021-03-04 18:54:56 +00:00
9fd6a1e56a
Merge branch '2.4.x'
...
Closes gh-25495
2021-03-04 09:46:26 -08:00
181d0ee932
Merge default property sources
...
Fixes gh-25408
2021-03-04 09:46:00 -08:00
96ede9b975
Merge branch '2.4.x'
...
Closes gh-25491
2021-03-04 13:03:41 +00:00
ca414733f3
Reinstate support for placeholders in @EntityScan
...
Fixes gh-25436
2021-03-04 12:21:27 +00:00
3b235e4960
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 17:56:42 +00:00
f85c7c9ef1
Merge branch '2.3.x' into 2.4.x
...
See gh-25481
2021-03-03 17:56:16 +00:00
da3920bd46
Wait for process to exit to avoid race with file deletion
...
See gh-25457
2021-03-03 17:55:37 +00:00
4a74521174
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 16:43:53 +00:00
fefd49cce7
Merge branch '2.3.x' into 2.4.x
...
See gh-25481
2021-03-03 16:43:18 +00:00
c5cfb8750b
Delete files after destroying processes that may be accessing them
...
Closes gh-25457
2021-03-03 16:42:49 +00:00
e58353a32d
Merge branch '2.4.x'
...
Closes gh-25484
2021-03-03 15:16:58 +01:00
e5d8b6029b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25483
2021-03-03 15:16:08 +01:00
8e67ae7113
Fix fallback fork value for spring-boot:stop
...
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.
Closes gh-25472
2021-03-03 15:15:04 +01:00
59d8c97634
Merge branch '2.4.x'
...
Closes gh-25482
2021-03-03 13:46:58 +00:00
e984f0ca31
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25481
2021-03-03 13:46:39 +00:00
14948cb12e
Merge pull request #25457 from dreis2211
...
* gh-25457:
Speed up spring-boot-server-tests
Closes gh-25457
2021-03-03 13:46:20 +00:00
b0a6e92fb6
Speed up spring-boot-server-tests
...
See gh-25457
2021-03-03 13:34:41 +00:00
434db48969
Merge branch '2.4.x'
...
Closes gh-25469
2021-03-01 16:01:12 -06:00
afb60d6161
Add tests for Gradle examples used in plugin docs
...
Fixes gh-25468
2021-03-01 15:22:15 -06:00
9db78022bd
Merge branch '2.4.x'
...
Closes gh-25464
2021-03-01 10:45:16 +01:00
f2f51062d6
Merge pull request #25300 from robert-smith-911
...
* pr/25300:
Polish "Document precedence between properties and yaml"
Document precedence between properties and yaml
Closes gh-25300
2021-03-01 10:45:02 +01:00
63cca9b8c6
Polish "Document precedence between properties and yaml"
...
See gh-25300
2021-03-01 10:44:43 +01:00
20ed8c2ec3
Document precedence between properties and yaml
...
See gh-25300
2021-03-01 10:39:34 +01:00
Bertrand Renuart
Andy Wilkinson
cdalexndr
trungPa
Stephane Nicoll
dreis2211
Madhura Bhave
Scott Frederick
Robert Smith