Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,592 Commits 23 Branches 0 Tags
d435aab19abdf966d8a0deee53b9ad43d570e184
Commit Graph

30592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
5fc49aa485 Remove dependency management for spring-boot-starter-data-solr 
Closes gh-24977
 2021-01-22 15:09:12 +00:00
Andy Wilkinson
f3fd55dac6 Merge branch '2.4.x' 
Closes gh-24976
 2021-01-22 14:59:35 +00:00
Andy Wilkinson
9c8645dec2 Merge branch '2.3.x' into 2.4.x 
Closes gh-24975
 2021-01-22 14:59:23 +00:00
Andy Wilkinson
46d908f632 Upgrade to Gradle 6.8.1 
Closes gh-24737
 2021-01-22 14:20:57 +00:00
Andy Wilkinson
5a56f8864f Remove error message attribute instead of blanking it when not included 
Closes gh-24712
 2021-01-22 14:10:02 +00:00
Andy Wilkinson
1370e8ca97 Merge branch '2.4.x' 
Closes gh-24974
 2021-01-22 13:32:47 +00:00
Andy Wilkinson
5362633014 Merge branch '2.3.x' into 2.4.x 
Closes gh-24973
 2021-01-22 13:32:30 +00:00
Andy Wilkinson
0b06ac9938 Use AssertJ's doesNotContainKey 
Closes gh-24970
 2021-01-22 13:28:41 +00:00
Andy Wilkinson
76490be222 Merge pull request #24964 from aurelien-baudet 
* gh-24964:
  Polish "Add reference to Ogham Spring Boot starters"
  Add reference to Ogham Spring Boot starters

Closes gh-24964
 2021-01-22 11:07:50 +00:00
Andy Wilkinson
ebca1af3fd Polish "Add reference to Ogham Spring Boot starters" 
See gh-24964
 2021-01-22 11:06:33 +00:00
Aurélien Baudet
0e436a2ccf Add reference to Ogham Spring Boot starters 
See gh-24964
 2021-01-22 10:56:36 +00:00
Andy Wilkinson
fdfae7d8b3 Merge pull request #24967 from bdemers 
* gh-24967:
  Fix minor typo in pull request template

Closes gh-24967
 2021-01-22 10:51:03 +00:00
Brian Demers
c89d4e3eb4 Fix minor typo in pull request template 
See gh-24967
 2021-01-22 10:50:05 +00:00
Madhura Bhave
587f96d4e0 Merge pull request #24715 from hatefpalizgar 
* pr/24715:
  Polish " Change info endpoint to be secure and unexposed by default"
  Change info endpoint to be secure and unexposed by default

Closes gh-24715
 2021-01-21 15:15:03 -08:00
Madhura Bhave
d07e351eff Polish " Change info endpoint to be secure and unexposed by default" 
See gh-24715
 2021-01-21 15:13:53 -08:00
Hatef Palizgar
53c1e79810 Change info endpoint to be secure and unexposed by default 
See gh-24715
 2021-01-21 13:54:59 -08:00
Andy Wilkinson
0fc33b020d Remove metadata for Data Solr property 
Data Solr support was removed in 012a1997 so the property is no longer
supported.

See gh-24939
 2021-01-21 16:45:25 +00:00
Andy Wilkinson
3e4abd0471 Upgrade to Solr 8.7.0 
Closes gh-24963
 2021-01-21 15:41:22 +00:00
Andy Wilkinson
a0166e53c1 Upgrade to REST Assured 4.3.3 
Closes gh-24962
 2021-01-21 15:28:19 +00:00
Andy Wilkinson
977b938977 Upgrade to Flyway 7.5.1 
Closes gh-24961
 2021-01-21 15:28:19 +00:00