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

19747 Commits

Author SHA1 Message Date
Nishant Raut 0b29da14b3 Stop JtaAutoConfiguration from enabling JtaProperties when not used 
See gh-15550
 2018-12-21 15:12:29 +00: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
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 bb40e2ed24 Upgrade to Narayana 5.5.34.Final 
Closes gh-15503
 2018-12-20 09:33:36 +00:00
Andy Wilkinson f6a1c0052d Upgrade to Groovy 2.4.16 
Closes gh-15502
 2018-12-20 09:33:35 +00:00
Andy Wilkinson 7358417a58 Upgrade to Tomcat 8.5.37 
Closes gh-15501
 2018-12-20 09:33:34 +00:00
Andy Wilkinson f73fb71557 Upgrade to Appengine Sdk 1.9.71 
Closes gh-15500
 2018-12-20 09:33:33 +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 4101e15421 Add dependency management for missing Groovy 2.5 modules 
Closes gh-15468
 2018-12-19 17:30:57 +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 007916f1ce Start building against Spring Framework 5.1.4 snapshots 
See gh-15493
 2018-12-19 12:52:13 +00:00
Stephane Nicoll 7dbe70dc61 Merge branch '2.0.x' into 2.1.x 2018-12-17 18:26:36 +01:00
Stephane Nicoll 1944954d95 Merge pull request #15465 from dreis2211 
* pr/15465:
  Polish "Fix StringSequence.equals() for different lengths"
  Fix StringSequence.equals() for different lengths
 2018-12-17 18:26:09 +01:00