Commit Graph

33465 Commits

Author SHA1 Message Date
Andy Wilkinson
ac668dd813 Merge branch '2.5.x' 2021-07-19 11:36:00 +01:00
Andy Wilkinson
b354188bd8 Upgrade to Spring Data 2021.0.3
Closes gh-27164
2021-07-19 11:15:11 +01:00
Andy Wilkinson
6c8e040089 Upgrade to Netty 4.1.66.Final
Closes gh-27390
2021-07-19 11:13:59 +01:00
Andy Wilkinson
ff31dffb0b Upgrade to jOOQ 3.14.13
Closes gh-27389
2021-07-19 11:13:58 +01:00
Andy Wilkinson
67739d9126 Upgrade to Jetty Reactive HTTPClient 1.1.10
Closes gh-27388
2021-07-19 11:13:56 +01:00
Andy Wilkinson
db6ab63a38 Upgrade to Jedis 3.6.2
Closes gh-27387
2021-07-19 11:13:55 +01:00
Andy Wilkinson
f6e4e0b299 Upgrade to Infinispan 12.1.7.Final
Closes gh-27386
2021-07-19 11:13:54 +01:00
Andy Wilkinson
b4c3d00bd0 Upgrade to Dropwizard Metrics 4.1.25
Closes gh-27385
2021-07-19 11:13:52 +01:00
Andy Wilkinson
0ffafae375 Upgrade to AppEngine SDK 1.9.90
Closes gh-27384
2021-07-19 11:13:51 +01:00
Andy Wilkinson
0d1d637c73 Merge branch '2.5.x'
Closes gh-27383
2021-07-19 11:07:58 +01:00
Andy Wilkinson
c9ccfcc25f Rework Jetty10Http2OverTlsTests so they compile with Java 8
Closes gh-27382
2021-07-19 11:06:58 +01:00
Andy Wilkinson
91471440eb Merge branch '2.5.x' 2021-07-19 10:49:14 +01:00
Andy Wilkinson
46b3d1e47b Merge branch '2.4.x' into 2.5.x 2021-07-19 10:48:31 +01:00
Andy Wilkinson
3e0829cd47 Upgrade to Spring Data 2020.0.11
Closes gh-27161
2021-07-19 10:30:49 +01:00
Andy Wilkinson
d8959f4bb2 Upgrade to Netty 4.1.66.Final
Closes gh-27381
2021-07-19 10:30:49 +01:00
Andy Wilkinson
47afdc0218 Upgrade to jOOQ 3.14.13
Closes gh-27379
2021-07-19 10:20:14 +01:00
Andy Wilkinson
f8e3d86223 Upgrade to Dropwizard Metrics 4.1.25
Closes gh-27378
2021-07-19 10:20:12 +01:00
Andy Wilkinson
1d3b0d6262 Upgrade to AppEngine SDK 1.9.90
Closes gh-27377
2021-07-19 10:20:11 +01:00
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
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