Commit Graph

25803 Commits

Author SHA1 Message Date
Pascal Schumacher
5472fcf433 Fix typo in Spring Session documentation
See gh-24020
2020-11-03 20:31:42 +00:00
Andy Wilkinson
2f280b01e1 Improve Spring Session back-off documentation
Closes gh-23151
2020-11-03 19:42:57 +00:00
Andy Wilkinson
35bff55097 Ensure that Quartz can be auto-configured with a Quartz-specific TM
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.

This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.

Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson
6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter
Fixes gh-23978
2020-11-03 14:50:00 +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
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
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
e7eb7739dc Use overriding rather than overridden getter methods in config prop AP
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Spring Buildmaster
79a833539b Next development version (v2.2.12.BUILD-SNAPSHOT) 2020-10-29 13:47:25 +00:00
Stephane Nicoll
cc3c898dfe Upgrade to github-changelog-generator 0.0.4
Closes gh-23965
2020-10-29 13:36:39 +01:00
Stephane Nicoll
3b899ee326 Merge branch '2.1.x' into 2.2.x 2020-10-29 13:35:50 +01:00
Spring Buildmaster
625a0c99cb Next development version (v2.1.19.BUILD-SNAPSHOT) 2020-10-29 11:15:37 +00:00
Stephane Nicoll
7de2711396 Merge branch '2.1.x' into 2.2.x 2020-10-29 11:21:16 +01:00
Stephane Nicoll
ec57251c55 Configure release script to use .RELEASE suffix 2020-10-29 11:01:32 +01:00
Stephane Nicoll
770b5f4528 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 09:33:37 +01:00
Stephane Nicoll
6c0fc7f195 Workaround broken function in concourse scripts
See spring-io/concourse-java-scripts#11
2020-10-29 09:32:50 +01:00
Stephane Nicoll
a8db6a8a83 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 08:28:25 +01:00
Stephane Nicoll
3ebd247613 Workaround broken function in concourse scripts
See spring-io/concourse-java-scripts#11
2020-10-29 08:23:55 +01: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
9b4ccf4ac6 Upgrade CI to Java 15.0.1_9
Closes gh-23953
2020-10-28 19:36:33 -07:00
Phillip Webb
719d71e31b Merge branch '2.1.x' into 2.2.x
Closes gh-23943
2020-10-28 19:33:18 -07:00
Phillip Webb
327181455c Upgrade CI to Ubuntu Focal 20201008
Closes gh-23952
2020-10-28 19:29:59 -07:00
Phillip Webb
cf7e16e134 Merge branch '2.1.x' into 2.2.x
Closes gh-23950
2020-10-28 19:26:21 -07:00
Phillip Webb
88a1055916 Upgrade CI to Java 11.0.9_11
Closes gh-23947
2020-10-28 19:25:05 -07:00
Phillip Webb
7c188e1446 Merge branch '2.1.x' into 2.2.x
Closes gh-23951
2020-10-28 19:19:46 -07:00
Phillip Webb
6f6c0e9d08 Upgrade CI to jdk8u272-b10
Closes gh-23946
2020-10-28 19:19:00 -07: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
Stephane Nicoll
f2afd28b9a Upgrade to Spring AMQP 2.2.12
Closes gh-23783
2020-10-28 20:24:56 +01:00
Stephane Nicoll
560be634e0 Merge branch '2.1.x' into 2.2.x 2020-10-28 20:24:30 +01:00
Stephane Nicoll
b75e196de0 Upgrade to Spring Integration 5.1.13
Closes gh-23798
2020-10-28 20:23:35 +01:00
Stephane Nicoll
9c4e5904e7 Upgrade to Micrometer 1.3.15
Closes gh-23790
2020-10-28 16:30:05 +01:00
Stephane Nicoll
8bd7cc417e Upgrade to Spring Data Moore-SR11
Closes gh-23776
2020-10-28 16:29:27 +01:00
Stephane Nicoll
29414c7c90 Merge branch '2.1.x' into 2.2.x 2020-10-28 16:28:52 +01:00
Stephane Nicoll
9ae2eb4007 Upgrade to Spring Data Lovelace-SR21
Closes gh-23775
2020-10-28 16:27:19 +01:00
Stephane Nicoll
93e36a97ab Remove version elements from Maven plugin documentation
This commit removes `<version>` from the Maven Plugin documentation
where it makes sense so that versions aren't hardcoded unnecessarily.

Rather, a plugin or dependency management should be in place so those
are not needed.

Closes gh-23909
2020-10-28 13:39:03 +01:00
Stephane Nicoll
a3818d690e Fix custom layout example so that tokens are replaced 2020-10-28 13:37:59 +01:00
Stephane Nicoll
6d80b91ae7 Merge branch '2.1.x' into 2.2.x 2020-10-28 07:59:53 +01:00
Stephane Nicoll
505a713a08 Upgrade to Micrometer 1.1.19
Closes gh-23789
2020-10-28 07:53:39 +01:00
Stephane Nicoll
e31f4bc06d Revert to Spring AMQP 2.1.17
See gh-23782
2020-10-28 07:53:07 +01:00
Andy Wilkinson
b9516bc77c Await registration of http.server.requests meter
Previously, the test would make an HTTP request and, as soon as the
response was received, it would check the presence and value of the
http.server.requests meter. This create a race condition between the
meter being registered once the response had been flushed and the
meter's presence being checked. If the check won the race, the test
would fail.

This commit updates the test to wait for up to 5 seconds for the
meter to be present and have a count of 1, matching the single request
that has been made.

Fixes gh-23919
2020-10-27 15:54:22 +00:00
Stephane Nicoll
8b49f792cb Upgrade to Spring Framework 5.2.10
Closes gh-23773
2020-10-27 15:48:17 +01:00
Stephane Nicoll
444b91073b Merge branch '2.1.x' into 2.2.x 2020-10-27 15:47:39 +01:00
Stephane Nicoll
12f0709f9f Upgrade to Spring Framework 5.1.19
Closes gh-23772
2020-10-27 15:45:34 +01:00
Stephane Nicoll
d5cb6c1a4f Upgrade to RSocket 1.0.3
Closes gh-23910
2020-10-27 03:25:59 +01:00
Stephane Nicoll
7fa5ff46f7 Upgrade to Reactor Dysprosium-SR13
Closes gh-23769
2020-10-26 18:15:58 +01:00
Stephane Nicoll
6f2b1359a2 Merge branch '2.1.x' into 2.2.x 2020-10-26 18:15:15 +01:00
Stephane Nicoll
a1699d34f0 Upgrade to Reactor Californium-SR22
Closes gh-23792
2020-10-26 18:14:28 +01:00
Andy Wilkinson
ac8d55db78 Upgrade to Spring Security 5.2.7.RELEASE
Closes gh-23862
2020-10-26 10:25:29 +00:00
Andy Wilkinson
dc523c1bbd Upgrade to Lombok 1.18.16
Closes gh-23861
2020-10-26 10:25:27 +00:00