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,701 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

4266 Commits

Author SHA1 Message Date
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 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
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
dreis2211 948902f090 Avoid unnecessary usage of ReflectionTestUtils 
Closes gh-15482
 2018-12-17 17:07:23 +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
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 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 3cc441c83e Do not remove trailing slash from OAuth2 Issuer URI 
Fixes gh-15324
 2018-12-10 16:35:52 -08:00
Andy Wilkinson d05ae40c99 Remove redundant field type and optional configuration 
See gh-15435
 2018-12-10 17:59:26 +00:00
Andy Wilkinson ef4ea591b3 Mark nested optional fields as optional 
See gh-15435
 2018-12-10 17:49:41 +00:00
Andy Wilkinson 6752be9333 Exclude logback-classic from liquibase-core 
Closes gh-15436
 2018-12-10 15:39:51 +00:00
Andy Wilkinson 9dc2116351 Merge branch '2.0.x' into 2.1.x 2018-12-10 14:36:21 +00:00
Andy Wilkinson 554e7061ce Upgrade to Spring Restdocs 2.0.3.RELEASE 
Closes gh-15435
 2018-12-10 14:36:03 +00:00
Madhura Bhave a11dea46d7 Use the right class in @ConditionalOnClass 
See gh-15372
 2018-12-07 14:15:59 -08:00
Madhura Bhave f13697b278 Make Resource Server auto-config conditional on JwtDecoder class 
Fixes gh-15372
 2018-12-07 13:48:32 -08:00
Madhura Bhave 31a5e85ab6 Perform placeholder resolution in test env post processor 
Fixes gh-15354
 2018-12-07 11:45:04 -08:00
Andy Wilkinson 4c6c07ddbb Start building against Spring AMQP 2.1.3 snapshots 
See gh-15407
 2018-12-07 15:22:35 +00:00
Andy Wilkinson f04f74870a Start building against Spring Data Lovelace SR4 snapshots 
See gh-15410
 2018-12-07 15:22:06 +00:00
Andy Wilkinson 96f1a394b8 Start building against Spring Integration 5.1.2 snapshots 
See gh-15413
 2018-12-07 15:21:28 +00:00
Andy Wilkinson e27d3d0d5e Start building against Spring Kafka 2.2.3 
See gh-15414
 2018-12-07 15:20:40 +00:00
Andy Wilkinson b01d5f62a4 Start building against Spring Security 5.1.3 snapshots 
See gh-15417
 2018-12-07 15:20:05 +00:00
Andy Wilkinson a5f5ead520 Start building against Spring AMQP 2.0.11 snapshots 
See gh-15406
 2018-12-07 15:15:01 +00:00
Andy Wilkinson 5e640877c9 Start building against Spring Data Kay SR13 snapshots 
See gh-15409
 2018-12-07 15:14:15 +00:00
Andy Wilkinson 12a844d7da Start building against Spring Integration 5.0.11 snapshots 
See gh-15412
 2018-12-07 15:13:36 +00:00
Andy Wilkinson 5336c8ccde Start building against Spring Security 5.0.11 snapshots 
See gh-15416
 2018-12-07 15:13:01 +00:00
Stephane Nicoll c84d199cb7 Upgrade to Flyway 5.2.4 
Closes gh-15402
 2018-12-07 09:56:18 +01:00
Stephane Nicoll bd21113e9f Fix indent of WebServiceTemplate section 
Closes gh-15389
 2018-12-06 09:06:02 +01:00
Stephane Nicoll ef40241bf6 Merge branch '2.0.x' into 2.1.x 2018-12-05 15:56:04 +01:00
dreis2211 d864b427eb Remove unused ByteArrayStartsWith matcher 
Closes gh-15386
 2018-12-05 15:52:42 +01:00
Stephane Nicoll 185a49fb3b Add reference to JaVers starter 2018-12-05 08:56:50 +01:00
Stephane Nicoll c56c0ff433 Rename OAuth2ResourceServerJwkConfiguration 
Closes gh-15375
 2018-12-04 10:53:01 +01:00
Andy Wilkinson 42b58f6d27 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 16:29:10 +00:00
Andy Wilkinson 917108cce7 Merge branch '2.0.x' into 2.1.x 2018-12-03 15:07:30 +00:00
Andy Wilkinson 425a3aacf5 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 15:06:32 +00:00
Andy Wilkinson 07065532fe Replace accidental use of code shaded by Testcontainers 
See gh-15371
 2018-12-03 13:01:27 +00:00
Andy Wilkinson 910a0e57b8 Drop dependency management for DropWizard Metrics modules removed in v4 
Closes gh-15370
 2018-12-03 12:49:15 +00:00
Andy Wilkinson 72ad0cc6be Merge branch '2.0.x' into 2.1.x 2018-12-03 12:15:36 +00:00
Andy Wilkinson 3fd0380359 Correct optional dependency declarations in spring-boot-test-support 
Closes gh-15371
 2018-12-03 12:14:18 +00:00
Phillip Webb 9c426c63bf Polish 2018-11-29 22:57:04 -08:00
Phillip Webb ed9468a31a Update copyright year for changed files 2018-11-29 22:02:45 -08:00
Phillip Webb 81896e0222 Upgrade to Micrometer 1.1.1 
Closes gh-15328
 2018-11-29 21:29:25 -08:00
Phillip Webb 73d87ac112 Upgrade to Micrometer 1.0.8 
Closes gh-15327
 2018-11-29 15:33:19 -08:00