Commit Graph

4730 Commits

Author SHA1 Message Date
Stephane Nicoll 342212b8dc Merge branch '2.1.x' 2019-01-28 10:08:02 +01:00
Stephane Nicoll 6f86a84301 Polish "Alias auto-configured `TaskExecutor` to make async tasks use it"
Closes gh-15748
2019-01-28 10:04:30 +01:00
Camille Vienot d0859f1569 Alias auto-configured `TaskExecutor` to make async tasks use it
See gh-15748
2019-01-28 09:59:55 +01:00
Stephane Nicoll a6815bb2c9 Merge branch '2.1.x' 2019-01-25 10:45:26 +01:00
Vedran Pavic d7550d73a3 Remove duplicate code from HealthWebEndpointResponseMapper
Closes gh-15784
2019-01-25 10:38:16 +01:00
Andy Wilkinson babe98f064 Merge branch '2.1.x' 2019-01-22 11:54:05 +00:00
Andy Wilkinson a172e146de Polish "Always fail fast when SSL is enabled without a key store"
Closes gh-15709
2019-01-22 11:51:29 +00:00
Raheela 62c8ac6ee8 Always fail fast when SSL is enabled without a key store
See gh-15709
2019-01-22 11:50:19 +00:00
Andy Wilkinson 2cb147af7c Merge branch '2.1.x' 2019-01-22 09:22:17 +00:00
Andy Wilkinson e15e140f8c Polish "Fix typos in JsonContentAssert failure messages"
See gh-15752
2019-01-22 09:19:41 +00:00
Johnny Lim 3744082996 Fix typos in JsonContentAssert failure messages
Closes gh-15752
2019-01-22 09:19:25 +00:00
Andy Wilkinson f23a0a5969 Inject InfoContributorProperties more precisely
Closes gh-15750
2019-01-21 16:56:39 +00:00
Andy Wilkinson 530c7bee71 Do not auto-configure HttpMessageConverters in reactive web apps
Closes gh-15712
2019-01-18 14:57:14 -05:00
Andy Wilkinson 6abd18ae96 Do not auto-configure RestTemplateBuilder in reactive web apps
Closes gh-15718
2019-01-18 14:50:24 -05:00
Andy Wilkinson 5d60d6bd62 Use ApplicationContextRunner to test RestTemplateAutoConfiguration 2019-01-18 14:36:18 -05:00
Andy Wilkinson 7dd65074e8 Only perform background pre-init with multiple processors
Closes gh-15722
2019-01-18 11:50:17 -05:00
Stephane Nicoll 32b14f3098 Merge branch '2.1.x' 2019-01-17 16:15:32 -05:00
Stephane Nicoll f0a20b1821 Polish contribution
Closes gh-15733
2019-01-17 16:14:15 -05:00
NAIT BELKACEM 6a0053c8bc Fix typo
See gh-15733
2019-01-17 16:11:11 -05:00
Michael McFadyen 9eeeebcd53 Update 'HTTP Client Metrics' reference documentation
Since gh-#5594, the 'outcome' tag has been introduced for
HTTP clients. This commit updates the reference documentation
accordingly.

Closes gh-15725
2019-01-17 12:14:42 -05:00
Stephane Nicoll cea6a79e49 Merge branch '2.1.x' 2019-01-17 10:58:55 -05:00
Stephane Nicoll 708ca0636f Clarify that Spring Boot uses the platform MBeanServer by default
Closes gh-15728
2019-01-17 10:58:08 -05:00
Stephane Nicoll 33f2bd4d61 Merge branch '2.1.x' 2019-01-14 08:13:37 -05:00
Stephane Nicoll 485bdc9901 Polish "Remove redundant interface modifiers"
Closes gh-15694
2019-01-14 08:13:08 -05:00
igor-suhorukov 2d873c78fe Remove redundant interface modifiers
See gh-15694
2019-01-14 08:12:41 -05:00
Stephane Nicoll 6baa6b291e Polish contribution
Closes gh-15695
2019-01-14 08:11:20 -05:00
Johnny Lim af3ed9ff9f Polish
See gh-15695
2019-01-14 08:09:32 -05:00
Phillip Webb 2f77ef7722 Merge branch '2.1.x' 2019-01-11 16:45:05 -08:00
Phillip Webb 72400d3a96 Upgrade to Spring Batch 4.1.1
Closes gh-15659
2019-01-11 16:43:35 -08:00
Phillip Webb 9e58942698 Update copyright year for changed files 2019-01-11 16:42:02 -08:00
Phillip Webb 6a901199f5 Polish 2019-01-11 16:42:02 -08:00
Andy Wilkinson 023c7159ac Upgrade to Spring Batch 4.0.2.RELEASE
Closes gh-15658
2019-01-11 16:21:35 +00:00
Andy Wilkinson d22e43aefb Merge branch '2.1.x' 2019-01-11 16:07:18 +00:00
Andy Wilkinson f0141dadab Revert "Upgrade to Glassfish Jaxb 2.3.2"
This reverts commit 6b952f5b65.

See gh-15689
2019-01-11 16:07:03 +00:00
Andy Wilkinson f8de67e6e9 Merge branch '2.1.x' 2019-01-11 14:35:14 +00:00
Andy Wilkinson 6b952f5b65 Upgrade to Glassfish Jaxb 2.3.2
Closes gh-15689
2019-01-11 14:32:38 +00:00
Andy Wilkinson 48b485161e Upgrade to Byte Buddy 1.9.7
Closes gh-15688
2019-01-11 14:32:37 +00:00
Andy Wilkinson eb96cdffd2 Upgrade to Reactor Bom Californium-SR4
Closes gh-15687
2019-01-11 14:32:36 +00:00
Andy Wilkinson c5e14afcd1 Upgrade to Micrometer 1.1.2
Closes gh-15686
2019-01-11 14:32:35 +00:00
Andy Wilkinson 1bd030c17a Upgrade to Spring Kafka 2.1.12.RELEASE
Closes gh-15685
2019-01-11 14:29:28 +00:00
Andy Wilkinson 6c81eb0591 Merge branch '2.1.x' 2019-01-11 13:26:54 +00:00
Andy Wilkinson 99df485268 Merge branch '2.0.x' into 2.1.x 2019-01-11 13:26:47 +00:00
Andy Wilkinson 2af133084a Merge branch '1.5.x' into 2.0.x 2019-01-11 13:25:54 +00:00
Andy Wilkinson 784f192cf3 Merge branch '2.1.x' 2019-01-11 10:34:48 +00:00
Andy Wilkinson 6307cb5943 Disable Tomcat’s reference clearing
Closes gh-15101
2019-01-11 10:34:14 +00:00
Johnny Lim 498eef5abb Add starter entry for Azure Application Insights
Closes gh-15628
2019-01-11 08:36:44 +01:00
Stephane Nicoll 8d1d3fb087 Polish "Avoid string concatenation inside StringBuilder append()"
Closes gh-15589
2019-01-11 08:30:12 +01:00
igor-suhorukov 59ac85d371 Avoid string concatenation inside StringBuilder append()
See gh-15589
2019-01-11 08:28:19 +01:00
Stephane Nicoll 29a45a7b7b Merge branch '2.1.x' 2019-01-11 08:20:48 +01:00
Stephane Nicoll e95a6e8c5c Upgrade to Spring Kafka 2.2.3
Closes gh-15414
2019-01-11 08:19:16 +01:00
Stephane Nicoll c18a0756ac Upgrade to Spring Session Bean-SR2
Closes gh-15531
2019-01-11 08:18:11 +01:00
Stephane Nicoll def5c15a14 Upgrade to Spring Security 5.1.3
Closes gh-15417
2019-01-11 08:17:27 +01:00
Stephane Nicoll 211d7aee5d Upgrade to Spring Integration 5.1.2
Closes gh-15413
2019-01-11 08:16:48 +01:00
Stephane Nicoll 3fe3ff7be6 Upgrade to Spring AMQP 2.1.3
Closes gh-15407
2019-01-11 08:16:04 +01:00
Stephane Nicoll 89fcb8b381 Upgrade to Spring Session Apple-SR8
Closes gh-15530
2019-01-11 08:13:39 +01:00
Stephane Nicoll aaadc620da Upgrade to Spring Security 5.0.11
Closes gh-15416
2019-01-11 08:12:47 +01:00
Stephane Nicoll 3c917bc80f Upgrade to Spring Integration 5.0.11
Closes gh-15412
2019-01-11 08:11:25 +01:00
Stephane Nicoll e1c2eb04e0 Upgrade to Spring AMQP 2.0.11
Closes gh-15406
2019-01-11 08:10:03 +01:00
Madhura Bhave 2ab0925222 Merge branch '2.1.x' 2019-01-10 13:04:42 -08:00
Madhura Bhave b345fc8574 Fix validation when key matching the prefix is set
Fixes gh-15597
2019-01-10 13:04:12 -08:00
Andy Wilkinson b9d2fab70c Upgrade to Reactor Bom Bismuth-SR15
Closes gh-15676
2019-01-10 15:42:10 +00:00
Stephane Nicoll da96c122ad Merge branch '2.1.x' 2019-01-10 14:24:17 +01:00
Stephane Nicoll 7529179d39 Upgrade to Spring Data Lovelace SR4
Closes gh-15410
2019-01-10 14:22:59 +01:00
Stephane Nicoll f562806744 Merge branch '2.1.x' 2019-01-10 13:39:07 +01:00
Stephane Nicoll 8722d02c1e Merge branch '2.0.x' into 2.1.x 2019-01-10 13:38:34 +01:00
Stephane Nicoll c8c047d3d8 Upgrade to Spring Data Kay SR13
Closes gh-15409
2019-01-10 13:32:28 +01:00
Stephane Nicoll a697d641e7 Upgrade to Neo4j Ogm 3.1.6
Closes gh-15671
2019-01-10 13:30:36 +01:00
Stephane Nicoll dca6879d4e Polish "Remove an unused interface in RestarterTests"
Closes gh-15666
2019-01-10 13:25:34 +01:00
Johnny Lim d7f0c1d63c Remove an unused interface in RestarterTests
See gh-15666
2019-01-10 13:25:14 +01:00
Stephane Nicoll badccc083e Merge branch '2.1.x' 2019-01-10 10:29:18 +01:00
Stephane Nicoll cdf76e34a9 Merge branch '2.0.x' into 2.1.x 2019-01-10 10:26:40 +01:00
Stephane Nicoll 44dc29901b Upgrade to Micrometer 1.0.9
Closes gh-15669
2019-01-10 10:21:15 +01:00
Stephane Nicoll 9a35a037a9 Upgrade to Spring Web Services 3.0.6.RELEASE
Closes gh-15667
2019-01-10 10:20:17 +01:00
Stephane Nicoll 28f89773ce Merge branch '2.1.x' 2019-01-09 15:09:58 +01:00
Stephane Nicoll 5a5367591a Upgrade to Spring Framework 5.1.4.RELEASE
Closes gh-15493
2019-01-09 14:41:05 +01:00
Stephane Nicoll e28b802775 Upgrade to Spring Framework 5.0.12.RELEASE
Closes gh-15528
2019-01-09 14:39:59 +01:00
Brian Clozel a3737cd76d Merge branch '2.1.x' 2019-01-08 21:45:54 +01:00
Brian Clozel 958e08c413 Merge branch '2.0.x' into 2.1.x 2019-01-08 21:45:41 +01:00
dreis2211 95e26ffcb9 Avoid uri tag explosion when use of path variable is undetected
This commit aligns the Spring WebFlux instrumentation on Spring MVC
since gh-12447.
From now on, if the best matching path pattern is not found,
the recorded uri tag will be "UNKNOWN".

Note that for WebFlux.fn, the pattern information is properly
recorded as of SPR-17395.

Closes gh-15609
2019-01-08 21:45:06 +01:00
Brian Clozel d5ae59dad7 Polish
Closes gh-15594
2019-01-08 18:58:48 +01:00
Nishant Raut 21df40b6c7 Add an outcome tag to web client metrics
Similar to what's ben done in gh-15420 for Spring MVC and Spring
WebFlux, this commit adds an outcome tag for the client side on both
`RestTemplate` and `WebClient`.

See gh-15594
2019-01-08 18:57:05 +01:00
Brian Clozel a83d9635af Merge branch '2.1.x' 2019-01-08 16:13:35 +01:00
Brian Clozel 6200a319f2 Polish
Closes gh-15385
2019-01-08 16:13:18 +01:00
ayudovin e9588ca04b Support server.connection-timeout for Netty server 2019-01-08 16:03:08 +01:00
Brian Clozel ead9b51c9b Merge branch '2.1.x' 2019-01-08 14:26:37 +01:00
Brian Clozel c40e61c117 Merge branch '2.0.x' into 2.1.x 2019-01-08 14:26:03 +01:00
Brian Clozel 0e13fd039d Configure HTTP compression for HTTP/2 with Tomcat
This commit ensures that the compression options are also applied on the
`Http2Protocol` when http/2 is enabled with Tomcat.

Closes gh-15591
2019-01-08 14:14:10 +01:00
Stephane Nicoll 2b304e3d69 Merge branch '2.1.x' 2019-01-08 11:31:17 +01:00
Stephane Nicoll ca7f338a39 Polish "Remove redundant throws Exception"
Closes gh-15647
2019-01-08 11:27:28 +01:00
Stephane Nicoll 5ea9ac0ac6 Merge branch '2.1.x' 2019-01-08 11:14:32 +01:00
Stephane Nicoll 02581c005a Polish "Fix typo"
Closes gh-15642
2019-01-08 11:12:05 +01:00
Michael Simons 7a2313892c Fix typo
See gh-15642
2019-01-08 11:11:34 +01:00
Stephane Nicoll 5fdcb219bb Merge branch '2.1.x' 2019-01-08 10:42:48 +01:00
小呆 e5b2aeb5da Remove redundant throws Exception
Closes gh-15645
2019-01-08 10:42:11 +01:00
Brian Clozel 06bdb422b5 Upgrade to Reactor Californium-BUILD-SNAPSHOT 2019-01-07 18:42:27 +01:00
Stephane Nicoll 2dd3171b89 Merge branch '2.1.x' 2019-01-07 17:19:27 +01:00
Stephane Nicoll 4670770da9 Merge branch '2.0.x' into 2.1.x 2019-01-07 17:18:47 +01:00
Stephane Nicoll 7330b8b16f Upgrade to Hibernate Validator 6.0.14.Final
Closes gh-15639
2019-01-07 17:16:01 +01:00
Stephane Nicoll 448f1626f9 Merge branch '2.1.x' 2019-01-07 14:56:18 +01:00
Stephane Nicoll 830da28b8c Fix JPA bootstrap executor detection with multiple candidates
Spring Boot provides two separate auto-configurations that can
potentially expose an `AsyncTaskExecutor` implementation so relying on
the presence of a single instance is too weak.

This commit fixes the detection of the AsyncTaskExecutor that can be
used to bootstrap JPA so that a single instance is used and, in the case
more than one exists, the one named `applicationTaskExecutor`.

Closes gh-15447
2019-01-07 14:54:59 +01:00
Stephane Nicoll 8136db69b6 Merge branch '2.1.x' 2019-01-07 13:59:55 +01:00
Stephane Nicoll d4992777b9 Improve TaskExecution documentation with custom Executor and Spring MVC
Closes gh-15447
2019-01-07 13:59:42 +01:00
Stephane Nicoll 5e736c0d1f Merge branch '2.1.x' 2019-01-07 13:46:23 +01:00
Stephane Nicoll 6ad01a6dfc Optimize ConditionalOnEnabledEndpoint usage
Closes gh-15451
2019-01-07 13:45:53 +01:00
Stephane Nicoll 2d2aa96c05 Allow ConditionalOnEnabledEndpoint to be set at class level
See gh-15451
2019-01-07 13:45:35 +01:00
Stephane Nicoll 2153a7529d Add missing dependency management for hazelcast-hibernate53
Closes gh-15618
2019-01-06 11:49:09 +01:00
Stephane Nicoll 5535d4d9b2 Upgrade to Flatten Maven Plugin 1.1.0
Closes gh-15622
2019-01-04 14:01:36 +01:00
Stephane Nicoll 8efddf57a5 Upgrade to Hibernate 5.4.0.Final
Closes gh-15621
2019-01-04 14:01:35 +01:00
Stephane Nicoll fea30962dd Upgrade to Hikaricp 3.3.0
Closes gh-15620
2019-01-04 14:01:34 +01:00
Stephane Nicoll 99cd74519d Upgrade to Rabbit Amqp Client 5.5.2
Closes gh-15619
2019-01-04 14:01:34 +01:00
Stephane Nicoll e91776a7a8 Upgrade to Hazelcast Hibernate5 1.3.1
Closes gh-15618
2019-01-04 14:01:33 +01:00
Stephane Nicoll 5b0a5b319e Merge branch '2.1.x' 2019-01-04 13:55:41 +01:00
Stephane Nicoll 580c73a026 Upgrade to Jooq 3.11.9
Closes gh-15617
2019-01-04 13:49:21 +01:00
Stephane Nicoll b0dbe09b8c Upgrade to Ehcache3 3.6.3
Closes gh-15616
2019-01-04 13:49:20 +01:00
Stephane Nicoll 232f0fe894 Upgrade to Groovy 2.5.5
Closes gh-15615
2019-01-04 13:49:20 +01:00
Stephane Nicoll 383da2183e Upgrade to Rxjava2 2.2.5
Closes gh-15614
2019-01-04 13:49:19 +01:00
Stephane Nicoll a713e598e7 Upgrade to Dropwizard Metrics 4.0.5
Closes gh-15613
2019-01-04 13:49:19 +01:00
Stephane Nicoll 8024c2c543 Merge branch '2.0.x' into 2.1.x 2019-01-04 13:44:38 +01:00
Stephane Nicoll d909b722f6 Upgrade to Maven Assembly Plugin 3.1.1
Closes gh-15612
2019-01-04 13:37:48 +01:00
Stephane Nicoll 1132ad411d Upgrade to Johnzon Jsonb 1.1.11
Closes gh-15611
2019-01-04 13:37:47 +01:00
Stephane Nicoll f4c7441cc1 Merge branch '2.1.x' 2019-01-04 13:14:47 +01:00
Johnny Lim c41dc4e0cb Fix the anchor for the Micrometer Elasticsearch section
Closes gh-15610
2019-01-04 13:13:53 +01:00
Stephane Nicoll 442225bbf1 Merge branch '2.1.x' 2019-01-03 10:27:13 +01:00
Stephane Nicoll 4729d170a8 Polish "Ensure checking customizer ordering"
Closes gh-15603
2019-01-03 10:26:09 +01:00
Tadaya Tsuyukubo b34e752db6 Ensure checking customizer ordering
See gh-15603
2019-01-03 10:25:49 +01:00
Madhura Bhave 2dc7a89bd4 Merge branch '2.1.x' 2019-01-02 14:00:10 -08:00
Madhura Bhave 5b990605dc Polish "Order actuator security config after resource-server config"
Closes gh-15472
2019-01-02 13:57:49 -08:00
Stephen Doxsee 4597e7cc82 Order actuator security config after resource-server config
See gh-15472
2019-01-02 13:57:40 -08:00
Madhura Bhave aee65441a7 Merge branch '2.1.x' 2019-01-02 10:54:43 -08:00
Madhura Bhave d1e1a82b32 Support binding to collection with EnumSet values
Fixes gh-15539
2019-01-02 10:52:31 -08:00
Stephane Nicoll 6ba1f40e59 Polish "Allow easy customization of EmbeddedMongo DownloadConfig"
Closes gh-15496
2019-01-02 10:33:17 +01:00
michael b5b6889601 Allow easy customization of EmbeddedMongo DownloadConfig
See gh-15496
2019-01-02 10:30:33 +01:00
dreis2211 46e59503ec Use JSONObject.putOpt in JsonConverter
Closes gh-15595
2019-01-02 09:48:35 +01:00
Madhura Bhave 19caff6776 Merge branch '2.1.x' 2018-12-31 13:24:52 -08:00
Oleksii Bondar b52dddf784 Refactor OAuth2ClientPropertiesRegistrationAdapterTests
Closes gh-15586
2018-12-31 13:18:00 -08:00
Stephane Nicoll d0811b48df Polish "Disable Hibernate entity scanning for default JPA setup"
Closes gh-15565
2018-12-31 16:51:43 +01:00
ayudovin 510a8e2ec1 Disable Hibernate entity scanning for default JPA setup
See gh-15565
2018-12-31 16:51:31 +01:00
Stephane Nicoll 33547569db Merge branch '2.1.x' 2018-12-31 10:36:41 +01:00
Stephane Nicoll c6202b57e0 Merge branch '2.0.x' into 2.1.x 2018-12-31 10:36:24 +01:00
Stephane Nicoll be161b23cb Polish class conditions documentation
Closes gh-15578
2018-12-31 10:36:02 +01:00
Stephane Nicoll 1e98c78ab9 Fix typo 2018-12-31 09:59:00 +01:00
Camille Vienot ff8edf8d98 Use assertJ to generate AssertionError and filter its stacktrace
Closes gh-15569
2018-12-31 09:58:13 +01:00
Stephane Nicoll 51936e1a5c Rename "agent" to "agents" to properly indicate its type
Closes gh-15455
2018-12-31 09:50:35 +01:00
Stephane Nicoll 960d375f57 Merge branch '2.1.x' 2018-12-30 10:04:01 +01:00
Stephane Nicoll a8efcadc90 Merge branch '2.0.x' into 2.1.x 2018-12-30 10:02:53 +01:00
Stephane Nicoll 4509164789 Polish "Add unit test for cassandra health checker"
Closes gh-15583
2018-12-30 10:01:37 +01:00
Oleksii Bondar db22a81742 Add unit test for cassandra health checker
See gh-15583
2018-12-30 10:00:59 +01:00
igor-suhorukov 3eb2f5e476 Replace Collections sort with list sort() method
Closes gh-15585
2018-12-30 09:52:05 +01:00
dreis2211 0f5f6f15dc Use hasFieldOrPropertyWithValue where possible
Closes gh-15582
2018-12-30 09:48:27 +01:00
Stephane Nicoll d57f831f50 Polish "Use Optional value in more functional style"
Closes gh-15575
2018-12-29 11:26:56 +01:00
igor-suhorukov 8ced867e95 Use Optional value in more functional style
See gh-15575
2018-12-29 11:26:27 +01:00
Stephane Nicoll 7946bec11f Merge branch '2.1.x' 2018-12-28 18:22:59 +01:00
Stephane Nicoll 8e8910b2ff Merge branch '2.0.x' into 2.1.x 2018-12-28 18:20:43 +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 b578dc05df Polish 2018-12-26 09:16:27 +01:00
Stephane Nicoll 1223355fe6 Polish "Simplify code by using for-each loop"
Closes gh-15563
2018-12-25 09:59:41 +01:00
igor-suhorukov dfb3cd51bc Simplify code by using for-each loop
See gh-15563
2018-12-25 09:58:42 +01:00
Stephane Nicoll cc5624efc4 Merge branch '2.1.x' 2018-12-25 09:56:03 +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 fbef9700bf Merge branch '2.1.x' 2018-12-24 16:39:47 +01:00
Erik Mulder 00763af335 Fix system properties override example
Closes gh-15562
2018-12-24 16:39:20 +01:00
Stephane Nicoll 805ff6000a Polish "Replace indexOf() with a call to the contains()"
Closes gh-15559
2018-12-24 09:52:29 +01:00
igor-suhorukov b370b1f03a Replace indexOf() with a call to the contains()
See gh-15559
2018-12-24 09:52:15 +01:00
Stephane Nicoll fd12e696b0 Polish "Replace redundant call to class isInstance() with instanceof"
Closes gh-15554
2018-12-23 15:51:39 +01:00
igor-suhorukov 7424f48803 Replace redundant call to class isInstance() with instanceof
See gh-15554
2018-12-23 15:50:22 +01:00
Andy Wilkinson 372b6605b3 Merge branch '2.1.x' 2018-12-21 15:32:31 +00: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 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