root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
33,005 Commits 24 Branches 372 Tags 283 MiB
Commit Graph

33005 Commits

Author SHA1 Message Date
Andy Wilkinson 36a4b775d7 Merge pull request #27366 from dreis2211 
* gh-27366:
  Add CI pipeline for JDK 17

Closes gh-27366
 2021-07-16 15:09:42 +01:00
dreis2211 056f817ba2 Add CI pipeline for JDK 17 
See gh-27366
 2021-07-16 15:07:35 +01:00
Andy Wilkinson 530d17cf7e Merge pull request #27328 from dreis2211 
* gh-27328:
  Disable Gradle plugin tests that fail on JDK 17

Closes gh-27328
 2021-07-16 11:43:28 +01:00
dreis2211 be38ce3645 Disable Gradle plugin tests that fail on JDK 17 
See gh-27328
 2021-07-16 11:42:51 +01:00
Andy Wilkinson 1e09ef1db3 Merge branch '2.4.x' into 2.5.x 
Closes gh-27361
 2021-07-16 09:43:33 +01:00
Andy Wilkinson fe081b1742 Add Gson converter immediately before default Jackson converter 
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.

This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.

Fixes gh-27354
 2021-07-16 09:04:46 +01:00
Madhura Bhave 5b927bdf9f Merge pull request #27357 from anvithabs 
* pr/27357:
  Fix reference to a configuration property in cloud.adoc

Closes gh-27357
 2021-07-15 16:15:38 -07:00
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc 
See gh-27357
 2021-07-15 16:14:55 -07:00
Andy Wilkinson 74527db743 Merge branch '2.4.x' into 2.5.x 2021-07-15 20:20:11 +01:00
Andy Wilkinson 2f54198e31 Merge pull request #27348 from izeye 
* gh-27348:
  Remove Flyway references from DependsOn BFPPs for Liquibase

Closes gh-27348
 2021-07-15 20:19:26 +01:00
izeye 198e40c72e Remove Flyway references from DependsOn BFPPs for Liquibase 
See gh-27348
 2021-07-15 20:18:27 +01:00
Andy Wilkinson c8c784bd5c Allow @SpyBean to be used to spy on a Spring Data repository 
Fixes gh-7033
 2021-07-15 19:44:52 +01:00
Andy Wilkinson 62695f76f7 Provide complete dependency management for Prometheus's Pushgateway 
Fixes gh-27349
 2021-07-15 19:26:25 +01:00
Andy Wilkinson d4159130a5 Merge branch '2.4.x' into 2.5.x 
Closes gh-27346
 2021-07-15 11:50:51 +01:00
Andy Wilkinson 7a23a12ce0 Fix configprops endpoint's handling of config tree values 
Fixes gh-27327
 2021-07-15 11:50:40 +01:00
Stephane Nicoll 765b1ae060 Merge branch '2.4.x' into 2.5.x 2021-07-15 10:03:17 +02:00
Stephane Nicoll c7c1ba929a Upgrade Ubuntu version in CI images 
Closes gh-27336
 2021-07-15 10:02:28 +02:00
Stephane Nicoll 2d3006171d Merge branch '2.3.x' into 2.4.x 2021-07-15 09:48:52 +02:00
Stephane Nicoll d1b242e6c8 Upgrade Ubuntu version in CI images 
Closes gh-27337
 2021-07-15 09:48:33 +02:00
Stephane Nicoll 235e48683c Upgrade Ubuntu version in CI images 
Closes gh-27335
 2021-07-15 09:45:21 +02:00
Stephane Nicoll 7ab316ea0e Merge branch '2.4.x' into 2.5.x 2021-07-15 09:02:06 +02:00
Stephane Nicoll 39626fa4e7 Upgrade to Spring HATEOAS 1.3.3 
Closes gh-27184
 2021-07-15 09:00:17 +02:00
Stephane Nicoll 8268c21158 Upgrade to Micrometer 1.7.2 
Closes gh-27342
 2021-07-15 08:58:14 +02:00
Stephane Nicoll 1c69789ca4 Upgrade to Lettuce 6.1.4.RELEASE 
Closes gh-27341
 2021-07-15 08:58:12 +02:00
Stephane Nicoll 8694b67744 Upgrade to Spring HATEOAS 1.2.8 
Closes gh-27183
 2021-07-15 08:51:42 +02:00
Stephane Nicoll 52996e139e Upgrade to Micrometer 1.6.9 
Closes gh-27340
 2021-07-15 08:50:47 +02:00
Stephane Nicoll 6f949a1744 Upgrade to Lettuce 6.0.7.RELEASE 
Closes gh-27339
 2021-07-15 08:50:46 +02:00
Andy Wilkinson 9a81d2fe09 Merge branch '2.4.x' into 2.5.x 
Closes gh-27332
 2021-07-14 17:19:39 +01:00
Andy Wilkinson c005e1de9a Rename test classes to match our naming conventions 
Closes gh-27331
 2021-07-14 17:19:11 +01:00
Stephane Nicoll d8f9a20221 Add missing XSD version for layers configuration 
Closes gh-27321
 2021-07-14 14:32:08 +02:00
Stephane Nicoll 2f90bcd4f5 Merge branch '2.4.x' into 2.5.x 2021-07-14 14:15:45 +02:00
Stephane Nicoll 3c38e46c05 Upgrade to Spring Framework 5.3.9 
Closes gh-27163
 2021-07-14 14:15:34 +02:00
Stephane Nicoll 3511a007a2 Upgrade to Spring Framework 5.3.9 
Closes gh-27160
 2021-07-14 14:14:01 +02:00
Stephane Nicoll de3dbaf1d5 Upgrade to Kotlin Coroutines 1.5.1 
Closes gh-27317
 2021-07-14 07:34:15 +02:00
Stephane Nicoll 190df4d0a1 Upgrade to Kotlin 1.5.21 
Closes gh-27316
 2021-07-14 07:34:14 +02:00
Madhura Bhave ed22e4a897 Merge branch '2.4.x' into 2.5.x 2021-07-13 15:18:40 -07:00
Madhura Bhave 23b377e1a1 Fix typo 2021-07-13 15:18:17 -07:00
Andy Wilkinson 0d5e3c558b Merge pull request #27310 from dreis2211 
* gh-27310:
  Fix JDK 16 pipeline

Closes gh-27310
 2021-07-13 17:42:41 +01:00
dreis2211 e4978f604c Fix JDK 16 pipeline 
See gh-27310
 2021-07-13 17:42:20 +01:00
Andy Wilkinson 49b700d290 Merge pull request #27089 from dreis2211 
* gh-27089:
  Polish "Allow additional JVM args when running tests via toolchain"
  Allow additional JVM args when running tests via toolchain

Closes gh-27089
 2021-07-13 15:28:22 +01:00
Andy Wilkinson 705feeed6a Polish "Allow additional JVM args when running tests via toolchain" 
See gh-27089
 2021-07-13 15:28:04 +01:00
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain 
See gh-27089
 2021-07-13 15:24:45 +01:00
Andy Wilkinson 685b78f504 Merge branch '2.4.x' into 2.5.x 
Closes gh-27304
 2021-07-13 14:56:26 +01:00
Andy Wilkinson 7848cf3c79 Merge pull request #27300 from hoanvh 
* gh-27300:
  Polish "Mark Redis as down when cluster_state is fail"
  Mark Redis as down when cluster_state is fail

Closes gh-27300
 2021-07-13 14:56:20 +01:00
Andy Wilkinson 49baacbc1c Polish "Mark Redis as down when cluster_state is fail" 
See gh-27300
 2021-07-13 14:56:01 +01:00
Hoan Vu Hong f31141de09 Mark Redis as down when cluster_state is fail 
See gh-27300
 2021-07-13 14:35:59 +01:00
Andy Wilkinson 7332b43a9e Merge branch '2.4.x' into 2.5.x 
Closes gh-27162
 2021-07-13 13:53:45 +01:00
Andy Wilkinson 96e58d815d Upgrade to Reactor 2020.0.9 
Closes gh-27159
 2021-07-13 13:52:00 +01:00
Andy Wilkinson 6ed7e692a9 Merge branch '2.4.x' into 2.5.x 
See gh-27163
 2021-07-13 13:13:36 +01:00
Andy Wilkinson 1341ca99db Align with Framework's deprecation of getLastModified 
See gh-27160
 2021-07-13 13:12:45 +01:00