Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,812 Commits 20 Branches 322 Tags 258 MiB
723bdc77a5
Commit Graph

30812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
802da9dc87 Merge branch '2.4.x' 
Closes gh-25039
 2021-01-28 18:01:06 -08:00
Phillip Webb
53f1aab833 Merge branch '2.3.x' into 2.4.x 
Closes gh-25038
 2021-01-28 18:00:42 -08:00
Phillip Webb
7265484d76 Merge pull request #24336 from wesuga 
* pr/24336:
  Polish 'Add a tip about actuator endpoints'
  Add a tip about actuator endpoints

Closes gh-24336
 2021-01-28 17:59:11 -08:00
Phillip Webb
60bb33f231 Polish 'Add a tip about actuator endpoints' 
See gh-24336
 2021-01-28 17:55:09 -08:00
Wesley Ugang
6ced1d7f4e Add a tip about actuator endpoints 
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
 2021-01-28 17:53:04 -08:00
Madhura Bhave
82ac7eef91 Update tests following code changes 
See gh-22821
 2021-01-28 14:24:18 -08:00
Madhura Bhave
9a32f67802 Fix formatting 2021-01-28 13:38:30 -08:00
Madhura Bhave
152698f2b2 Add support for creating layered war files with Maven 
See gh-22821
 2021-01-28 12:39:19 -08:00
Andy Wilkinson
fd27c26e3b Merge branch '2.4.x' 
Closes gh-25024
 2021-01-28 09:30:36 +00:00
Andy Wilkinson
8b505cf541 Merge branch '2.3.x' into 2.4.x 
Closes gh-25020
 2021-01-28 09:30:19 +00:00
Andy Wilkinson
a4e6a3cfd0 Merge branch '2.2.x' into 2.3.x 
Closes gh-25028
 2021-01-28 09:30:01 +00:00
Andy Wilkinson
73b9615e0c Upgrade Java 15 CI image to jdk-15.0.2+7 
Closes gh-25013
 2021-01-28 09:27:26 +00:00
Andy Wilkinson
dcaa79db7e Merge branch '2.4.x' 
Closes gh-25025
 2021-01-28 09:26:19 +00:00
Andy Wilkinson
8884d89dc6 Merge branch '2.3.x' into 2.4.x 
Closes gh-25018
 2021-01-28 09:26:05 +00:00
Andy Wilkinson
bc5e2853e1 Merge branch '2.2.x' into 2.3.x 
Closes gh-25027
 2021-01-28 09:25:27 +00:00
Andy Wilkinson
06c76b8643 Upgrade Java 11 CI image to jdk-11.0.10+9 
Closes gh-25014
 2021-01-28 09:25:02 +00:00
Andy Wilkinson
c2622f2d86 Merge branch '2.4.x' 
Closes gh-25023
 2021-01-28 09:24:01 +00:00
Andy Wilkinson
49b546a994 Merge branch '2.3.x' into 2.4.x 
Closes gh-25017
 2021-01-28 09:23:36 +00:00
Andy Wilkinson
e04863d15b Merge branch '2.2.x' into 2.3.x 
Closes gh-25022
 2021-01-28 09:23:15 +00:00
Andy Wilkinson
6ccfa0f554 Upgrade Java 8 CI image to jdk8u282b08 
Closes gh-25019
 2021-01-28 09:22:54 +00:00
Andy Wilkinson
d435aab19a Merge branch '2.4.x' 
Closes gh-25026
 2021-01-28 09:03:55 +00:00
Andy Wilkinson
460094ff80 Merge branch '2.3.x' into 2.4.x 
Closes gh-25016
 2021-01-28 09:03:14 +00:00
Andy Wilkinson
223b4e4a6f Merge branch '2.2.x' into 2.3.x 
Closes gh-25021
 2021-01-28 09:02:45 +00:00
Andy Wilkinson
c7b299fb27 Upgrade CI images to Ubuntu Focal 20210119 
Closes gh-25015
 2021-01-28 08:58:07 +00:00
Phillip Webb
5054765fc8 Merge branch '2.4.x' 
Closes gh-25031
 2021-01-27 14:19:25 -08:00
Phillip Webb
0fcc52ccaf Protect against NPE with Option.IGNORE_IMPORTS 
Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.

Fixes gh-25029
 2021-01-27 14:17:41 -08:00
Phillip Webb
d702793ba7 Merge branch '2.4.x' 
Closes gh-25030
 2021-01-27 14:10:49 -08:00
Phillip Webb
7f32fa6723 Allow 'on-profile' in profile specific files 
Restore the ability to use `spring.config.activate.on-profile` or
`spring.profiles` in profile specific files.

Closes gh-24990
 2021-01-27 14:07:02 -08:00
Phillip Webb
61502bde9a Replace deprecated constructor with mutate builder 
Update `ControllerEndpointHandlerMapping` to use the new `mutate()`
builder rather than deprecated constructors.

Closes gh-24999
 2021-01-26 22:42:18 -08:00
Phillip Webb
c9a2c4e326 Merge branch '2.4.x' 2021-01-26 19:06:48 -08:00
Phillip Webb
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb
4b0ef67e8e Update code for Spring Data 2021.0.0-M3 
See gh-25004
 2021-01-26 18:57:50 -08:00
Phillip Webb
ab0a628d81 Merge branch '2.4.x' 2021-01-26 17:38:11 -08:00
Phillip Webb
99f7bc1aba Build against Spring Data 2020.0.4-SNAPSHOT 
See gh-25002
 2021-01-26 17:35:54 -08:00
Phillip Webb
d95d7a0245 Update code for Spring Framework 5.3.4 
See gh-24998
 2021-01-26 17:35:54 -08:00
Phillip Webb
b7ae5558f6 Build against Spring Framework 5.3.4-SNAPSHOT 
See gh-24998
 2021-01-26 17:31:27 -08:00
Andy Wilkinson
262bc84753 Merge branch '2.4.x' 2021-01-26 14:07:01 +00:00
Andy Wilkinson
8e2558a9fc Merge branch '2.3.x' into 2.4.x 2021-01-26 14:05:51 +00:00
Andy Wilkinson
39f11d78fc Merge branch '2.2.x' into 2.3.x 2021-01-26 14:05:39 +00:00
Andy Wilkinson
189463a23b Update security policy links 2021-01-26 14:05:21 +00:00
Andy Wilkinson
889b9d5dc0 Merge branch '2.4.x' 2021-01-26 14:04:29 +00:00
Andy Wilkinson
9fd0e4245c Merge branch '2.3.x' into 2.4.x 2021-01-26 14:04:17 +00:00
Andy Wilkinson
138fe0aca9 Merge branch '2.2.x' into 2.3.x 2021-01-26 14:04:03 +00:00
Andy Wilkinson
eb07867738 Update security policy links 2021-01-26 14:03:44 +00:00
Phillip Webb
439344fdd8 Merge branch '2.4.x' 
Closes gh-24996
 2021-01-25 23:13:38 -08:00
Phillip Webb
1def245a2c Support DeferredLogFactory injection 
Update `ConfigDataLoader` and `ConfigDataLocationResolver` to support
`DeferredLogFactory` injection.

Closes gh-24988
 2021-01-25 23:13:01 -08:00
Phillip Webb
b1f27b7604 Merge branch '2.4.x' 
Closes gh-24995
 2021-01-25 21:36:36 -08:00
Phillip Webb
522f68cb40 Merge branch '2.3.x' into 2.4.x 
Closes gh-24994
 2021-01-25 21:36:12 -08:00
Phillip Webb
464b302655 Set withTestKitDir per Gradle version 
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
 2021-01-25 21:35:25 -08:00
Phillip Webb
c268f5d418 Skip direct @ConfugurationProperties binding 
Add a `BindRestriction` option to `Bindable` which allows direct
property binding to be bypassed. The option is automatically applied
by the `ConfigurationPropertiesBinder`.

Prior to this commit, `@ConfugurationProperties` binding could silently
fail if a direct property existed that could be converted to the
properties class. This can be the case if a single-argument constructor
is available as the `ObjectToObject` converter would kick in.

Closes gh-16038

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
 2021-01-22 16:57:59 -08:00