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

4389 Commits

Author SHA1 Message Date
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 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