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

33291 Commits

Author SHA1 Message Date
Andy Wilkinson b99b7b1077 Drop JDK 17 system tests until Gradle supports Java 17 
See gh-27367
 2021-07-16 15:49:34 +01:00
Andy Wilkinson 3d581847e6 Merge branch '2.5.x' 
Closes gh-27370
 2021-07-16 15:46:39 +01:00
Andy Wilkinson 96111514e1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27369
 2021-07-16 15:46:27 +01:00
Andy Wilkinson 06a3c40506 Use a 10s init query timeout in Cassandra tests 
Closes gh-27368
 2021-07-16 15:45:49 +01:00
Andy Wilkinson 8fd1bf0f54 Polish 
See gh-27367
 2021-07-16 15:32:16 +01:00
Andy Wilkinson 4257cce516 Correct the CI image used by JDK 17 system tests 
See gh-27367
 2021-07-16 15:29:10 +01:00
Andy Wilkinson 99241432cb Merge branch '2.5.x' 
Closes gh-27367
 2021-07-16 15:12:05 +01:00
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 25234219ce Merge branch '2.5.x' 
Closes gh-27365
 2021-07-16 11:51:43 +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 6f7ddf1fea Merge pull request #27091 from RazorNd 
* gh-27091:
  Polish "Add @WebServiceServerTest slice test support"
  Add @WebServiceServerTest slice test support

Closes gh-27091
 2021-07-16 11:30:46 +01:00
Andy Wilkinson 43f1b98864 Polish "Add @WebServiceServerTest slice test support" 
See gh-27091
 2021-07-16 11:28:39 +01:00
Daniil Razorenov c897b1e689 Add @WebServiceServerTest slice test support 
Add `@WebServiceServerTest` and related test auto-configuration to
allow slice testing of Spring Web Service server applications.

See gh-27091
 2021-07-16 10:11:06 +01:00
Andy Wilkinson bc8ab6c755 Merge branch '2.5.x' 
Closes gh-27362
 2021-07-16 09:43:55 +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 cdd80e660a Merge branch '2.5.x' into main 
Closes gh-27358
 2021-07-15 16:16:31 -07: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
Madhura Bhave e61b8707c1 Merge pull request #27355 from saraswathy-krish 
* pr/27355:
  Polish "Support comma-separated basePackage values in EntityScan"
  Support comma-separated basePackage values in EntityScan

Closes gh-27355
 2021-07-15 15:59:25 -07:00
Madhura Bhave 7bae960d78 Polish "Support comma-separated basePackage values in EntityScan" 
See gh-27355
 2021-07-15 15:42:42 -07:00
Saraswathy Hariharakrishnan 00b9a8811d Support comma-separated basePackage values in EntityScan 
See gh-27355
 2021-07-15 15:41:50 -07:00
Andy Wilkinson 66cedfa544 Merge branch '2.5.x' 2021-07-15 20:20:32 +01: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 3e0baf1bfd Merge branch '2.5.x' 
Closes gh-27353
 2021-07-15 19:45:32 +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 969ca71af3 Update version property for Prometheus to reflect its scope 
Closes gh-27350
 2021-07-15 19:31:49 +01:00
Andy Wilkinson 13fc16b29b Merge branch '2.5.x' 
Closes gh-27351
 2021-07-15 19:27:05 +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 800957e5a3 Upgrade to Spring HATEOAS 1.4.0-M1 
Closes gh-27185
 2021-07-15 17:05:00 +01:00
Andy Wilkinson 1b130c572c Remove dependency management for org.webjars:hal-browser 
Closes gh-26192
 2021-07-15 14:56:51 +01:00
Andy Wilkinson 6f0b23502e Merge branch '2.5.x' 
Closes gh-27347
 2021-07-15 11:51:48 +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 0e1191c061 Merge branch '2.5.x' 2021-07-15 10:06:22 +02:00
Stephane Nicoll 4acf48d2c7 Upgrade Ubuntu version in CI images 
Closes gh-27338
 2021-07-15 10:06:07 +02: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 a904c71a0a Merge branch '2.5.x' 2021-07-15 09:30:08 +02:00
Stephane Nicoll f119716cab Upgrade to Micrometer 1.8.0-M1 
Closes gh-27169
 2021-07-15 09:23:51 +02:00
Stephane Nicoll 2d71658ed1 Upgrade to MongoDB 4.3.0 
Closes gh-27344
 2021-07-15 09:05:27 +02:00
Stephane Nicoll 73647c395f Upgrade to Lettuce 6.1.4.RELEASE 
Closes gh-27343
 2021-07-15 09:05:26 +02:00
Stephane Nicoll 7ab316ea0e Merge branch '2.4.x' into 2.5.x 2021-07-15 09:02:06 +02:00