Stephane Nicoll
8e8910b2ff
Merge branch '2.0.x' into 2.1.x
2018-12-28 18:20:43 +01:00
Stephane Nicoll
06be9053f6
Merge pull request #15394 from hdeadman
...
* pr/15394:
Polish "Avoid NPE when replacement property does not exist"
Avoid NPE when replacement property does not exist
2018-12-28 18:20:21 +01:00
Stephane Nicoll
4cae2c9c94
Polish "Avoid NPE when replacement property does not exist"
...
Closes gh-15394
2018-12-28 18:19:12 +01:00
hdeadman
a1b71ef910
Avoid NPE when replacement property does not exist
...
See gh-15394
2018-12-28 15:34:23 +01:00
Stephane Nicoll
27a611f635
Restore reference to nutz third party starter
...
Closes gh-15564
2018-12-25 09:55:38 +01:00
Stephane Nicoll
3e9246ead4
Merge pull request #15562 from ewjmulder
...
* pr/15562:
Fix system properties override example
2018-12-24 16:39:35 +01:00
Erik Mulder
00763af335
Fix system properties override example
...
Closes gh-15562
2018-12-24 16:39:20 +01:00
Andy Wilkinson
83ce5dcee8
Add missing task output annotations to BootJar and BootWar
...
Closes gh-15488
2018-12-21 15:32:04 +00:00
Andy Wilkinson
3cfcc9e9a7
Merge pull request #15550 from Nishant Raut
...
* gh-15550:
Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
Stop JtaAutoConfiguration from enabling JtaProperties when not used
2018-12-21 15:12:41 +00:00
Andy Wilkinson
bfd63ab085
Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
...
Closes gh-15550
2018-12-21 15:12:29 +00:00
Nishant Raut
0b29da14b3
Stop JtaAutoConfiguration from enabling JtaProperties when not used
...
See gh-15550
2018-12-21 15:12:29 +00:00
Stephane Nicoll
6906859a60
Merge pull request #15536 from dreis2211
...
* pr/15536:
Polish javadoc of ConfigurableUndertowWebServerFactory method
2018-12-20 18:02:22 +01:00
dreis2211
9ffb4f69cd
Polish javadoc of ConfigurableUndertowWebServerFactory method
...
Closes gh-15536
2018-12-20 18:01:38 +01:00
Stephane Nicoll
51d3626c3b
Merge branch '2.0.x' into 2.1.x
2018-12-20 17:59:33 +01:00
Stephane Nicoll
8d0ad03b6d
Merge pull request #15473 from dreis2211
...
* pr/15473:
Optimize StringSequence
2018-12-20 17:59:19 +01:00
dreis2211
27e89bbb8a
Optimize StringSequence
...
Closes gh-15473
2018-12-20 17:55:30 +01:00
Stephane Nicoll
210d1f6d95
Merge pull request #15438 from igor-suhorukov
...
* pr/15438:
Polish "Fix StringSequence.equals() for different lengths"
Replace anonymous inner class with lambda
2018-12-20 17:53:00 +01:00
Stephane Nicoll
06989d884b
Polish "Fix StringSequence.equals() for different lengths"
...
Closes gh-15438
2018-12-20 17:52:18 +01:00
igor-suhorukov
e578d30722
Replace anonymous inner class with lambda
...
See gh-15438
2018-12-20 17:47:29 +01:00
Andy Wilkinson
3a7406fe3a
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson
84a064a7dc
Merge branch '2.0.x' into 2.1.x
2018-12-20 11:51:53 +00:00
Andy Wilkinson
6403ec6e1b
Revert "Upgrade to Netty 4.1.32.Final"
...
This reverts commit f9ce6c9dc2 .
See gh-15505
2018-12-20 11:49:33 +00:00
Andy Wilkinson
f89682eae7
Add dependency management for xmlunit-assertj and xmlunit-placeholders
...
Closes gh-15532
2018-12-20 10:49:04 +00:00
Andy Wilkinson
974c4bfdb3
Polish
2018-12-20 10:44:01 +00:00
Andy Wilkinson
cedcf157ab
Start building against Spring Session Bean-SR2 snapshots
...
See gh-15531
2018-12-20 10:22:44 +00:00
Andy Wilkinson
435b721051
Merge branch '2.0.x' into 2.1.x
2018-12-20 10:21:33 +00:00
Andy Wilkinson
0a1add7116
Start building against Spring Session Apple-SR8 snapshots
...
See gh-15530
2018-12-20 10:20:52 +00:00
Andy Wilkinson
e8862e3a4d
Merge branch '2.0.x' into 2.1.x
2018-12-20 10:15:19 +00:00
Andy Wilkinson
a8cd52f4bb
Merge branch '1.5.x' into 2.0.x
2018-12-20 10:15:13 +00:00
Andy Wilkinson
f8e8ee84ac
Start building against Spring Framework 4.3.22 snapshots
...
See gh-15529
2018-12-20 10:14:39 +00:00
Andy Wilkinson
ad489baaa3
Merge branch '2.0.x' into 2.1.x
2018-12-20 10:06:32 +00:00
Andy Wilkinson
658930acea
Start building against Spring Framework 5.0.12 snapshots
...
See gh-15528
2018-12-20 10:03:35 +00:00
Andy Wilkinson
d5c8caab59
Merge branch '1.5.x' into 2.0.x
2018-12-20 10:00:35 +00:00
Andy Wilkinson
aa9945c86c
Upgrade to Jetty 9.4.14.v20181114
...
Closes gh-15239
2018-12-20 09:54:44 +00:00
Andy Wilkinson
7b58f9a79e
Upgrade to Maven Jar Plugin 3.1.1
...
Closes gh-15518
2018-12-20 09:47:03 +00:00
Andy Wilkinson
7f80bae0d9
Upgrade to Maven Help Plugin 3.1.1
...
Closes gh-15517
2018-12-20 09:47:02 +00:00
Andy Wilkinson
525c6970eb
Upgrade to Jedis 2.9.1
...
Closes gh-15516
2018-12-20 09:47:02 +00:00
Andy Wilkinson
6d0e357613
Upgrade to Infinispan 9.4.5.Final
...
Closes gh-15515
2018-12-20 09:47:01 +00:00
Andy Wilkinson
f364439825
Upgrade to Flyway 5.2.4
...
Closes gh-15514
2018-12-20 09:47:00 +00:00
Andy Wilkinson
4d6e8ca205
Upgrade to Tomcat 9.0.14
...
Closes gh-15513
2018-12-20 09:46:59 +00:00
Andy Wilkinson
8abcf22f6a
Upgrade to Byte Buddy 1.9.6
...
Closes gh-15512
2018-12-20 09:46:58 +00:00
Andy Wilkinson
2c0eddd28a
Upgrade to Embedded Mongo 2.1.2
...
Closes gh-15511
2018-12-20 09:46:57 +00:00
Andy Wilkinson
2b0976a45f
Upgrade to Hazelcast 3.11.1
...
Closes gh-15510
2018-12-20 09:46:56 +00:00
Andy Wilkinson
bec7257508
Upgrade to Couchbase Client 2.7.2
...
Closes gh-15509
2018-12-20 09:46:55 +00:00
Andy Wilkinson
a6a7c95d65
Merge branch '2.0.x' into 2.1.x
2018-12-20 09:43:05 +00:00
Andy Wilkinson
86280f1db2
Upgrade to Jedis 2.9.1
...
Closes gh-15508
2018-12-20 09:40:46 +00:00
Andy Wilkinson
172a930e31
Upgrade to Jetty El 8.5.35.1
...
Closes gh-15507
2018-12-20 09:40:45 +00:00
Andy Wilkinson
5ede23226b
Upgrade to Elasticsearch 5.6.14
...
Closes gh-15506
2018-12-20 09:40:44 +00:00
Andy Wilkinson
f9ce6c9dc2
Upgrade to Netty 4.1.32.Final
...
Closes gh-15505
2018-12-20 09:40:43 +00:00