Commit Graph

33231 Commits

Author SHA1 Message Date
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
Stephane Nicoll 6f4d8449be Initiate layers-2.6
See gh-27326
2021-07-14 14:48:23 +02:00
Stephane Nicoll b393031dbe Merge branch '2.5.x'
Closes gh-27326
2021-07-14 14:45:52 +02:00
Andy Wilkinson c406dda181 Deprecate AbstractDataSourceInitializer
Closes gh-27206

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-07-14 13:39:14 +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 9b1e327cb6 Merge branch '2.5.x' 2021-07-14 14:16:32 +02:00
Stephane Nicoll 00afe3619c Upgrade to Spring Framework 5.3.9
Closes gh-27168
2021-07-14 14:16:18 +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 dc5acb0019 Remove deprecated code flagged for removal
Closes gh-27303
2021-07-14 11:50:01 +02:00
Stephane Nicoll 46ad4c6f98 Merge branch '2.5.x' 2021-07-14 07:59:38 +02:00
Stephane Nicoll f19e772d93 Upgrade to Kotlin 1.5.21
Closes gh-27318
2021-07-14 07:38:55 +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 111ea31036 Merge branch '2.5.x' into main 2021-07-13 15:19:24 -07: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 06e08e9fb5 Pass required settings into RabbitTemplateConfigurer's constructor
Closes gh-27313
2021-07-13 18:19:27 +01:00
Andy Wilkinson e6141c04f6 Pass required settings into Rabbit LCF configurer's constructor
Closes gh-27311
2021-07-13 18:17:07 +01:00
Andy Wilkinson 659667bb65 Merge pull request #26982 from bono007
* gh-26982:
  Polish "Add Rabbit connection factory configurers"
  Add Rabbit connection factory configurers

Closes gh-26982
2021-07-13 17:45:06 +01:00
Andy Wilkinson 2c8658c24f Polish "Add Rabbit connection factory configurers"
See gh-26982
2021-07-13 17:44:56 +01:00
bono007 a96b3ef101 Add Rabbit connection factory configurers
See gh-26982
2021-07-13 17:44:56 +01:00
Andy Wilkinson a5ec7560f5 Merge branch '2.5.x'
Closes gh-27314
2021-07-13 17:42:54 +01: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 9ccd6a6f2f Merge branch '2.5.x'
Closes gh-27307
2021-07-13 15:56:32 +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 9b43f8880d Merge pull request #26961 from mikouaj
* gh-26961:
  Polish "Add resource labels to Stackdriver metrics configuration properties"
  Add resource labels to Stackdriver metrics configuration properties

Closes gh-26961
2021-07-13 15:02:59 +01:00
Andy Wilkinson 75fdd89be4 Polish "Add resource labels to Stackdriver metrics configuration properties"
See gh-26961
2021-07-13 15:02:42 +01:00
Mikolaj Stefaniak 4e3958e5aa Add resource labels to Stackdriver metrics configuration properties
Using resource labels is mandatory for most Stackdriver resources other
than 'Global', i.e. k8s_pod. Configuring valid resource type along with
related labels makes it possible to use given metric in a wider set of
GCP solutions, i.e. custom metric based GKE pod horizontal autoscaler.

See gh-26961
2021-07-13 15:02:22 +01:00
Andy Wilkinson 9b82836f0e Merge branch '2.5.x'
Closes gh-27305
2021-07-13 14:56:36 +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 4f3fdaed81 Merge pull request #26418 from bono007
* gh-26418:
  Polish "Auto-configure Jetty connection and SSL metrics"
  Auto-configure Jetty connection and SSL metrics

Closes gh-26418
2021-07-13 14:01:23 +01:00
Andy Wilkinson d21f8df1ad Polish "Auto-configure Jetty connection and SSL metrics"
See gh-26418
2021-07-13 14:01:15 +01:00
bono007 e6c43a32c8 Auto-configure Jetty connection and SSL metrics
See gh-26418
2021-07-13 14:01:15 +01:00
Andy Wilkinson c36476ed16 Merge branch '2.5.x'
Closes gh-27167
2021-07-13 13:59:03 +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