Commit Graph

28083 Commits

Author SHA1 Message Date
Andy Wilkinson
dcb42c36f9 Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-29 09:07:05 +00:00
Stephane Nicoll
4f92574483 Merge branch '2.2.x' into 2.3.x 2020-10-29 09:34:07 +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
165b132346 Merge branch '2.2.x' into 2.3.x 2020-10-29 08:30:11 +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
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
7f4a7c21d2 Merge branch '2.2.x' into 2.3.x
Closes gh-23939
2020-10-28 19:37:32 -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
ec032b372e Merge branch '2.2.x' into 2.3.x
Closes gh-23941
2020-10-28 19:33:51 -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
05f0022f76 Merge branch '2.2.x' into 2.3.x
Closes gh-23940
2020-10-28 19:26:47 -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
1246597644 Merge branch '2.2.x' into 2.3.x
Closes gh-23942
2020-10-28 19:21:35 -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
425a2084ac Upgrade to Spring Kafka 2.5.7
Closes gh-23787
2020-10-28 22:32:55 +01:00
Stephane Nicoll
18e7d6df07 Merge branch '2.2.x' into 2.3.x 2020-10-28 22:32:22 +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
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
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
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
Stephane Nicoll
47a5d7aab6 Upgrade to Micrometer 1.5.6
Closes gh-23791
2020-10-28 20:26:17 +01:00
Stephane Nicoll
a7503d82ec Merge branch '2.2.x' into 2.3.x 2020-10-28 20:25:40 +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
Andy Wilkinson
58aa34489f Wait for DataSource init before allowing context refresh to complete
Closes gh-22852
2020-10-28 16:01:14 +00:00
Stephane Nicoll
b94fe90f24 Upgrade to Spring Data Neumann-SR5
Closes gh-23777
2020-10-28 16:37:08 +01:00
Stephane Nicoll
20e21a27b9 Merge branch '2.2.x' into 2.3.x 2020-10-28 16:36:38 +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
0424689aee Merge branch '2.2.x' into 2.3.x
Closes gh-23930
2020-10-28 16:18:00 +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
c02b16eeeb Upgrade to Lettuce 5.3.5.RELEASE
Closes gh-23922
2020-10-28 08:03:44 +01:00
Stephane Nicoll
36d740fd68 Merge branch '2.2.x' into 2.3.x 2020-10-28 08:02:31 +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
c493bd7d3b Merge branch '2.2.x' into 2.3.x 2020-10-27 15:55:52 +00: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