Commit Graph

6962 Commits

Author SHA1 Message Date
Andy Wilkinson
ddf64802c0 Merge branch '2.1.x' 2018-12-21 15:13:10 +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
igor-suhorukov
cbf6b330ba Simplify code by using Map computeIfAbsent
Closes gh-15543
2018-12-21 11:12:56 +01:00
dreis2211
3544ed045b Drop ContentContainingCondition in favor of Assertions.contentOf
Closes gh-15429
2018-12-20 18:05:56 +01:00
Stephane Nicoll
0d67f7ae9a Merge branch '2.1.x' 2018-12-20 18:02:46 +01:00
Stephane Nicoll
b039982273 Merge branch '2.0.x' into 2.1.x 2018-12-20 18:02:38 +01:00
dreis2211
9ffb4f69cd Polish javadoc of ConfigurableUndertowWebServerFactory method
Closes gh-15536
2018-12-20 18:01:38 +01:00
Stephane Nicoll
c948bdd14d Merge branch '2.1.x' 2018-12-20 17:59:46 +01:00
Stephane Nicoll
51d3626c3b Merge branch '2.0.x' into 2.1.x 2018-12-20 17:59:33 +01:00
dreis2211
27e89bbb8a Optimize StringSequence
Closes gh-15473
2018-12-20 17:55:30 +01:00
Stephane Nicoll
9d67400afa Merge branch '2.1.x' 2018-12-20 17:54:08 +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
9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882 Avoid blocking on a Mono indefinitely
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson
d8b487f127 Merge branch '2.1.x' 2018-12-20 11:52:03 +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
f3794d66e4 Merge branch '2.1.x' 2018-12-20 10:49:39 +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
b36bb78575 Merge branch '2.1.x' 2018-12-20 10:44:09 +00:00
Andy Wilkinson
974c4bfdb3 Polish 2018-12-20 10:44:01 +00:00
Andy Wilkinson
8cd387aea9 Merge branch '2.1.x' 2018-12-20 10:23:20 +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
0a1add7116 Start building against Spring Session Apple-SR8 snapshots
See gh-15530
2018-12-20 10:20:52 +00:00
Andy Wilkinson
c09a76d4c4 Merge branch '2.1.x' 2018-12-20 10:06:43 +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
f9591307d3 Upgrade to Webjars Locator Core 0.36
Closes gh-15527
2018-12-20 09:50:22 +00:00
Andy Wilkinson
c823817a7e Upgrade to Selenium 3.141.59
Closes gh-15526
2018-12-20 09:50:22 +00:00
Andy Wilkinson
5b101a8a81 Upgrade to Selenium Htmlunit 2.33.3
Closes gh-15525
2018-12-20 09:50:19 +00:00
Andy Wilkinson
47698e1812 Upgrade to Kafka 2.1.0
Closes gh-15524
2018-12-20 09:50:18 +00:00
Andy Wilkinson
9c84f9fc57 Upgrade to Rest Assured 3.2.0
Closes gh-15523
2018-12-20 09:50:17 +00:00
Andy Wilkinson
8aef2e50ea Upgrade to Prometheus Pushgateway 0.6.0
Closes gh-15522
2018-12-20 09:50:16 +00:00
Andy Wilkinson
dcf8c42f6f Upgrade to Embedded Mongo 2.2.0
Closes gh-15521
2018-12-20 09:50:15 +00:00
Andy Wilkinson
5d42d976e7 Upgrade to Rabbit Amqp Client 5.5.1
Closes gh-15520
2018-12-20 09:50:14 +00:00
Andy Wilkinson
754b42fd88 Upgrade to Hazelcast Hibernate5 1.3.0
Closes gh-15519
2018-12-20 09:50:13 +00:00
Andy Wilkinson
d00d7201c3 Merge branch '2.1.x' 2018-12-20 09:47:29 +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