Commit Graph

18022 Commits

Author SHA1 Message Date
Stephane Nicoll
382ea22759 Merge branch '1.5.x' into 2.0.x 2019-08-06 17:09:49 +02:00
Stephane Nicoll
10a5cef4ef Fixup version numbers following release 2019-08-06 17:09:26 +02:00
Spring Buildmaster
c71b661d79 Next Development Version 2019-08-06 06:38:07 +00:00
Stephane Nicoll
eb8332cb61 Merge branch '1.5.x' into 2.0.x 2019-08-05 16:33:27 +02:00
Stephane Nicoll
5cd091b5fd Upgrade to Mysql 5.1.48
Closes gh-17783
2019-08-05 16:33:02 +02:00
Stephane Nicoll
487774dce5 Upgrade to Spring AMQP 1.7.14
Closes gh-17640
2019-08-05 16:25:47 +02:00
Stephane Nicoll
23e2bd4bc9 Upgrade to Spring Integration 4.3.21
Closes gh-17642
2019-08-05 16:24:46 +02:00
Stephane Nicoll
02395a34d1 Merge branch '1.5.x' into 2.0.x 2019-08-05 13:42:03 +02:00
Stephane Nicoll
dbdab8bbfc Upgrade to Spring Data Ingalls-SR23
Closes gh-17352
2019-08-05 13:40:37 +02:00
Stephane Nicoll
bb55992432 Merge branch '1.5.x' into 2.0.x 2019-08-02 13:36:16 +02:00
Stephane Nicoll
ff5a0e7c22 Upgrade to Spring Framework 4.3.25
Closes gh-17221
2019-08-02 13:34:29 +02:00
Phillip Webb
e26777c014 Parameterize and increase CI task timeouts 2019-08-01 10:46:00 +01:00
Stephane Nicoll
b73b691a1f Merge branch '1.5.x' into 2.0.x 2019-07-29 14:10:21 +02:00
Stephane Nicoll
752efd66e8 Upgrade to Spring Security Oauth 2.0.18.RELEASE
Closes gh-17671
2019-07-29 13:12:20 +02:00
Stephane Nicoll
a37f571bbb Upgrade to Spring Security 4.2.13.RELEASE
Closes gh-17670
2019-07-29 13:12:19 +02:00
Stephane Nicoll
705551c485 Upgrade to Spring Cloud Connectors 1.2.9.RELEASE
Closes gh-17669
2019-07-29 13:12:19 +02:00
Stephane Nicoll
5537774a6c Upgrade to Jetty 9.4.19.v20190610
Closes gh-17668
2019-07-29 13:12:18 +02:00
Stephane Nicoll
ddf720eacd Upgrade to Tomcat 8.5.43
Closes gh-17667
2019-07-29 13:12:17 +02:00
Stephane Nicoll
ada1861be1 Upgrade to Httpclient 4.5.9
Closes gh-17666
2019-07-29 13:12:16 +02:00
Stephane Nicoll
55b0c0911d Upgrade to Appengine Sdk 1.9.76
Closes gh-17665
2019-07-29 13:12:15 +02:00
Stephane Nicoll
5ae47d914f Merge branch '1.5.x' into 2.0.x 2019-07-26 14:04:48 +02:00
Stephane Nicoll
b2188ae2a0 Start building against Spring Data Ingalls snapshots
See gh-17352
2019-07-26 14:03:44 +02:00
Stephane Nicoll
c6be8d49ab Start building against Spring Integration 4.3.21 snapshots
See gh-17642
2019-07-26 13:58:17 +02:00
Stephane Nicoll
634de5e8e5 Start building against Spring AMQP 1.7.14 snapshots
See gh-17640
2019-07-26 13:56:53 +02:00
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
ff36074401 Update copyright header for changed files
Effectively all files have been touched this year due to the nohttp
work.
2019-07-24 11:37:23 +01:00
Phillip Webb
fd67f7ba3f Merge branch '1.5.x' into 2.0.x 2019-07-17 21:47:04 +01:00
Phillip Webb
8843c11a28 Update copyright header of changed files 2019-07-17 21:44:01 +01:00
Andy Wilkinson
0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson
b7884b50f6 Merge pull request #16894 from gavvvr
* gh-16894:
  Fix persistent session property name in reference docs

Closes gh-16894
2019-07-01 15:54:43 +01:00
Kirill Gavrilov
c1bf04c66f Fix persistent session property name in reference docs
See gh-16894
2019-07-01 15:54:13 +01:00
Andy Wilkinson
1823f38203 Merge branch '1.5.x' into 2.0.x 2019-07-01 14:08:49 +01:00
Andy Wilkinson
bf271e415a Align print margin column with Java Format's line wrapping
Closes gh-17377
2019-07-01 14:08:14 +01:00
Andy Wilkinson
761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Andy Wilkinson
f9bd472192 Polish upgrade to spring-javaformat 0.0.15
See gh-17359
2019-06-29 20:27:47 +01:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
d91f27e11f Fix Javadoc @Since checkstle violations
Apply consistent `@Since` tags and retrofit the existing code using a
best guess from the git history.

Closes gh-17360
2019-06-28 22:41:15 -07:00
Phillip Webb
4f079803d2 Merge branch '1.5.x' into 2.0.x
Closes gh-17359
2019-06-28 21:29:20 -07:00
Phillip Webb
dc5c5702f8 Enforce stricter javadoc @Since rules
See gh-17360
2019-06-28 21:16:27 -07:00
Phillip Webb
9433ad2222 Ignore SpringMethodVisibility check
Ignore the new `SpringMethodVisibility` on released versions since
the required changes can introduce subtle bugs.

See gh-17359
2019-06-28 21:15:01 -07:00
Phillip Webb
b0fffbe42e Upgrade to spring-javaformat 0.0.15
Closes gh-17359
2019-06-28 21:14:00 -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
Phillip Webb
6d01bc915b Make intermediate classes of public classes public
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.

Closes gh-17337
2019-06-28 12:18:07 -07:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson
1ee8c53b90 Upgrade to spring-javaformat 0.0.14
Closes gh-17331
2019-06-27 11:10:13 +01:00
Andy Wilkinson
57bc03ac57 Merge branch '1.5.x' into 2.0.x 2019-06-27 10:22:02 +01:00
Andy Wilkinson
4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson
72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression
Closes gh-15200
2019-06-26 17:31:00 +01:00
Andy Wilkinson
0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it
Closes gh-17317
2019-06-26 17:31:00 +01:00