Commit Graph

21504 Commits (dfb2e8a278e7211c658104ae45a19b68aec57a21)
 

Author SHA1 Message Date
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
6 years ago
Madhura Bhave d4435e015c Polish "Document use of @Profile with @ConfigurationProperties scanning"
Closes gh-16622
6 years ago
Kedar Joshi 13b155eb2a Document use of @Profile with @ConfigurationProperties scanning
See gh-16612
6 years ago
Brian Clozel 0b27f7c70e Merge pull request #16480 from dreis2211
* appendix-properties-styling:
  Polish "Separate compound properties in appendices"
  Separate compound properties in appendices
6 years ago
Brian Clozel c4938055b4 Polish "Separate compound properties in appendices"
Closes gh-16480
6 years ago
dreis2211 5b63b807ad Separate compound properties in appendices 6 years ago
Stephane Nicoll c4b018705d Merge pull request #16604 from dlmu-lq
* pr/16604:
  Polish "Auto-configure ReactiveStringRedisTemplate if necessary"
  Auto-configure ReactiveStringRedisTemplate if necessary
6 years ago
Stephane Nicoll 922ceed63a Polish "Auto-configure ReactiveStringRedisTemplate if necessary"
Closes gh-16604
6 years ago
Qiang Lee 866233bd2f Auto-configure ReactiveStringRedisTemplate if necessary
See gh-16604
6 years ago
Stephane Nicoll 81543873d4 Merge branch '2.1.x' 6 years ago
Stephane Nicoll 02ec1911fc Merge pull request #16628 from ielatif
* pr/16628:
  Exclude HikariCP specific dependency from Quartz
6 years ago
ielatif 3ffbe256f1 Exclude HikariCP specific dependency from Quartz
Closes gh-16628
6 years ago
Stephane Nicoll 727f593408 Merge pull request #16668 from Tetsuya3850
* pr/16668:
  Remove redundant info
6 years ago
Tetsuya Hasegawa 56c769f05c Remove redundant info
Closes gh-16668
6 years ago
Stephane Nicoll da13eb5c68 Merge pull request #16678 from maciejwalkowiak
* pr/16678:
  Polish "Add jOOQ to SQL logging group"
  Add jOOQ to SQL logging group
6 years ago
Stephane Nicoll 05957689f4 Polish "Add jOOQ to SQL logging group"
Closes gh-16678
6 years ago
Maciej Walkowiak d7722e328a Add jOOQ to SQL logging group
See gh-16678
6 years ago
Stephane Nicoll 9d7be401fb Merge pull request #16684 from making
* pr/16684:
  Fix typo
6 years ago
Toshiaki Maki e203f6a5f5 Fix typo
Closes gh-16684
6 years ago
Stephane Nicoll 35b9ef9257 Merge pull request #16685 from izeye
* pr/16685:
  Polish
6 years ago
Johnny Lim e22c2e5687 Polish
Closes gh-16685
6 years ago
Madhura Bhave a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector
Closes gh-16679
6 years ago
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
6 years ago
Andy Wilkinson 5639685770 Polish "Prefer file: to jar:file: URLs in launcher"
See gh-16248
6 years ago
hengyunabc c1b34d0307 Prefer file: to jar:file: URLs in launcher
See gh-16248
6 years ago
Stephane Nicoll 84530ce3c4 Merge pull request #16632 from leszko
* pr/16632:
  Polish "Add support for Hazelcast YAML configuration"
  Add support for Hazelcast YAML configuration
6 years ago
Stephane Nicoll 704da1750b Polish "Add support for Hazelcast YAML configuration"
Closes gh-16632
6 years ago
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
6 years ago
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
6 years ago
Stephane Nicoll 9cde736b59 Merge branch '2.1.x' 6 years ago
Stephane Nicoll 3c5ec8a04c Merge branch '2.0.x' into 2.1.x 6 years ago
Stephane Nicoll ac9ee952c7 Properly merge fix
See gh-16666
6 years ago
Stephane Nicoll 85c1e104f0 Merge branch '2.0.x' into 2.1.x 6 years ago
Stephane Nicoll 5963542f18 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 0552113c98 Merge pull request #16666 from Tetsuya3850
* pr/16666:
  Fix broken link
6 years ago
Tetsuya Hasegawa 5b3e53835e Fix broken link
Closes gh-16666
6 years ago
Phillip Webb 837f323e29 Merge pull request #16662 from dreis2211
* pr/16662:
  Fix typo in issue template
6 years ago
dreis2211 309a63493d Fix typo in issue template 6 years ago
Phillip Webb f6b5a07561 Update the issue template with more help 6 years ago
Andy Wilkinson ed8a10b2fb Merge pull request #16658 from Christoph Dreis
* gh-16658:
  Optimize ConfigurationPropertyName.buildToString()

Closes gh-16658
6 years ago
dreis2211 cf05959375 Optimize ConfigurationPropertyName.buildToString()
See gh-16658
6 years ago
Phillip Webb 32040e355b Merge branch '2.1.x'
Closes gh-16649
6 years ago
Phillip Webb 7302974751 Merge pull request #16629 from dberrueta-atlassian
Closes gh-16629:
6 years ago
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
6 years ago
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
6 years ago
Phillip Webb 1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
6 years ago
Diego Berrueta 756a7f12a3 Use Jackson configuration with JsonPath
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.

Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.

See gh-16629
6 years ago
Andy Wilkinson 4754386361 Merge branch '2.1.x'
Closes gh-16644
6 years ago
Andy Wilkinson 4fc813b246 Merge pull request #16221 from Johnny Lim
* gh-16221:
  Polish "Prevent double update of metrics when CompositeMeterRegistry exists"
  Prevent double update of metrics when CompositeMeterRegistry exists

Closes gh-16221
6 years ago
Andy Wilkinson 6b20d13b3d Polish "Prevent double update of metrics when CompositeMeterRegistry exists"
See gh-16221
6 years ago