Andy Wilkinson
2dce4aa42b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24009
2020-11-03 14:04:08 +00:00
Andy Wilkinson
30a0ccab02
Remove use of @PostConstruct from main code
...
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.
To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.
Closes gh-23723
2020-11-03 13:59:38 +00:00
Andy Wilkinson
c93d91175d
Merge branch '2.3.x'
...
Closes gh-24007
2020-11-03 10:27:53 +00:00
Andy Wilkinson
2513071b1f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24006
2020-11-03 10:27:38 +00:00
Andy Wilkinson
622606d85a
Make it clearer that only the main DataSource bean may be replaced
...
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson
c76b246463
Merge branch '2.3.x'
...
Closes gh-24005
2020-11-03 10:17:17 +00:00
Andy Wilkinson
b846143c37
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24004
2020-11-03 10:17:00 +00:00
Andy Wilkinson
d32d65b02c
Add tip about providing as much typo info as possible in @Bean methods
...
Closes gh-22925
2020-11-03 10:16:20 +00:00
Andy Wilkinson
dbb954734e
Correct replacement for stale-while-revalidate config property
...
Fixes gh-23980
2020-11-02 20:49:00 +00:00
Andy Wilkinson
8004a821f2
Fix nested test config discovery for sliced tests
...
Fixes gh-23984
2020-11-02 20:40:27 +00:00
Stephane Nicoll
b67d746840
Fix metadata for deprecated logging.file properties
...
See gh-23609
Closes gh-23995
2020-11-02 18:09:27 +01:00
Stephane Nicoll
62f26ee36f
Remove code that's no longer used
...
Closes gh-23993
2020-11-02 10:55:12 +01:00
Stephane Nicoll
339b21cee7
Merge branch '2.3.x'
...
Closes gh-23992
2020-11-02 10:48:32 +01:00
Stephane Nicoll
1e9c9b9d73
Add missing default values in configuration properties metadata
...
Closes gh-23991
2020-11-02 10:44:06 +01:00
Phillip Webb
fb59432cf5
Use Graal friendly logging factory implementations
...
Update `LoggingSystemFactory` class present checks to use a static
final field so that they work better with Graal.
Closes gh-23985
2020-11-01 12:54:43 -08:00
Phillip Webb
298880c260
Polish formatting
2020-11-01 12:50:31 -08:00
izeye
9c35cd41ad
Polish
...
See gh-23986
2020-11-01 17:07:50 +01:00
Scott Frederick
f080bb6c25
Fix test that depended on snapshot version
...
A test case would fail to accurately capture the contents
of the layers.idx file unless the test project contained
at least one non-project snapshot dependency, which was only
true when the Spring Boot version was a snapshot.
See gh-23463
2020-10-29 19:40:13 -05:00
Stephane Nicoll
d951f28e16
Upgrade to Micrometer 1.6.0
...
Closes gh-23525
2020-10-29 18:58:32 +01:00
Andy Wilkinson
1d4a45cf8a
Add dependency management for jOOQ's new jooq-kotlin module
...
Closes gh-23964
2020-10-29 16:35:37 +00:00
Andy Wilkinson
c22e655848
Move spring.resources.* properties to spring.web.resources.*
...
Closes gh-23917
2020-10-29 16:08:50 +00:00
Phillip Webb
929d8fcd3c
Update copyright year of changed files
2020-10-29 09:08:13 -07:00
Phillip Webb
a41ff4dfab
Merge branch '2.3.x'
2020-10-29 09:07:57 -07:00
Phillip Webb
b0c2687aa9
Update copyright year of changed files
2020-10-29 09:07:42 -07:00
Andy Wilkinson
5642dc6d13
Merge branch '2.3.x'
...
Closes gh-23970
2020-10-29 15:31:59 +00:00
Andy Wilkinson
70d9602b3f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23969
2020-10-29 15:31:12 +00:00
Andy Wilkinson
e7eb7739dc
Use overriding rather than overridden getter methods in config prop AP
...
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Andy Wilkinson
a8705d19e5
Upgrade to Flyway 7.1.1
...
Closes gh-23932
2020-10-29 13:04:00 +00:00
Andy Wilkinson
2db8e7eebe
Polish "Add liquibase driver class name property"
...
See gh-23958
2020-10-29 10:06:43 +00:00
Evgeniy Cheban
8a9b31aa69
Add liquibase driver class name property
...
See gh-23958
2020-10-29 09:11:41 +00:00
Stephane Nicoll
dc54394c03
Upgrade to Spring Batch 4.3.0
...
Closes gh-23963
2020-10-29 09:06:38 +01:00
Stephane Nicoll
e962714dd3
Upgrade to Spring Session 2020.0.0
...
Closes gh-23788
2020-10-29 09:06:08 +01:00
Stephane Nicoll
6f9434ccc4
Upgrade to Spring Integration 5.4.0
...
Closes gh-23781
2020-10-29 09:05:23 +01:00
Phillip Webb
74e06e8e6a
Refine MetadataCollector logic
...
Update `MetadataCollector` merge logic so that previous items are no
longer added if the current round contains a property of the same name.
Fixes gh-23916
2020-10-28 21:59:06 -07:00
Phillip Webb
23e5fd798c
Merge branch '2.3.x'
...
Closes gh-23960
2020-10-28 21:18:42 -07:00
Phillip Webb
b86dcbec72
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23959
2020-10-28 21:18:17 -07:00
Phillip Webb
cf09451ffb
Retain inner-class data on incremental compile
...
Ensure that metadata sourced from inner-types is not deleted when
performing an incremental compile. Prior to this commit, the source
type was searched using the `Outer$Inner` format. This is not supported
`Elements.getTypeElement` so we now convert the names to `Outer.Inner`.
Closes gh-10886
2020-10-28 21:13:08 -07:00
Phillip Webb
c0a0c4cbac
Show the source jar of a ClasspathResource
...
Update `TextResourceOrigin` so that it shows the source jar file
of a `ClasspathResource`.
Closes gh-23019
2020-10-28 18:25:28 -07:00
Scott Frederick
04a40a4c68
Provide content-length header to Docker API calls
...
Docker daemon authorization plugins reject POST or PUT requests that have a
content type `application/json` header but no content length header. This
commit ensures that a content length header is provided in these cases.
This is a cherry-pick of the changes in d5b2836ec9
which were lost in a forward-merge.
Fixes gh-23957
2020-10-28 17:31:27 -05:00
Stephane Nicoll
425a2084ac
Upgrade to Spring Kafka 2.5.7
...
Closes gh-23787
2020-10-28 22:32:55 +01:00
Stephane Nicoll
11b55f650c
Upgrade to Spring Kafka 2.3.12
...
Closes gh-23786
2020-10-28 22:28:05 +01:00
Stephane Nicoll
124c148c51
Upgrade to Spring Integration 5.2.9
...
Closes gh-23956
2020-10-28 22:27:19 +01:00
Phillip Webb
b39d1910bc
Fix test failure caused by MavenBuild upgrades
...
See gh-23937
2020-10-28 14:07:27 -07:00
Scott Frederick
d5b2836ec9
Provide content-length header to Docker API calls
...
Docker daemon authorization plugins reject POST or PUT requests that have a
content type `application/json` header but no content length header. This
commit ensures that a content length header is provided in these cases.
Fixes gh-22840
2020-10-28 15:15:32 -05:00
Andy Wilkinson
ab21b55dc4
Revert "Upgrade to Flyway 7.1.0"
...
This reverts commit a6c6aba40d .
See gh-23932
2020-10-28 19:45:19 +00:00
Phillip Webb
d43760ba5a
Merge branch '2.3.x'
...
Closes gh-23938
2020-10-28 12:39:08 -07:00
Phillip Webb
d79c23ef89
Upgrade MavenBuild versions
...
Align versions with those in the main build.
Closes gh-23937
2020-10-28 12:37:30 -07:00
Stephane Nicoll
794a4ea0ab
Upgrade to Spring AMQP 2.3.0
...
Closes gh-23785
2020-10-28 20:29:40 +01:00
Stephane Nicoll
d112b8a289
Upgrade to Spring AMQP 2.2.12
...
Closes gh-23784
2020-10-28 20:27:50 +01:00
Stephane Nicoll
90ee8b5a2a
Upgrade to Spring Integration 5.3.3
...
Closes gh-23780
2020-10-28 20:26:59 +01:00