Phillip Webb
848a61a3a8
Merge branch '3.0.x' into 3.1.x
2023-08-13 18:50:33 -07:00
Phillip Webb
a0089c5c76
Merge branch '2.7.x' into 3.0.x
2023-08-13 18:44:36 -07:00
Phillip Webb
46773dd5df
Update copyright year of changed files
2023-08-13 18:19:05 -07:00
Phillip Webb
527b2f2cac
Polish
2023-08-13 18:18:48 -07:00
Andy Wilkinson
0c9e6268d5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36856
2023-08-09 12:01:00 +01:00
Andy Wilkinson
f82f4d6b56
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36855
2023-08-09 12:00:45 +01:00
Andy Wilkinson
694ff4f875
Include throwables from Logback errors when reporting invalid config
...
Closes gh-32562
2023-08-09 11:43:58 +01:00
Andy Wilkinson
ed89272585
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36786
2023-08-08 11:29:11 +01:00
Andy Wilkinson
34b2de3095
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36785
2023-08-08 11:28:59 +01:00
Andy Wilkinson
35d3cdbe74
Fail more helpfully when schema or data location is a directory
...
Previously a schema or data locatio that was a directory would
result in an attempt being made to apply the directory listing as
SQL scripts. This would typically result in a hard to diagnose
failure due to the directory listing not being valid SQL.
This commit updates the initializer to ignore locations for
which the Resources is not readable. This works as Framework's
Resource abstraction does not consider directory resources to be
readable.
Closes gh-36386
2023-08-08 11:20:07 +01:00
Stephane Nicoll
ac1d8a3651
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36759
2023-08-04 16:07:40 +02:00
Stephane Nicoll
f8a5aff160
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36758
2023-08-04 16:07:04 +02:00
Stephane Nicoll
1e5a72f1f8
Provide nested cause if datasource fails to provide DatabaseDriver
...
Closes gh-34728
2023-08-04 16:01:14 +02:00
Stephane Nicoll
05df721d51
Merge branch '2.7.x' into 3.0.x
2023-08-04 16:00:02 +02:00
Stephane Nicoll
97ce95c417
Polish "Upgrade to MariaDB 3.1.4"
...
See gh-36394
2023-08-04 15:58:32 +02:00
Stephane Nicoll
2e37b0ae47
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36735
2023-08-04 14:12:04 +02:00
Stephane Nicoll
de632dd77b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36734
2023-08-04 14:11:51 +02:00
Stephane Nicoll
fd88024402
Add @since for JavaVersion values
...
Closes gh-36608
2023-08-04 14:09:12 +02:00
Andy Wilkinson
65bc351847
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36634
2023-07-28 12:22:36 +01:00
Andy Wilkinson
3e99118a48
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36633
2023-07-28 12:22:21 +01:00
Johnny Lim
5a205dbfd1
Polish
...
See gh-36620
2023-07-28 11:35:33 +01:00
Andy Wilkinson
8f576c36a2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36630
2023-07-28 11:31:59 +01:00
Andy Wilkinson
81844c04c4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36629
2023-07-28 11:31:49 +01:00
rob-valor
4bbfc5e630
Correct RestTemplateBuilder#defaultHeader javadoc
...
Replace reactor.netty.http.client.HttpClientRequest with
org.springframework.http.client.ClientHttpRequest
See gh-36614
2023-07-28 11:30:46 +01:00
Moritz Halbritter
2bc3d22d68
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36584
2023-07-26 10:24:53 +02:00
Moritz Halbritter
c187d96367
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36583
2023-07-26 10:23:08 +02:00
Francisco Bento
307d6c0a97
Fix Tomcat SSL protocol warn message
...
See gh-36572
2023-07-26 10:21:43 +02:00
Stephane Nicoll
f23cb1fa39
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36520
2023-07-24 13:25:01 +02:00
Stephane Nicoll
3aeb853c63
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36519
2023-07-24 13:24:40 +02:00
Stephane Nicoll
cc77b8ace1
Polish contribution
...
See gh-36463
2023-07-24 13:14:01 +02:00
elevne
d59cec9e01
Harmonize use of Stream in ConfigDataLocationBindHandler.onSuccess
...
See gh-36463
2023-07-24 13:06:47 +02:00
Andy Wilkinson
4d6ee92e21
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36448
2023-07-19 14:38:28 +01:00
Andy Wilkinson
f145ca0c3c
Fix reflection hint generation for properties nested in superclass
...
Fixes gh-36406
2023-07-19 14:37:52 +01:00
Stephane Nicoll
bb16ed1245
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36427
2023-07-17 15:24:58 +02:00
Stephane Nicoll
3586bfb629
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36426
2023-07-17 15:22:43 +02:00
Stephane Nicoll
09e5d38348
Polish "Replace @CsvSource with @ValueSource where feasible"
...
See gh-36062
2023-07-17 15:16:27 +02:00
Yanming Zhou
acb7acd5d9
Replace @CsvSource with @ValueSource where feasible
...
@ValueSource is more appropriate for single parameter.
See gh-36062
2023-07-17 15:16:26 +02:00
Christoph Dreis
8321887d6a
Fix typos
...
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson
218f4f2679
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36359
2023-07-12 12:00:11 +01:00
Andy Wilkinson
090802b11b
Use existing value rather than deducing bind method
...
When there is an existing value, deducing the bind method may
incorrectly result in the use of constructor binding. This
results in a failure in the configuration properties
post-processor as it refuses to bind properties to a bean whose
attributes indicate that constructor binding should have been used.
This commit updates ConfigurationPropertiesBean to avoid tryin to
deduce the bind method and instead use the presence or absence of an
existing value to determine the type of binding that should be used.
Only when there is no existing value is constructor binding
appropriate.
Fixes gh-36175
2023-07-12 11:13:48 +01:00
Andy Wilkinson
b7099094b9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36268
2023-07-06 19:42:47 +01:00
Andy Wilkinson
4d70b83e80
Improve javadoc of ClientHttpRequestFactories
...
Closes gh-36267
2023-07-06 19:42:17 +01:00
Andy Wilkinson
ffad1b1dca
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36145
2023-06-30 14:47:34 +01:00
Andy Wilkinson
70406452df
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36144
2023-06-30 14:47:20 +01:00
Andy Wilkinson
b06e7e60f9
Polish "Fix asymmetry of equals when element has trailing dashes"
...
See gh-34804
2023-06-30 14:38:31 +01:00
Eyðun Nielsen
a86429a62a
Fix asymmetry of equals when element has trailing dashes
...
See gh-34804
2023-06-30 14:37:47 +01:00
Scott Frederick
0a51c466f4
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36123
2023-06-29 16:54:45 -06:00
Scott Frederick
884489e73a
Apply system properties to RestTemplate HttpClient
...
Fixes gh-35815
2023-06-29 16:31:09 -06:00
Andy Wilkinson
28af839dff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36097
2023-06-27 20:13:57 +01:00
Andy Wilkinson
b3c321e40c
Polish javadoc of RestTemplateBuilder.requestFactory(Function)
...
Closes gh-36046
2023-06-27 20:13:11 +01:00