root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
20,223 Commits 23 Branches 348 Tags 288 MiB
Commit Graph

4652 Commits

Author SHA1 Message Date
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
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
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
Andy Wilkinson e2433280c2 Upgrade to Jackson 2.9.8 
Closes gh-15504
 2018-12-20 09:40:41 +00:00
Andy Wilkinson 0a23f3b286 Merge branch '1.5.x' into 2.0.x 2018-12-20 09:36:57 +00:00
Andy Wilkinson 5a07c44a4f Merge branch '2.1.x' 2018-12-19 17:55:51 +00:00
Andy Wilkinson 43d64ba580 Add dependency management for groovy-jaxb introduced in 2.5.1 
Closes gh-15468
 2018-12-19 17:55:19 +00:00
Andy Wilkinson 524067cd32 Merge branch '2.1.x' 2018-12-19 17:34:25 +00:00
Andy Wilkinson 4101e15421 Add dependency management for missing Groovy 2.5 modules 
Closes gh-15468
 2018-12-19 17:30:57 +00:00
Andy Wilkinson 70f4d5e5a8 Polish "Apply context and connector customizer beans to Tomcat factories" 
Closes gh-15492
 2018-12-19 17:09:21 +00:00
Raheela 90c489048f Apply context and connector customizer beans to Tomcat factories 
See gh-15492
 2018-12-19 17:01:02 +00:00
Andy Wilkinson de599819ae Merge branch '2.1.x' 2018-12-19 16:57:19 +00:00
Andy Wilkinson 33fb1fa9a3 Avoid creating meter binders before registry has been customized 
Previously, MeterRegistryPostProcessor would trigger the creation of all
meter binders and meter registry customizers before applying the
customizers and calling the binders. In some situations with complex
dependency graphs where the creation of a binder and the injection of
its dependencies inadvertently triggered some meter binding, this
could result in meters being bound before the registry had been
customized.

This commit reworks MeterRegistryPostProcessor and MeterRegistryConfigurer
to defer the retrieval of registry customizers and meter binders until
just before they are needed. As a result, customizers are now retrieved
and applied before the binders are retrieved.

Closes gh-15483
 2018-12-19 16:47:30 +00:00
Andy Wilkinson 903d940dd5 Merge branch '2.1.x' 2018-12-19 12:55:34 +00:00
Andy Wilkinson 007916f1ce Start building against Spring Framework 5.1.4 snapshots 
See gh-15493
 2018-12-19 12:52:13 +00:00
Andy Wilkinson 0ad72d5b5e Remove reliance on mavenLocal from Gradle plugin’s tests 
See gh-15471
 2018-12-18 11:41:51 +00:00
Andy Wilkinson 4edc32844a Remove use of execute method inherited from internal class 
Closes gh-15484
 2018-12-17 17:33:20 +00:00
Stephane Nicoll 317c4c2c38 Merge branch '2.1.x' 2018-12-17 18:26:56 +01:00
Stephane Nicoll 7dbe70dc61 Merge branch '2.0.x' into 2.1.x 2018-12-17 18:26:36 +01:00
Stephane Nicoll c0b07a9429 Polish "Fix StringSequence.equals() for different lengths" 
Closes gh-15465
 2018-12-17 18:24:08 +01:00
dreis2211 2a0680c2ba Fix StringSequence.equals() for different lengths 
See gh-15465
 2018-12-17 18:20:09 +01:00
Andy Wilkinson c8a0c99a21 Remove D…S…Init…InvokerTests' assumptions about classpath structure 
See gh-15471
 2018-12-17 16:35:22 +00:00
Stephane Nicoll 6d251a83dd Merge branch '2.1.x' 2018-12-17 17:15:48 +01:00
Stephane Nicoll af3fada396 Polish "Add missing dependency management entry for hibernate-vibur" 
Closes gh-15467
 2018-12-17 17:13:30 +01:00
vasili pispanen c955906c3e Add missing dependency management entry for hibernate-vibur 
See gh-15467
 2018-12-17 17:13:18 +01:00
Stephane Nicoll 6207b46bc6 Merge branch '2.1.x' 2018-12-17 17:07:58 +01:00
dreis2211 948902f090 Avoid unnecessary usage of ReflectionTestUtils 
Closes gh-15482
 2018-12-17 17:07:23 +01:00
Andy Wilkinson ca13385534 Remove remaining assumption about File separator from LogFileTests 
See gh-15471
 2018-12-17 14:21:28 +00:00
Andy Wilkinson 3d7e4e99c5 Remove assumption about File separator from LogFileTests 
See gh-15471
 2018-12-17 14:14:57 +00:00
Andy Wilkinson 6adccbfd30 Make LoggingApplicationListener and tests more robust on Windows 
Previously, LoggingApplicationListener its tests, and LogFile made some
assumptions that do not hold true on Windows. Specifically,
LoggingApplicationListenerTests used TestPropertySourceUtils to add
properties to the environment. This uses Java's standard Properties
parsing which does a poor job of handling Windows file paths (Strings
with backslashes in them). Secondly, LogFile made assumptions about
the use of forward clashes for the file separator.

This commit replaces the use of TestPropertySourceUtils and removes
the assumption about the OS's file separator.

Closes gh-15471
 2018-12-17 14:02:10 +00:00
Andy Wilkinson ddabfe3fcc Deploy spring-boot-test-support so it's available downstream 
Concourse builds spring-boot-tests separately from spring-boot-project
and relies on modules from the latter being available in the
distribution repository when building the former. This commit enables the
deployment of spring-boot-test-support from spring-boot-project so that it
is added to the distribution repository and is therefore available when
building spring-boot-tests. It is then excluded when putting to the
Artifactory resource as we do not want it to be published.

See gh-15471
 2018-12-14 19:50:23 +00:00
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output 
Closes gh-15471
 2018-12-14 17:50:20 +00:00
Stephane Nicoll 1f4be6ba37 Merge branch '2.1.x' 2018-12-14 08:45:22 +01:00
Stephane Nicoll 80cfff753a Merge branch '2.0.x' into 2.1.x 2018-12-14 08:45:05 +01:00
Stephane Nicoll a6ff7c786a Remove test starter from core module 
Closes gh-15463
 2018-12-14 08:44:43 +01:00
Andy Wilkinson db5ab1d14c Do not rely on test runner using static main method in RestarterTests 
Closes gh-15461
 2018-12-13 13:39:19 +00:00
Andy Wilkinson 62fbf48446 Start Elasticsearch with single-node discovery type 
See gh-15441
 2018-12-12 21:02:28 +00:00
Andy Wilkinson 47fc35105d Allow more time for the Elasticsearch container to start 
See gh-15441
 2018-12-12 19:41:30 +00:00
Andy Wilkinson ed52dab3b5 Revert upgrade to JUnit Jupiter 5.4 snapshots 2018-12-12 17:53:52 +00:00
Andy Wilkinson 064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved 
See gh-14736
See gh-14737
See gh-14738
 2018-12-12 16:49:30 +00:00
Andy Wilkinson 2b453bbb16 Minimise dependencies on Log4j2 
Closes gh-15441
 2018-12-12 08:19:34 +00:00
Madhura Bhave e16511279a Add junit-jupiter-engine for running Junit5 tests 2018-12-11 15:08:28 -08:00
Brian Clozel 9a6dbb5290 Merge branch '2.1.x' 2018-12-11 11:54:08 +01:00
Brian Clozel 036aace2cc Add details in Jest ElasticSearch HealthIndicator 
This commit polishes the previous one and aligns the Jest
HealthIndicator with the changes made for the REST variant.

Closes gh-15366
 2018-12-11 11:51:57 +01:00
Filip Hrisafov 1ec2bbf54f Include details in ElasticsearchRestHealthIndicator 
This commit adds more information to the ElasticSearch REST
health indicator.

When the ES instance responds with an error HTTP status,
the health details now include the actual status code and reason phrase.
When the ES instance returns a HTTP 200 response, the entire response
map is used as health details.

See gh-15366
 2018-12-11 11:51:49 +01:00
Andy Wilkinson 71b29684b3 Remove redundant field type configuration 
See gh-15435
 2018-12-11 08:30:24 +00:00
Stephane Nicoll dfd477aa74 Merge branch '2.1.x' 2018-12-11 08:53:37 +01:00
Stephane Nicoll 38e4d330b0 Merge branch '2.0.x' into 2.1.x 2018-12-11 08:52:58 +01:00
dreis2211 0f92b139f3 Remove Mockito 1 leftover 
Closes gh-15422
 2018-12-11 08:52:15 +01:00
Madhura Bhave f863ce32ee Merge branch '2.1.x' 2018-12-10 16:44:42 -08:00
Madhura Bhave 3cc441c83e Do not remove trailing slash from OAuth2 Issuer URI 
Fixes gh-15324
 2018-12-10 16:35:52 -08:00
Andy Wilkinson 55d7c19c06 Merge branch '2.1.x' 2018-12-10 17:59:50 +00:00
Andy Wilkinson d05ae40c99 Remove redundant field type and optional configuration 
See gh-15435
 2018-12-10 17:59:26 +00:00
Andy Wilkinson 393decff35 Merge branch '2.1.x' 2018-12-10 17:58:00 +00:00
Andy Wilkinson ef4ea591b3 Mark nested optional fields as optional 
See gh-15435
 2018-12-10 17:49:41 +00:00