Commit Graph

14068 Commits

Author SHA1 Message Date
Scott Frederick a0b32251eb Split gradle test support into a separate module
See gh-25824
2021-07-16 12:52:39 -05:00
Andy Wilkinson d60191add2 Merge pull request #26258 from pirgeo
* gh-26258:
  Polish "Refine documentation"
  Refine documentation
  Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer"
  Add properties for Dynatrace metrics API v2 ingest with Micrometer

Closes gh-26258
2021-07-16 17:39:38 +01:00
Andy Wilkinson 21b3202ab2 Polish "Refine documentation"
See gh-26258
2021-07-16 17:17:57 +01:00
Georg Pirklbauer d0cd3ab1d3 Refine documentation
See gh-26258
2021-07-16 17:05:19 +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 25234219ce Merge branch '2.5.x'
Closes gh-27365
2021-07-16 11:51:43 +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 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
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc
See gh-27357
2021-07-15 16:14:55 -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
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 84455f86fd Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer" 2021-07-15 13:07:37 +01:00
Georg Pirklbauer 3161164912 Add properties for Dynatrace metrics API v2 ingest with Micrometer 2021-07-15 11:57:58 +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 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 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 e1049a55ff Avoid retrieving values from Record beyond session boundary
See gh-27294
2021-07-14 19:42:10 +01:00
Andy Wilkinson c00e885ac4 Work around compile warnings from Data Neo4j's use of API Guardian
See gh-27170
2021-07-14 18:28:24 +01:00
Andy Wilkinson 8540bc0d12 Polish restoration of ConfigFileApplicationListener
See gh-27303
2021-07-14 18:01:34 +01:00
Andy Wilkinson 9f9c89a357 Polish "Use server version from database in Neo4j health details"
See gh-27294
2021-07-14 17:40:43 +01:00
Gerrit Meier f7fd0ac527 Use server version from database in Neo4j health details
See gh-27294
2021-07-14 17:37:40 +01:00
Andy Wilkinson 8db63db564 Merge branch '2.5.x'
Closes gh-27333
2021-07-14 17:19:59 +01: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
Phillip Webb be5e8b3139 Restore ConfigFileApplicationListener in deprecated form
Restore `ConfigFileApplicationListener` in a deprecated form since
Spring Cloud need it. Scheduled removal is now in 3.0.0.

See gh-27303
2021-07-14 08:30:11 -07:00
Stephane Nicoll 36beca2c7d Add ERROR-level metadata for removed properties
See gh-27303
2021-07-14 14:58:52 +02:00