Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,359 Commits 23 Branches 0 Tags
8045bf1f50ba7e41552d5e3b585c9ebca39eecd3
Commit Graph

21359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll
3c5ec8a04c Merge branch '2.0.x' into 2.1.x 2019-04-26 11:53:02 +03:00
Stephane Nicoll
ac9ee952c7 Properly merge fix 
See gh-16666
 2019-04-26 11:52:25 +03:00
Stephane Nicoll
85c1e104f0 Merge branch '2.0.x' into 2.1.x 2019-04-26 11:50:15 +03:00
Stephane Nicoll
5963542f18 Merge branch '1.5.x' into 2.0.x 2019-04-26 11:49:26 +03:00
Stephane Nicoll
0552113c98 Merge pull request #16666 from Tetsuya3850 
* pr/16666:
  Fix broken link
 2019-04-26 11:44:51 +03:00
Tetsuya Hasegawa
5b3e53835e Fix broken link 
Closes gh-16666
 2019-04-26 11:44:02 +03:00
Phillip Webb
837f323e29 Merge pull request #16662 from dreis2211 
* pr/16662:
  Fix typo in issue template
 2019-04-25 16:39:21 -07:00
dreis2211
309a63493d Fix typo in issue template 2019-04-25 23:38:28 +02:00
Phillip Webb
f6b5a07561 Update the issue template with more help 2019-04-25 11:12:32 -07:00
Andy Wilkinson
ed8a10b2fb Merge pull request #16658 from Christoph Dreis 
* gh-16658:
  Optimize ConfigurationPropertyName.buildToString()

Closes gh-16658
 2019-04-25 17:19:22 +01:00
dreis2211
cf05959375 Optimize ConfigurationPropertyName.buildToString() 
See gh-16658
 2019-04-25 17:18:55 +01:00
Phillip Webb
32040e355b Merge branch '2.1.x' 
Closes gh-16649
 2019-04-24 19:50:41 -07:00
Phillip Webb
7302974751 Merge pull request #16629 from dberrueta-atlassian 
Closes gh-16629:
 2019-04-24 19:46:12 -07:00
Phillip Webb
d4151e0b51 Polish "Use Jackson configuration with JsonPath" 
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.

Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.

See gh-16629
 2019-04-24 19:45:43 -07:00
Phillip Webb
17aaf26590 Use consistent javadoc style for annotation links 
Closes gh-13920
 2019-04-24 19:37:59 -07:00