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
Johnny Lim
cc285d92dd
Prevent double update of metrics when CompositeMeterRegistry exists
...
See gh-16221
6 years ago
Andy Wilkinson
b39fdea508
Merge pull request #16474 from Christoph Dreis
...
* gh-16474:
Speed up element equality checks in ConfigurationPropertyName
Closes gh-16474
6 years ago
dreis2211
3786dbc869
Speed up element equality checks in ConfigurationPropertyName
...
See gh-16474
6 years ago
Andy Wilkinson
a0999dadb7
Merge branch '2.1.x'
...
Closes gh-16642
6 years ago
Andy Wilkinson
ba0279be14
Remove race condition in TaskSchedulingAutoConfigurationTests
...
Closes gh-16640
6 years ago
Andy Wilkinson
eb0b852e99
Merge branch '2.1.x'
...
Closes gh-16639
6 years ago
Andy Wilkinson
6ae7274289
Merge pull request #16618 from Joshua Jeme
...
* gh-16618:
Polish "Polish Maven Plugin's tests"
Polish Maven Plugin's tests
Closes gh-16618
6 years ago
Andy Wilkinson
5d77b48aed
Polish "Polish Maven Plugin's tests"
...
See gh-16618
6 years ago
daonan.zhan
52c2c534db
Polish Maven Plugin's tests
...
See gh-16618
6 years ago
Andy Wilkinson
d182ee2246
Merge branch '2.1.x'
...
Closes gh-16637
6 years ago
Andy Wilkinson
ed85735822
Merge branch '2.0.x' into 2.1.x
...
Closes gh-16636
6 years ago
Andy Wilkinson
3e3d7545cc
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
de0e065da2
Use AdoptOpenJDK for Ubuntu launch script integration tests
...
Closes gh-16633
6 years ago
Phillip Webb
86b5b226ec
Add resource icons to CI pipeline
6 years ago
Andy Wilkinson
d0b4dab1c8
Merge pull request #16620 from Christoph Dreis
...
* gh-16620:
Optimize JarEntry construction
Closes gh-16620
6 years ago
dreis2211
f40b086ef5
Optimize JarEntry construction
...
This commit avoids calling the underlying ZipEntry.setExtra() method
that is not very inline friendly in cases where there is no extra
information to be set.
See gh-16620
6 years ago
Andy Wilkinson
27990180ab
Merge branch '2.1.x'
...
Closes gh-16626
6 years ago