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
21,374 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

21374 Commits

Author SHA1 Message Date
Brian Clozel 1f897ad923 Fix DefaultErrorWebExceptionHandler test 2019-05-02 10:14:08 +02:00
Stephane Nicoll 4ad837f5dc Merge pull request #16700 from izeye 
* pr/16700:
  Polish RSocketServerBootstrap bean name
 2019-05-02 09:20:26 +02:00
Johnny Lim 21b05bbafc Polish RSocketServerBootstrap bean name 
Closes gh-16700
 2019-05-02 09:19:41 +02:00
Stephane Nicoll f056b952d9 Merge branch '2.1.x' 2019-05-02 09:18:21 +02:00
Stephane Nicoll 9c0c017d11 Merge pull request #16699 from izeye 
* pr/16699:
  Polish CompressionConnectorCustomizerTests
 2019-05-02 09:18:05 +02:00
Johnny Lim 1b9a4d5e45 Polish CompressionConnectorCustomizerTests 
Closes gh-16699
 2019-05-02 09:13:47 +02:00
Madhura Bhave cc99b13ecb Merge branch '2.1.x' 2019-05-01 10:26:31 -07:00
Madhura Bhave c9752f165f Fix javadoc 2019-05-01 10:23:52 -07:00
Andy Wilkinson 538030b57e Merge branch '2.1.x' 
Closes gh-16693
 2019-05-01 11:20:56 +01:00
Andy Wilkinson 881fbeff43 Test the Gradle Plugin against Gradle 5.4.1 
Closes gh-16576
 2019-05-01 10:47:35 +01:00
Stephane Nicoll 830457f71e Merge pull request #16688 from izeye 
* pr/16688:
  Polish
 2019-05-01 08:42:16 +02:00
Johnny Lim cb0e3c793b Polish 
Closes gh-16688
 2019-05-01 08:41:44 +02:00
Stephane Nicoll ed538a2e31 Merge branch '2.1.x' 2019-05-01 08:41:27 +02:00
Stephane Nicoll 19413c0c71 Polish 
See gh-16688
 2019-05-01 08:41:07 +02:00
Stephane Nicoll eb028fa77d Merge pull request #15988 from ttddyy 
* pr/15988:
  Polish "Allow configuration of auto-timed metrics"
  Allow configuration of auto-timed metrics
 2019-05-01 08:17:42 +02:00
Stephane Nicoll 8045bf1f50 Polish "Allow configuration of auto-timed metrics" 
Closes gh-15988
 2019-05-01 08:17:06 +02:00
Tadaya Tsuyukubo 4df6f5dee0 Allow configuration of auto-timed metrics 
When `management.metrics.web.server.auto-time-requests` is enabled
(default=true), Spring Boot collects metrics on controller methods even
when they are not annotated with `@Timed`.

When this happens, created metrics are based on the default
`@Timed` configuration and there is no way to customize the
configuration of those auto-timed controller metrics.

This commit adds default configurations to auto-timed requests on both
client and server sides.

See gh-15988
 2019-05-01 08:16:42 +02:00
Madhura Bhave 3d814a5288 Move to Reactor Dysprosium snapshots 
This should fix the NoClassDefFound errors after moving to Framework
snapshots
 2019-04-30 17:09:40 -07:00
Madhura Bhave ffd979c2bb Document missing SpringApplication events 
This commit also documents `ContextRefreshedEvent` and
`WebServerInitializedEvent`.

Closes gh-7382
 2019-04-30 16:46:48 -07:00
Madhura Bhave fd97066604 Use MergedAnnotation.getRoot() method 
Closes gh-16661
 2019-04-30 16:19:18 -07:00
Madhura Bhave 8b30ad21bb Merge pull request #16622 from Kedar Joshi 
* pr/16622:
  Polish "Document use of @Profile with @ConfigurationProperties scanning"
  Document use of @Profile with @ConfigurationProperties scanning
 2019-04-30 16:08:42 -07:00
Madhura Bhave d4435e015c Polish "Document use of @Profile with @ConfigurationProperties scanning" 
Closes gh-16622
 2019-04-30 16:07:33 -07:00
Kedar Joshi 13b155eb2a Document use of @Profile with @ConfigurationProperties scanning 
See gh-16612
 2019-04-30 15:59:04 -07:00
Brian Clozel 0b27f7c70e Merge pull request #16480 from dreis2211 
* appendix-properties-styling:
  Polish "Separate compound properties in appendices"
  Separate compound properties in appendices
 2019-04-30 15:34:48 +02:00
Brian Clozel c4938055b4 Polish "Separate compound properties in appendices" 
Closes gh-16480
 2019-04-30 15:32:26 +02:00
dreis2211 5b63b807ad Separate compound properties in appendices 2019-04-30 15:25:39 +02:00
Stephane Nicoll c4b018705d Merge pull request #16604 from dlmu-lq 
* pr/16604:
  Polish "Auto-configure ReactiveStringRedisTemplate if necessary"
  Auto-configure ReactiveStringRedisTemplate if necessary
 2019-04-30 14:56:39 +02:00
Stephane Nicoll 922ceed63a Polish "Auto-configure ReactiveStringRedisTemplate if necessary" 
Closes gh-16604
 2019-04-30 14:51:47 +02:00
Qiang Lee 866233bd2f Auto-configure ReactiveStringRedisTemplate if necessary 
See gh-16604
 2019-04-30 14:43:35 +02:00
Stephane Nicoll 81543873d4 Merge branch '2.1.x' 2019-04-30 14:33:12 +02:00
Stephane Nicoll 02ec1911fc Merge pull request #16628 from ielatif 
* pr/16628:
  Exclude HikariCP specific dependency from Quartz
 2019-04-30 14:32:01 +02:00
ielatif 3ffbe256f1 Exclude HikariCP specific dependency from Quartz 
Closes gh-16628
 2019-04-30 14:31:17 +02:00
Stephane Nicoll 727f593408 Merge pull request #16668 from Tetsuya3850 
* pr/16668:
  Remove redundant info
 2019-04-30 09:06:10 +02:00
Tetsuya Hasegawa 56c769f05c Remove redundant info 
Closes gh-16668
 2019-04-30 09:05:48 +02:00
Stephane Nicoll da13eb5c68 Merge pull request #16678 from maciejwalkowiak 
* pr/16678:
  Polish "Add jOOQ to SQL logging group"
  Add jOOQ to SQL logging group
 2019-04-30 08:58:48 +02:00
Stephane Nicoll 05957689f4 Polish "Add jOOQ to SQL logging group" 
Closes gh-16678
 2019-04-30 08:57:32 +02:00
Maciej Walkowiak d7722e328a Add jOOQ to SQL logging group 
See gh-16678
 2019-04-30 08:55:07 +02:00
Stephane Nicoll 9d7be401fb Merge pull request #16684 from making 
* pr/16684:
  Fix typo
 2019-04-30 08:40:47 +02:00
Toshiaki Maki e203f6a5f5 Fix typo 
Closes gh-16684
 2019-04-30 08:40:35 +02:00
Stephane Nicoll 35b9ef9257 Merge pull request #16685 from izeye 
* pr/16685:
  Polish
 2019-04-30 08:26:38 +02:00
Johnny Lim e22c2e5687 Polish 
Closes gh-16685
 2019-04-30 08:24:18 +02:00
Madhura Bhave a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector 
Closes gh-16679
 2019-04-29 18:01:31 -07:00
Andy Wilkinson 01abaa70f7 Merge pull request #16248 from hengyunabc 
* gh-16248:
  Polish "Prefer file: to jar:file: URLs in launcher"
  Prefer file: to jar:file: URLs in launcher

Closes gh-16248
 2019-04-29 15:58:47 +01:00
Andy Wilkinson 5639685770 Polish "Prefer file: to jar:file: URLs in launcher" 
See gh-16248
 2019-04-29 14:41:03 +01:00
hengyunabc c1b34d0307 Prefer file: to jar:file: URLs in launcher 
See gh-16248
 2019-04-29 14:39:20 +01:00
Stephane Nicoll 84530ce3c4 Merge pull request #16632 from leszko 
* pr/16632:
  Polish "Add support for Hazelcast YAML configuration"
  Add support for Hazelcast YAML configuration
 2019-04-29 15:17:54 +02:00
Stephane Nicoll 704da1750b Polish "Add support for Hazelcast YAML configuration" 
Closes gh-16632
 2019-04-29 15:16:43 +02:00
Rafal Leszko 82e18ae88f Add support for Hazelcast YAML configuration 
Since Hazlecast 3.12, YAML configuration format is supported in
addition to XML. Therefore, this change makes Spring Boot automatically
discover not only `hazelcast.xml` (and `hazelcast-client.xml`), but also
`hazelcast.yaml` (and `hazelcast-client.yaml`).

See gh-16632
 2019-04-29 14:19:10 +02:00
Brian Clozel b527d364dc Reinstate single page reference documentation 
This commit reinstates the single-page variant for the Spring Boot
reference documentation.

Now the single and multi-page variants are hosted under the same
`"html"` folder, as `"index.html"` and `"single-index.html"`.
Note that files ending in `"index.html`" are treated as index files by
the spring-doc-resources project and their table of contents do not
display a "Back to index" link.

Fixes gh-16295
 2019-04-29 09:04:36 +02:00
Stephane Nicoll 9cde736b59 Merge branch '2.1.x' 2019-04-26 12:01:11 +03:00