Commit Graph

27378 Commits

Author SHA1 Message Date
Andy Wilkinson
00a6d9098f Merge branch '2.3.x'
Closes gh-22191
2020-07-02 09:43:13 +01:00
Andy Wilkinson
f0b78fb3c4 Merge branch '2.2.x' into 2.3.x
Closes gh-22190
2020-07-02 09:42:50 +01:00
Andy Wilkinson
1410ef2911 Merge branch '2.1.x' into 2.2.x
Closes gh-22193
2020-07-02 09:42:03 +01:00
Andy Wilkinson
c9958c2ab4 Upgrade CI to Docker 19.03.12
Closes gh-22189
2020-07-02 09:39:13 +01:00
Andy Wilkinson
b6ceb56023 Update JDK 15 CI to use 2020-07-01-07-28
Closes gh-22192
2020-07-02 09:36:47 +01:00
Andy Wilkinson
d85774ea77 Merge branch '2.3.x'
Closes gh-22196
2020-07-02 09:32:11 +01:00
Andy Wilkinson
b9bfcdd4e9 Merge pull request #21921 from eddumelendez
* gh-21921:
  Reinstate metrics for Kafka Streams

Closes gh-21921
2020-07-01 14:03:24 +01:00
Eddú Meléndez
54e0a61b42 Reinstate metrics for Kafka Streams
See gh-21921
2020-07-01 14:03:11 +01:00
Andy Wilkinson
e1564edbee Merge branch '2.3.x' 2020-07-01 14:01:58 +01:00
Andy Wilkinson
d64337013f Upgrade to Spring Kafka 2.5.3.RELEASE
Closes gh-22185
2020-07-01 14:01:39 +01:00
Andy Wilkinson
c16b21f6ec Merge branch '2.3.x'
Closes gh-22184
2020-07-01 13:48:40 +01:00
Andy Wilkinson
f4cbdf556d Merge branch '2.2.x' into 2.3.x
Closes gh-22183
2020-07-01 13:48:27 +01:00
Andy Wilkinson
e44640de89 Merge branch '2.1.x' into 2.2.x
Closes gh-22182
2020-07-01 13:48:08 +01:00
Andy Wilkinson
25777360b2 Merge pull request #22110 from dreis2211
* gh-22110:
  Improve error handling in JDK upgrade checks

Closes gh-22110
2020-07-01 13:47:15 +01:00
dreis2211
24072bed96 Improve error handling in JDK upgrade checks
See gh-22110
2020-07-01 13:45:50 +01:00
Andy Wilkinson
00a9357624 Merge branch '2.3.x' 2020-07-01 11:52:33 +01:00
Andy Wilkinson
9360ba168b Upgrade to Reactor Dysprosium-SR9
Closes gh-21938
2020-07-01 11:51:54 +01:00
Andy Wilkinson
f3b273b09e Merge branch '2.2.x' into 2.3.x 2020-07-01 11:50:55 +01:00
Andy Wilkinson
a13acf9f2b Upgrade to Reactor Dysprosium-SR9
Closes gh-21937
2020-07-01 11:49:39 +01:00
Andy Wilkinson
160d8e49e3 Merge branch '2.3.x'
Closes gh-22180
2020-07-01 11:44:00 +01:00
Andy Wilkinson
9317135690 Improve error handling when builder image isn't a builder
Fixes gh-22179
2020-07-01 11:42:36 +01:00
Andy Wilkinson
9981f01a13 Merge pull request #21289 from filiphr
* gh-21289:
  Polish "Add properties to control exceptions ignored by LdapTemplate"
  Add properties to control exceptions ignored by LdapTemplate

Closes gh-21289
2020-07-01 10:03:53 +01:00
Andy Wilkinson
8c341df73b Polish "Add properties to control exceptions ignored by LdapTemplate"
See gh-21289
2020-07-01 10:03:34 +01:00
Filip Hrisafov
6853320661 Add properties to control exceptions ignored by LdapTemplate
See gh-21289
2020-07-01 09:33:39 +01:00
Andy Wilkinson
1710118f98 Merge pull request #22178 from dreis2211
* gh-22178:
  Remove redundant deprecation suppression

Closes gh-22178
2020-07-01 09:04:06 +01:00
dreis2211
20debcd471 Remove redundant deprecation suppression
See gh-22178
2020-07-01 09:03:28 +01:00
Andy Wilkinson
568f41e8e2 Merge branch '2.3.x'
Closes gh-22176
2020-06-30 17:40:02 +01:00
Andy Wilkinson
0e1ded6893 Merge branch '2.2.x' into 2.3.x
Closes gh-22175
2020-06-30 17:39:52 +01:00
Andy Wilkinson
500d2bd9de Merge pull request #22138 from dreis2211
* gh-22138:
  Accept empty filter dispatcher types in auto-configurations

Closes gh-22138
2020-06-30 17:39:44 +01:00
dreis2211
8c0e302f2e Accept empty filter dispatcher types in auto-configurations
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
2020-06-30 17:39:21 +01:00
Andy Wilkinson
6da52a0d08 Suggest iso-offset as value for WebFlux time and date-time properties
Closes gh-22174
2020-06-30 17:35:45 +01:00
Andy Wilkinson
c26b462255 Merge pull request #21630 from gaurav-91
* gh-21630:
  Polish "Support iso-offset for date-time and time formatting with MVC"
  Support iso-offset for date-time and time formatting with MVC

Closes gh-21630
2020-06-30 17:25:35 +01:00
Andy Wilkinson
9230ea4ab7 Polish "Support iso-offset for date-time and time formatting with MVC"
See gh-21630
2020-06-30 17:25:16 +01:00
Gaurav Pareek
c3b1172aea Support iso-offset for date-time and time formatting with MVC
See gh-21630
2020-06-30 17:05:17 +01:00
Andy Wilkinson
bb1a0ffbd5 Merge branch '2.3.x'
Closes gh-22173
2020-06-30 17:02:10 +01:00
Andy Wilkinson
4566ac5c25 Add package info to o.s.b.autoconfigure.elasticsearch.rest
Closes gh-22147
2020-06-30 17:01:21 +01:00
Andy Wilkinson
668d52eb3f Merge branch '2.3.x'
Closes gh-22172
2020-06-30 16:46:57 +01:00
Andy Wilkinson
48e607f4d2 Merge branch '2.2.x' into 2.3.x
Closes gh-22171
2020-06-30 16:46:30 +01:00
Andy Wilkinson
abeab73b2c Merge branch '2.1.x' into 2.2.x
Closes gh-22170
2020-06-30 16:45:46 +01:00
Andy Wilkinson
bca5ef4ac8 Merge pull request #22163 from XenoAmess
* gh-22163:
  Remove duplicated icon from git-repo-windows resource definition

Closes gh-22163
2020-06-30 16:25:44 +01:00
XenoAmess
89d4cda855 Remove duplicated icon from git-repo-windows resource definition
See gh-22163
2020-06-30 16:25:32 +01:00
Andy Wilkinson
4ea07f432d Merge branch '2.3.x'
Closes gh-22168
2020-06-30 14:13:07 +01:00
Andy Wilkinson
75fc140e2d Merge branch '2.2.x' into 2.3.x
Closes gh-22167
2020-06-30 14:09:57 +01:00
Andy Wilkinson
64aa418baa Merge pull request #22141 from im47cn
* gh-22141:
  Polish "Avoid NPE when binder is closed before started event"
  Avoid NPE when binder is closed before started event

Closes gh-22141
2020-06-30 14:09:42 +01:00
Andy Wilkinson
3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
2020-06-30 13:26:30 +01:00
im47cn
b34c268547 Avoid NPE when binder is closed before started event
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
2020-06-30 13:23:58 +01:00
Andy Wilkinson
62aa8ce107 Support incremental annotation processing with Gradle
Closes gh-22150
2020-06-30 11:27:32 +01:00
Andy Wilkinson
27c458ca26 Merge branch '2.3.x'
Closes gh-22160
2020-06-30 10:53:49 +01:00
Andy Wilkinson
f86831da9c Use TCCL at time of access for resource loading
Fixes gh-22119
2020-06-30 10:51:13 +01:00
Madhura Bhave
255f8197ab Merge branch '2.3.x'
Closes gh-22156
2020-06-29 17:09:05 -07:00