Commit Graph

2760 Commits

Author SHA1 Message Date
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
fd67f7ba3f Merge branch '1.5.x' into 2.0.x 2019-07-17 21:47:04 +01:00
Andy Wilkinson
0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson
761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
ed3e1e076d Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson
4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Stephane Nicoll
11dee3c0d8 Merge branch '1.5.x' into 2.0.x 2019-06-19 15:27:49 +02:00
Andy Wilkinson
4bae91d933 Merge branch '1.5.x' into 2.0.x 2019-06-14 15:47:22 +01:00
Andy Wilkinson
4828c19f8f Merge branch '1.5.x' into 2.0.x 2019-06-14 12:00:45 +01:00
Phillip Webb
2c8881a908 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:34:13 -07:00
Andy Wilkinson
c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb
7fc01971ed Merge branch '1.5.x' into 2.0.x 2019-06-04 14:20:25 -07:00
Phillip Webb
b442d3b906 Merge branch '1.5.x' into 2.0.x 2019-06-04 01:49:03 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Stephane Nicoll
ac9ee952c7 Properly merge fix
See gh-16666
2019-04-26 11:52:25 +03:00
Andy Wilkinson
7260c0f2c4 Merge branch '1.5.x' into 2.0.x 2019-04-16 15:46:49 +01:00
Andy Wilkinson
1db848af0d Upgrade to Solr 6.6.6
Closes gh-16428
2019-04-03 11:38:16 +01:00
Stephane Nicoll
3fb8d504c5 Upgrade to Spring Batch 4.0.3
Closes gh-16422
2019-04-03 12:04:40 +02:00
Andy Wilkinson
bfe65c8a5c Merge branch '1.5.x' into 2.0.x 2019-04-03 09:52:28 +01:00
Stephane Nicoll
03762d5a96 Upgrade to Spring Session Apple-SR9
Closes gh-16356
2019-04-03 10:10:27 +02:00
Stephane Nicoll
1acc3d7161 Upgrade to Spring Integration 5.0.13
Closes gh-16349
2019-04-03 10:07:29 +02:00
Andy Wilkinson
49423645f7 Merge branch '1.5.x' into 2.0.x 2019-04-03 08:32:11 +01:00
Phillip Webb
8c2e0a61ae Merge branch '1.5.x' into 2.0.x 2019-04-02 20:48:00 -07:00
Phillip Webb
07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Andy Wilkinson
da4a7203c7 Upgrade to Spring Security 5.0.12
Closes gh-16353
2019-04-02 19:45:35 +01:00
Andy Wilkinson
7b5f46d6e3 Add Spring-Boot-* manifest attributes to jars and wars built with Gradle
Closes gh-16068
2019-04-02 10:13:09 +01:00
Andy Wilkinson
336af93c7e Update to Spring AMQP 2.0.12
Closes gh-16346
2019-04-02 09:44:22 +01:00
Andy Wilkinson
f4942b76f0 Upgrade to Spring Data Kay-SR14
Closes gh-16359
2019-04-02 09:33:28 +01:00
Andy Wilkinson
922ab115ab Switch custom repository to one with JDK 9-friendly SSL certification chain 2019-04-01 14:07:01 +01:00
Andy Wilkinson
2adb6b1fa4 Override version of Maven Site Plugin for JDK 9+181 compatibility
See gh-16400
2019-04-01 11:53:31 +01:00
Stephane Nicoll
695dc8e992 Switch to snapshots 2019-03-31 19:37:43 +02:00
Stephane Nicoll
165b9d950a Upgrade to Spring Framework 5.0.13.RELEASE
Closes gh-16339
2019-03-31 15:26:57 +02:00
Andy Wilkinson
7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll
28b38ddc9a Upgrade to Reactor Bom Bismuth-SR17
Closes gh-16372
2019-03-29 14:15:40 +01:00
Stephane Nicoll
4c1186cbd8 Merge branch '1.5.x' into 2.0.x 2019-03-29 14:12:52 +01:00
Stephane Nicoll
1a89087a87 Upgrade to Thymeleaf Extras Java8time 3.0.4.RELEASE
Closes gh-16378
2019-03-29 13:27:15 +01:00
Stephane Nicoll
7cff82647d Upgrade to Spring Cloud Connectors 2.0.5.RELEASE
Closes gh-16377
2019-03-29 13:27:15 +01:00
Stephane Nicoll
e3e290e959 Upgrade to Quartz 2.3.1
Closes gh-16376
2019-03-29 13:27:15 +01:00
Stephane Nicoll
9ab942c54c Upgrade to Hibernate Validator 6.0.16.Final
Closes gh-16375
2019-03-29 13:27:15 +01:00
Stephane Nicoll
8c85f1a141 Upgrade to Elasticsearch 5.6.16
Closes gh-16374
2019-03-29 13:27:15 +01:00
Stephane Nicoll
f7d2cc6aa7 Upgrade to Activemq 5.15.9
Closes gh-16373
2019-03-29 13:27:15 +01:00
Stephane Nicoll
49f2d1bd3e Upgrade to Netty 4.1.34.Final
Closes gh-16371
2019-03-29 13:23:25 +01:00
Stephane Nicoll
ca9afa7b55 Upgrade to Micrometer 1.0.10
Closes gh-16370
2019-03-29 13:23:24 +01:00
Stephane Nicoll
c88bfed669 Upgrade to Unboundid Ldapsdk 4.0.10
Closes gh-16369
2019-03-29 13:23:23 +01:00
Andy Wilkinson
6507d1723d Merge branch '1.5.x' into 2.0.x 2019-03-29 11:02:56 +00:00
Andy Wilkinson
be32421b86 Merge branch '1.5.x' into 2.0.x 2019-03-28 15:55:32 +00:00
Andy Wilkinson
14b21026bf Polish "Use HTTPS for external links wherever possible"
See gh-16319
2019-03-28 09:17:50 +00:00