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

2156 Commits

Author SHA1 Message Date
Stephane Nicoll
c2b85c1a0e Merge branch '2.4.x' 
Closes gh-25313
 2021-02-16 13:51:12 +01:00
Stephane Nicoll
f6b5964258 Merge branch '2.3.x' into 2.4.x 
Closes gh-25312
 2021-02-16 13:50:55 +01:00
Stephane Nicoll
0da7822e27 Update copyright of changed files 
See gh-25265
 2021-02-16 13:50:15 +01:00
melburne
2163c96205 Fix incorrect detection of Amazon Redshift 
See gh-25265
 2021-02-16 13:50:15 +01:00
Andy Wilkinson
9628df87ff Merge branch '2.4.x' 
Closes gh-25304
 2021-02-16 10:34:54 +00:00
Andy Wilkinson
55e3ca66e2 Replace native image system property with call to NativeDetector 
Closes gh-25303
 2021-02-16 10:34:34 +00:00
Stephane Nicoll
9b7581a8ef Polish "Fix database name detection logic for MariaDB" 
See gh-25173
 2021-02-15 14:24:08 +01:00
anudeepg
053323f58b Fix database name detection logic for MariaDB 
See gh-25173
 2021-02-15 14:23:26 +01:00
Andy Wilkinson
0a4c26532d Merge branch '2.4.x' 
Closes gh-25259
 2021-02-12 14:57:18 +00:00
Andy Wilkinson
392be57003 Apply Logback system properties and not just common properties to context 
Closes gh-24894
 2021-02-12 14:34:31 +00:00
Stephane Nicoll
a9a8d3a167 Merge branch '2.4.x' 
Closes gh-25137
 2021-02-09 09:49:59 +01:00
izeye
63ee99bf75 Polish 
See gh-25093
 2021-02-09 09:48:35 +01:00
Phillip Webb
d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08:00
Phillip Webb
230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb
d8c9b8c329 Merge branch '2.4.x' 
Closes gh-25060
 2021-01-30 12:35:52 -08:00
Phillip Webb
77478d9f34 Refine CharSequenceToObjectConverter logic 
Update `CharSequenceToObjectConverter` so that conversion that would
apply using an `ObjectTo...` converter now favors `toString()` based
conversion.

Prior to this commit, when converting a `CharSequence` to a `Collection`
the `ObjectToCollectionConveter` would be picked instead of the
`StringToCollectionConverter`. This resulted in a `Collection`
containing a single `String` value, rather than the expected list
of values split around ",".

Fixes gh-25057
 2021-01-30 12:35:36 -08:00
Phillip Webb
01746453f7 Merge branch '2.4.x' 2021-01-30 12:34:28 -08:00
Phillip Webb
dd997cda9c Remove sysout from test 2021-01-30 10:38:02 -08: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
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
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
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
d15ec4cdb4 Upgrade to Liquibase 4.2.2 
Closes gh-24952
 2021-01-21 09:47:58 +00:00
Phillip Webb
b5674173f8 Merge branch '2.4.x' 
Closes gh-24893
 2021-01-19 18:15:26 -08: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
743343cf18 Avoid compiler warning that only occurs with Java 8 2021-01-19 13:58:34 +00:00
Andy Wilkinson
535050ad48 Automatically register HttpSessionIdListener's with the servlet context 
Closes gh-24879
 2021-01-19 11:28:34 +00:00
Stephane Nicoll
dcae55a8bc Merge branch '2.4.x' 
Closes gh-24861
 2021-01-17 17:04:22 +01:00
dreis2211
b8b5e4cebf Fix configuration metadata for logging.charset.* properties 
See gh-24851
 2021-01-17 17:02:24 +01:00
Stephane Nicoll
1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll
e8ae18ae11 Polish 
See gh-24837
 2021-01-15 14:36:53 +01:00
Stephane Nicoll
2c2c160579 Remove deprecated code 
See gh-24806
 2021-01-15 14:14:33 +01:00
Stephane Nicoll
a18f01addf Remove bitronix support 
See gh-24806
 2021-01-15 14:14:27 +01:00
Stephane Nicoll
e2033992c7 Merge branch '2.4.x' 2021-01-15 08:25:41 +01:00
Stephane Nicoll
9343633582 Merge branch '2.3.x' into 2.4.x 2021-01-15 08:25:27 +01:00
Stephane Nicoll
9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Phillip Webb
0fd3cd5ed5 Merge branch '2.4.x' 2021-01-14 17:25:22 -08:00
Phillip Webb
26f2caca22 Update copyright year of changed files 2021-01-14 17:25:09 -08:00
Phillip Webb
daf2b2fea3 Merge branch '2.4.x' 
Fixes gh-24846
 2021-01-14 17:23:24 -08:00
Phillip Webb
c0aef4c35f Apply SystemProperties to LoggerContext 
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.

Fixes gh-24835
 2021-01-14 17:22:37 -08:00
Madhura Bhave
b7843f9399 Merge branch '2.4.x' 
Closes gh-24846
 2021-01-14 16:15:15 -08:00
Madhura Bhave
68fc2329c8 Revert "Remove unnecessary code" 
Fixes gh-24835
 2021-01-14 16:13:30 -08:00
Stephane Nicoll
a788ef4958 Merge branch '2.4.x' 
Closes gh-24842
 2021-01-14 18:03:38 +01:00