Commit Graph

18022 Commits

Author SHA1 Message Date
Phillip Webb
32068c21a3 Polish resource files to all end with a new line 2019-06-03 23:48:43 -07:00
Andy Wilkinson
eb9ffd5e7e Merge branch '1.5.x' into 2.0.x 2019-05-21 10:57:53 +01:00
Andy Wilkinson
3cee783d7b Remove dependency management for jetty-infinispan
Closes gh-16925
2019-05-21 10:56:43 +01:00
Stephane Nicoll
7d204d2354 Merge branch '1.5.x' into 2.0.x 2019-05-14 15:44:06 +02:00
Stephane Nicoll
6b3c15a858 Fixup version numbers following release 2019-05-14 15:43:47 +02:00
Spring Buildmaster
67fa63d0e3 Next Development Version 2019-05-14 08:21:02 +00:00
Stephane Nicoll
751a58d7b8 Merge branch '1.5.x' into 2.0.x 2019-05-14 08:08:00 +02:00
Stephane Nicoll
8d8d4d891a Upgrade to Groovy 2.4.17
Closes gh-16836
2019-05-14 08:04:04 +02:00
Stephane Nicoll
fc3fd6476b Upgrade to Spring Data Ingalls-SR22
Closes gh-16748
2019-05-14 08:03:00 +02:00
Stephane Nicoll
d57bf46575 Merge branch '1.5.x' into 2.0.x 2019-05-10 17:02:34 +02:00
Stephane Nicoll
b07267b185 Upgrade to Spring Data Ingalls-SR21
Closes gh-16748
2019-05-10 16:52:56 +02:00
Stephane Nicoll
2f17960e20 Merge branch '1.5.x' into 2.0.x 2019-05-09 18:12:36 +02:00
Stephane Nicoll
9ff7d26796 Upgrade to Spring Framework 4.3.24
Closes gh-16759
2019-05-09 18:12:00 +02:00
Stephane Nicoll
c814c508fa Merge branch '1.5.x' into 2.0.x 2019-05-09 09:39:34 +02:00
Stephane Nicoll
e68db7764e Upgrade to Jetty 9.4.18.v20190429
Closes gh-16761
2019-05-09 09:26:06 +02:00
Stephane Nicoll
9897cd64c4 Merge branch '1.5.x' into 2.0.x 2019-05-09 08:56:02 +02:00
Stephane Nicoll
0ad8e3298a Upgrade to Jaybird 2.2.15
Closes gh-16762
2019-05-09 08:47:04 +02:00
Stephane Nicoll
dabc73c7ac Upgrade to Jetty 9.4.16.v20190411
Closes gh-16761
2019-05-09 08:47:04 +02:00
Stephane Nicoll
dcb5c78124 Upgrade to Appengine Sdk 1.9.74
Closes gh-16760
2019-05-09 08:47:02 +02:00
Stephane Nicoll
c3ea39ce63 Upgrade to Tomcat 8.5.40
Closes gh-16504
2019-05-09 08:45:59 +02:00
Stephane Nicoll
e6deac1fd2 Start building against Spring Framework 4.3.x snapshots
See gh-16759
2019-05-09 08:41:10 +02:00
Stephane Nicoll
ac9ee952c7 Properly merge fix
See gh-16666
2019-04-26 11:52:25 +03:00
Stephane Nicoll
5963542f18 Merge branch '1.5.x' into 2.0.x 2019-04-26 11:49:26 +03:00
Stephane Nicoll
0552113c98 Merge pull request #16666 from Tetsuya3850
* pr/16666:
  Fix broken link
2019-04-26 11:44:51 +03:00
Tetsuya Hasegawa
5b3e53835e Fix broken link
Closes gh-16666
2019-04-26 11:44:02 +03:00
Andy Wilkinson
3e3d7545cc Merge branch '1.5.x' into 2.0.x 2019-04-24 10:01:50 +01:00
Andy Wilkinson
de0e065da2 Use AdoptOpenJDK for Ubuntu launch script integration tests
Closes gh-16633
2019-04-24 09:59:43 +01:00
Andy Wilkinson
7260c0f2c4 Merge branch '1.5.x' into 2.0.x 2019-04-16 15:46:49 +01:00
Andy Wilkinson
c11e847d6c Fix syntax highlighting in the reference documentation
Closes gh-16548
2019-04-16 15:46:16 +01:00
Spring Buildmaster
8e3cbd9a2f Next development version (v2.0.10.BUILD-SNAPSHOT) 2019-04-03 15:04:03 +00:00
Stephane Nicoll
1421ca7612 Polish 2019-04-03 13:12:37 +02:00
Stephane Nicoll
dd1bdea048 Merge branch '1.5.x' into 2.0.x 2019-04-03 12:57:35 +02:00
Stephane Nicoll
0d256da068 Fixup version numbers following release 2019-04-03 12:56:41 +02:00
Andy Wilkinson
1db848af0d Upgrade to Solr 6.6.6
Closes gh-16428
2019-04-03 11:38:16 +01:00
Spring Buildmaster
ca3a864565 Next Development Version 2019-04-03 10:34:44 +00: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
Andy Wilkinson
0f27b1a65e Verify entry output location when extracting zip
Closes gh-16028
2019-04-03 09:48:56 +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
Andy Wilkinson
30bba53a1f Upgrade to Httpclient 4.5.8
Closes gh-16424
2019-04-03 08:30:36 +01:00
Andy Wilkinson
8a4e206e85 Upgrade to Spring Integration 4.3.20
Closes gh-16348
2019-04-03 08:29:44 +01:00
Andy Wilkinson
efc030adf3 Upgrade to Spring Security 4.2.12
Closes gh-16352
2019-04-03 08:28:54 +01:00
Phillip Webb
8c2e0a61ae Merge branch '1.5.x' into 2.0.x 2019-04-02 20:48:00 -07:00
Phillip Webb
f25469c95f Update formatting with spring-javaformat 0.0.9
See gh-16421
2019-04-02 20:43:36 -07:00
Phillip Webb
cae6a82322 Upgrade to spring-javaformat 0.0.9
Closes gh-16421
2019-04-02 20:34:35 -07:00
Phillip Webb
f875b74e67 Reformat samples with spring-javaformat 0.0.8
See gh-16418
2019-04-02 19:39:23 -07:00
Phillip Webb
07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Phillip Webb
2ff74b1559 Reformat code with spring-javaformat 0.0.8
See gh-16418
2019-04-02 13:30:25 -07:00