Commit Graph

27342 Commits

Author SHA1 Message Date
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
Madhura Bhave
f19f2b8714 Merge branch '2.2.x' into 2.3.x
Closes gh-22155
2020-06-29 17:08:37 -07:00
Madhura Bhave
9c732fa2b6 Merge pull request #22082 from thenx-wei
* pr/22082:
  Simplify logic in ErrorPage's equals method

Closes gh-22082
2020-06-29 17:08:05 -07:00
May
c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
2020-06-29 17:06:49 -07:00
Madhura Bhave
7de3d079f2 Merge branch '2.3.x' 2020-06-29 16:42:06 -07:00
Madhura Bhave
affb2da07a Merge branch '2.2.x' into 2.3.x 2020-06-29 16:41:26 -07:00
Madhura Bhave
67060731bc Merge branch '2.1.x' into 2.2.x 2020-06-29 16:40:59 -07:00
Madhura Bhave
4a55a414e7 Fix typo 2020-06-29 16:40:24 -07:00
Madhura Bhave
75abb9cc18 Merge branch '2.3.x'
Closes gh-22153
2020-06-29 16:36:25 -07:00
Madhura Bhave
550ff443df Merge pull request #22090 from izeye
* pr/22090:
  Polish

Closes gh-22090
2020-06-29 16:35:43 -07:00
Johnny Lim
43aee1bddd Polish
See gh-22090
2020-06-29 16:35:23 -07:00
Madhura Bhave
a963bba0e4 Merge branch '2.3.x' 2020-06-29 16:29:32 -07:00
Madhura Bhave
62f5e44324 Fix typo 2020-06-29 16:29:09 -07:00
Madhura Bhave
fbf2beef6e Merge branch '2.3.x'
Closes gh-22152
2020-06-29 16:26:30 -07:00
Madhura Bhave
7a81cea513 Update layers.idx file example in docs
Fixes gh-21510
2020-06-29 16:25:23 -07:00
Andy Wilkinson
8436fa9159 Make spring-boot -dependencies and -parent available
See gh-22066
2020-06-29 14:46:10 +01:00
Andy Wilkinson
d33a01a13f Only create effective bom artifact when needed
Closes gh-22143
2020-06-29 13:39:54 +01:00
Andy Wilkinson
c000ccdaea Upgrade to Spring Session 2020.0.0-M1
Closes gh-21928
2020-06-29 10:02:13 +01:00
Andy Wilkinson
1a93066116 Merge pull request #22125 from lndobryden
* gh-22125:
  Polish "Add StatsD transport protocol configuration option"
  Add StatsD transport protocol configuration option

Closes gh-22125
2020-06-29 09:58:32 +01:00
Andy Wilkinson
77eb5f7794 Polish "Add StatsD transport protocol configuration option"
See gh-22125
2020-06-29 09:47:17 +01:00
Lee Dobryden
5d41f60e45 Add StatsD transport protocol configuration option
See gh-22125
2020-06-29 09:47:08 +01:00
Andy Wilkinson
5de67e9b06 Merge pull request #22120 from kedar-joshi
* gh-22120:
  Upgrade to Flyway 6.5.0 and support createSchemas

Closes gh-22120
2020-06-29 09:41:54 +01:00
Kedar Joshi
6c29b29bd5 Upgrade to Flyway 6.5.0 and support createSchemas
See gh-22120
2020-06-29 09:40:16 +01:00
Andy Wilkinson
f6400e95ee Switch to a RuntimeException as NPE has a message on Java 15
Closes gh-22136
2020-06-27 09:31:39 +01:00
Andy Wilkinson
12add61504 Upgrade to WebJars Locator Core 0.46
Closes gh-22135
2020-06-26 23:27:45 +01:00
Andy Wilkinson
9d7cea0286 Upgrade to Spring Kafka 2.5.3.RELEASE
Closes gh-22134
2020-06-26 23:27:45 +01:00
Andy Wilkinson
872ccddd52 Upgrade to Oracle Database 19.7.0.0
Closes gh-22133
2020-06-26 23:27:44 +01:00
Andy Wilkinson
c91565b412 Upgrade to Micrometer 1.5.2
Closes gh-22132
2020-06-26 23:23:45 +01:00
Andy Wilkinson
ee5e35f3fd Upgrade to MariaDB 2.6.1
Closes gh-22131
2020-06-26 23:23:43 +01:00
Andy Wilkinson
8c974c0480 Upgrade to Jackson Bom 2.11.1
Closes gh-22130
2020-06-26 23:23:42 +01:00
Andy Wilkinson
d2a53e4811 Upgrade to Hazelcast 3.12.8
Closes gh-22129
2020-06-26 23:23:40 +01:00
Andy Wilkinson
46b10fd46f Upgrade to Spring AMQP 2.3.0-M1
Closes gh-22127
2020-06-26 23:11:25 +01:00
Andy Wilkinson
c18896ed5a Upgrade to Spring Batch 4.3.0-M1
Closes gh-22126
2020-06-26 23:11:25 +01:00
Andy Wilkinson
7c1a8c1041 Drop back to Spring Security 5.4.0-M1
See gh-21932
2020-06-26 23:11:25 +01:00
Andy Wilkinson
742ac877c6 Upgrade to Spring Integration 5.4.0-M1
Closes gh-21931
2020-06-26 22:45:26 +01:00
Scott Frederick
a73af52496 Merge branch '2.3.x'
Closes gh-22121
2020-06-26 11:51:45 -05:00
Scott Frederick
9a083584b8 Improve validation of layertools input
This commit improves the validation performed on the user
input provided to the layertools jarmode to provide more
clear error messages when the input is not correct and
reduce the chance of ambiguity.

Fixes gh-22042
2020-06-26 11:51:07 -05:00