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

30330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
c86ee4c851 Merge branch '2.3.x' into 2.4.x 
Closes gh-25040
 2021-01-28 18:48:51 -08:00
Phillip Webb
745dbaff9c Merge pull request #24982 from robert-smith-911 
* pr/24982:
  Polish 'Add note about exploded jars and banner properties'
  Add note about exploded jars and banner properties

Closes gh-24982
 2021-01-28 18:48:33 -08:00
Phillip Webb
5b2d1f19a0 Polish 'Add note about exploded jars and banner properties' 
See gh-24982
 2021-01-28 18:48:14 -08:00
Robert Smith
33c038199d Add note about exploded jars and banner properties 
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
 2021-01-28 18:48:11 -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
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
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
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
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
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
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
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -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
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
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
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
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
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
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
Phillip Webb
69fbd2f8aa Delegate usesPathPatterns() call to mappings 
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
 2021-01-20 13:49:18 -08:00
Stephane Nicoll
3e376b955d Fix build failure 
See gh-24943
 2021-01-20 14:41:12 +01:00
Stephane Nicoll
56ce5bdf44 Merge branch '2.3.x' into 2.4.x 
See gh-24943
 2021-01-20 14:06:39 +01:00
Stephane Nicoll
244a6ac7e5 Polish "Deprecate Spring Data Solr" 
See gh-24942
 2021-01-20 14:02:59 +01:00
Stephane Nicoll
85729d2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-24943
 2021-01-20 13:57:18 +01:00
Stephane Nicoll
10b4cb8cb5 Deprecate Spring Data Solr support 
Closes gh-24942
 2021-01-20 13:56:50 +01:00
Phillip Webb
80dbbaf012 Add ConfigData IGNORE_PROFILES support 
Add a new `ConfigData.Option` that allows profile properties to be
ignored. This update will allow Spring Cloud Config Server to provide
`ConfigData` that only has profile properties processed on the
server-side.

Closes gh-24890
 2021-01-19 18:13:24 -08:00
Andy Wilkinson
7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0 
Closes gh-24875
 2021-01-19 13:22:00 +00:00
Andy Wilkinson
3ad2832cb2 Fix pattern extraction when MVC is using a PathPatternParser 
Fixes gh-24874
 2021-01-19 10:34:11 +00:00
Stephane Nicoll
59b01324ae Merge branch '2.3.x' into 2.4.x 
Closes gh-24872
 2021-01-18 17:08:36 +01:00
Stephane Nicoll
28ed3355bd Merge pull request #24753 from izeye 
* pr/24753:
  Update copyright of changed file
  Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures

Closes gh-24753
 2021-01-18 17:06:22 +01:00