root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 18 Packages Projects Releases Wiki Activity
29,758 Commits 23 Branches 348 Tags 279 MiB
Commit Graph

29758 Commits

Author SHA1 Message Date
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 dac051de4d Merge branch '2.3.x' 
Closes gh-23948
 2020-10-28 19:37:50 -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 b6286dc3d0 Merge branch '2.3.x' 
Closes gh-23945
 2020-10-28 19:34:26 -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 ab7db32de9 Merge branch '2.3.x' 
Closes gh-23944
 2020-10-28 19:27:13 -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 497805b301 Merge branch '2.3.x' 
Closes gh-23949
 2020-10-28 19:22:13 -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
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 7f02be4286 Merge branch '2.3.x' 2020-10-28 22:33:55 +01: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
Phillip Webb b39d1910bc Fix test failure caused by MavenBuild upgrades 
See gh-23937
 2020-10-28 14:07:27 -07:00
Andy Wilkinson 3be4e225e7 Merge branch '2.3.x' 
Closes gh-23954
 2020-10-28 20:19:43 +00:00
Andy Wilkinson 9b12d2d7cb Ensure that additional metadata is available to annotation processor 
Fixes gh-23934
 2020-10-28 20:18:36 +00: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 f2055c8f32 Merge branch '2.3.x' 2020-10-28 20:29:25 +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
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
Phillip Webb f86598ea73 Merge pull request #23935 from nohn 
* pr/23935:
  Upgrade to Log4j 2.13.3 in Maven tests

Closes gh-23935
 2020-10-28 12:16:55 -07:00
Sebastian Nohn b3c4d5fe5c Upgrade to Log4j 2.13.3 in Maven tests 
See gh-23935
 2020-10-28 12:15:33 -07:00
Stephane Nicoll 0fe08632eb Upgrade to Spring Data 2020.0.0 
Closes gh-23778
 2020-10-28 17:52:20 +01:00
Stephane Nicoll a6c6aba40d Upgrade to Flyway 7.1.0 
Closes gh-23932
 2020-10-28 17:51:27 +01:00
Andy Wilkinson 8f2e58e301 Merge branch '2.3.x' 
Closes gh-23933
 2020-10-28 16:03:11 +00: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 893cfbe7a1 Merge branch '2.3.x' 2020-10-28 16:40:32 +01:00
Stephane Nicoll b94fe90f24 Upgrade to Spring Data Neumann-SR5 
Closes gh-23777
 2020-10-28 16:37:08 +01:00